diff --git a/content/about-us/company.md b/content/about-us/company.md new file mode 100644 index 0000000..bd1fabb --- /dev/null +++ b/content/about-us/company.md @@ -0,0 +1,24 @@ ++++ +title = "Company" +weight = 1 +template = "page-contact.html" + +[extra] +title = "About us" ++++ + + +{% layout_centered_content(min_width=true) %} + +##### History + +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. + +{% end %} + + +{{ layout_separator(separator_title="Contact us") }} diff --git a/content/about-us/directions.md b/content/about-us/directions.md new file mode 100644 index 0000000..1ffb69c --- /dev/null +++ b/content/about-us/directions.md @@ -0,0 +1,43 @@ ++++ +title = "Directions" +weight = 2 +template = "page.html" ++++ + + +{% layout_centered_content(min_width=true) %} + +##### All the transportation options below take you to King's Road. + +**MTR:** Island Line, Quarry Bay, exit A + +**Tramway:** Mount Parker Road + +**Bus:** Sunway Gardens / Westlands Road / Pan Hoi Street + +{% end %} + + +
+ +{% layout_card(src="images/directions_1@2x.png", imgbottom=true) %} + +1 When entering from King's Road, Pan Hoi Street looks like this. Go to the location of the red arrow: + +{% end %} + + +{% layout_card(src="images/directions_2@2x.png", imgbottom=true) %} + +2 Enter here: + +{% end %} + + +{% layout_card(src="images/directions_3@2x.png", imgbottom=true) %} + +3 Turn right here, walk a little bit, and M-Labs will be on your left: + +{% end %} + +
\ No newline at end of file diff --git a/sass/css/_base.scss b/sass/css/_base.scss index c4e8e5a..096040e 100644 --- a/sass/css/_base.scss +++ b/sass/css/_base.scss @@ -199,4 +199,8 @@ ul:not(.navbar-nav) li { background: url(../images/migen-links@2x.png); background-repeat: no-repeat; background-size: 730px 262px; +} + +.badge-primary { + background-color: $brand-color; } \ No newline at end of file diff --git a/static/images/directions_1@2x.png b/static/images/directions_1@2x.png new file mode 100755 index 0000000..4c1b292 Binary files /dev/null and b/static/images/directions_1@2x.png differ diff --git a/static/images/directions_2@2x.png b/static/images/directions_2@2x.png new file mode 100755 index 0000000..0b30898 Binary files /dev/null and b/static/images/directions_2@2x.png differ diff --git a/static/images/directions_3@2x.png b/static/images/directions_3@2x.png new file mode 100755 index 0000000..0a6fce0 Binary files /dev/null and b/static/images/directions_3@2x.png differ diff --git a/templates/includes/footer_contact_direction.html b/templates/includes/footer_contact_direction.html index ad0dfe4..0bcfff9 100644 --- a/templates/includes/footer_contact_direction.html +++ b/templates/includes/footer_contact_direction.html @@ -36,7 +36,7 @@

- This is part of the building complex numbered 15-53A on the street entrance. + This is part of the building complex numbered 15-53A on the street entrance. Directions

diff --git a/templates/includes/separator_design.html b/templates/includes/separator_design.html index 6173d06..379a800 100644 --- a/templates/includes/separator_design.html +++ b/templates/includes/separator_design.html @@ -4,7 +4,7 @@
-
+
{% if separator_title %} diff --git a/templates/page-contact.html b/templates/page-contact.html new file mode 100644 index 0000000..0a4bc39 --- /dev/null +++ b/templates/page-contact.html @@ -0,0 +1,8 @@ +{% extends 'page.html' %} + + +{% block footer_contact %} + + {% include "includes/footer_contact_direction.html" %} + +{% endblock %} \ No newline at end of file diff --git a/templates/shortcodes/layout_card.html b/templates/shortcodes/layout_card.html index 77f2635..40126dc 100644 --- a/templates/shortcodes/layout_card.html +++ b/templates/shortcodes/layout_card.html @@ -2,22 +2,47 @@
- {% if src %} -
- -
- {% endif %} + {% if not imgbottom %} -
- {% if title %} -
-
{{ title }}
+ {% if src %} +
+
{% endif %} - {{ body | markdown | safe }} +
+ {% if title %} +
+
{{ title }}
+
+ {% endif %} -
+ {{ body | markdown | safe }} + +
+ + {% else %} + +
+ {% if title %} +
+
{{ title }}
+
+ {% endif %} + + {{ body | markdown | safe }} + +
+ + {% if src %} +
+ +
+ {% endif %} + + + + {% endif %}