feat(Directions): Adds page inside about-us

This commit is contained in:
sovanna 2019-07-19 17:09:54 +02:00
parent 264ab3d0ec
commit d26338250f
10 changed files with 117 additions and 13 deletions

View File

@ -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 <a href="https://m-labs.hk/m1.html" target="_blank" rel="noopener noreferrer">Milkymist One</a>, 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 <a href="https://m-labs.hk/jpl_letter.jpg" target="_blank" rel="noopener noreferrer">software-defined radio</a> on board the International Space Station. The community grew and activities diversified, with the development of a <a href="http://www.ohwr.org/projects/tdc-core/wiki" target="_blank" rel="noopener noreferrer">TDC core</a> for CERN (using a variant of the Milkymist SoC for integration), the <a href="{{ get_url(path='@/gateware/migen.md') }}">Migen</a> logic design system and its application to the Rhino software-defined radio platform, and the <a href="https://m-labs.hk/mixxeo.html" target="_blank" rel="noopener noreferrer">Mixxeo</a> 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 <a href="{{ get_url(path='@/experiment-control/artiq.md') }}">ARTIQ</a>, 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") }}

View File

@ -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 %}
<div class="row">
{% layout_card(src="images/directions_1@2x.png", imgbottom=true) %}
<span class="badge badge-primary">1</span> 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) %}
<span class="badge badge-primary">2</span> Enter here:
{% end %}
{% layout_card(src="images/directions_3@2x.png", imgbottom=true) %}
<span class="badge badge-primary">3</span> Turn right here, walk a little bit, and M-Labs will be on your left:
{% end %}
</div>

View File

@ -200,3 +200,7 @@ ul:not(.navbar-nav) li {
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 730px 262px; background-size: 730px 262px;
} }
.badge-primary {
background-color: $brand-color;
}

BIN
static/images/directions_1@2x.png Executable file

Binary file not shown.

After

(image error) Size: 508 KiB

BIN
static/images/directions_2@2x.png Executable file

Binary file not shown.

After

(image error) Size: 458 KiB

BIN
static/images/directions_3@2x.png Executable file

Binary file not shown.

After

(image error) Size: 455 KiB

View File

@ -36,7 +36,7 @@
<br> <br>
<br> <br>
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. <a href="{{ get_url(path='@/about-us/directions.md') }}">Directions</a>
<br> <br>
<br> <br>

View File

@ -4,7 +4,7 @@
<div class="row"> <div class="row">
<div class="col-12 text-center mt-0 mt-lg-5"> <div class="col-12 text-center mt-2 mt-lg-5 mb-2 mb-lg-5">
{% if separator_title %} {% if separator_title %}

View File

@ -0,0 +1,8 @@
{% extends 'page.html' %}
{% block footer_contact %}
{% include "includes/footer_contact_direction.html" %}
{% endblock %}

View File

@ -2,6 +2,8 @@
<div class="card shadow mb-4"> <div class="card shadow mb-4">
{% if not imgbottom %}
{% if src %} {% if src %}
<div class="px-auto pt-4"> <div class="px-auto pt-4">
<img src="{{ get_url(path=src, cachebust=true) }}" width="40px"> <img src="{{ get_url(path=src, cachebust=true) }}" width="40px">
@ -19,6 +21,29 @@
</div> </div>
{% else %}
<div class="card-body">
{% if title %}
<div class="card-title">
<h5 class="mb-0">{{ title }}</h5>
</div>
{% endif %}
{{ body | markdown | safe }}
</div>
{% if src %}
<div class="">
<img src="{{ get_url(path=src, cachebust=true) }}" class="card-img img-fluid">
</div>
{% endif %}
{% endif %}
</div> </div>
</div> </div>