diff --git a/sass/css/_layout.scss b/sass/css/_layout.scss index 0ed5dcd..e88e27d 100644 --- a/sass/css/_layout.scss +++ b/sass/css/_layout.scss @@ -2,7 +2,7 @@ height: 230px; background: none; } -.hero2 { +.hero2, .hero3 { height: 130px; background: none; } @@ -74,6 +74,15 @@ h3, h2, h1 { background-size: contain; } + .hero3 { + height: 380px; + background: url("../images/hero3@2x.png") repeat-x top center; + -webkit-background-size: contain; + -moz-background-size: contain; + -o-background-size: contain; + background-size: contain; + } + .hero + main { margin-top: -150px; } diff --git a/static/images/hero3.png b/static/images/hero3.png new file mode 100755 index 0000000..74a7b3e Binary files /dev/null and b/static/images/hero3.png differ diff --git a/static/images/hero3@2x.png b/static/images/hero3@2x.png new file mode 100755 index 0000000..180906e Binary files /dev/null and b/static/images/hero3@2x.png differ diff --git a/templates/about-us.html b/templates/about-us.html index 6db3151..9da9faa 100644 --- a/templates/about-us.html +++ b/templates/about-us.html @@ -1,50 +1,105 @@ {% extends 'section.html' %} -{% block main_content %} +{% block hero %} -

ABOUT US

+
+
-
+
-
Milkymist
+
-
+

About us

-
+ -

- Milkymist was founded in summer 2007 by Sébastien Bourdeauducq. The open source project tackled the development of a system-on-chip design capable of running MilkDrop. The name "Milkymist" was chosen to evoke a parallel MilkDrop. The development was no small task, as it required designing and/or integrating a powerful 32-bit microprocessor core, basic peripherals, many interfaces, a fast SDRAM controller, and graphics acceleration. The video synthesizer born out of those efforts, the Milkymist One, was launched in September 2011 with the help of open hardware company Sharism at Work. -

+
-
- -
- -

- Components of the Milkymist system-on-chip soon found many other uses, such as software-defined radio on board the International Space Station. The community grew and activities diversified, with the development of a TDC core for CERN (using a variant of the Milkymist SoC for integration), the Migen logic design system and its application to the Rhino software-defined radio platform, and the Mixxeo digital video mixer. In 2013, Milkymist was renamed to M-Labs to mark the more varied activities, and formally incorporated in Hong Kong as M-Labs Limited. -

+
-
+{% endblock %} -
-

- The company's current main project is ARTIQ, a leading-edge open source control system for quantum information experiments. In 2016, Robert Jördens joined the directorate of the company to further develop ARTIQ and other physics-related projects. -

+{% block main %} + +
+ +
+ +
+ + {% block main_content %} + +
+ +
Milkymist
+ +
+ +
+ +

+ Milkymist was founded in summer 2007 by Sébastien Bourdeauducq. The open source project tackled the development of a system-on-chip design capable of running MilkDrop. The name "Milkymist" was chosen to evoke a parallel MilkDrop. The development was no small task, as it required designing and/or integrating a powerful 32-bit microprocessor core, basic peripherals, many interfaces, a fast SDRAM controller, and graphics acceleration. The video synthesizer born out of those efforts, the Milkymist One, was launched in September 2011 with the help of open hardware company Sharism at Work. +

+ +
+ +
+ +

+ Components of the Milkymist system-on-chip soon found many other uses, such as software-defined radio on board the International Space Station. The community grew and activities diversified, with the development of a TDC core for CERN (using a variant of the Milkymist SoC for integration), the Migen logic design system and its application to the Rhino software-defined radio platform, and the Mixxeo digital video mixer. In 2013, Milkymist was renamed to M-Labs to mark the more varied activities, and formally incorporated in Hong Kong as M-Labs Limited. +

+ +
+ +
+ +
+ +
+ +

+ The company's current main project is ARTIQ, a leading-edge open source control system for quantum information experiments. In 2016, Robert Jördens joined the directorate of the company to further develop ARTIQ and other physics-related projects. +

+ +
+ +
+ +
+ + {% endblock %} + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +

Contact us

+ + + +
+ +
-
- - -

CONTACT US

- -{% endblock %} \ No newline at end of file +{% endblock %}