commit 6a1cdb907863c58cf8ed7ed1c91bc2dd69414069 Author: sovanna Date: Wed Jul 3 11:52:11 2019 +0200 feat(website): Adds desktop homepage diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d70ebaa --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +public \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..45e55c1 --- /dev/null +++ b/README.md @@ -0,0 +1,54 @@ +# m-labs with zola + + +## Getting Started + +These instructions will get you a copy of the project up and running on your local machine for development and testing purposes. See deployment for notes on how to deploy the project on a live system. + + +### Prerequisites + +What things you need to install the software and how to install them + +- Docker Community Edition (Docker Engine Community) + + [https://docs.docker.com/install/](https://docs.docker.com/install/) + + **You may need to create a dockerhub account to download docker.** + + +### Installing + +A step by step series of examples that tell you how to get a development env running + + +1. Clone the project + + ``` + git clone https://github.com/sovanna/m-labs-zola.git \ + && cd m-labs-zola + ``` + +2. Build the docker container for development + + ``` + cd /m-labs/zola/website + + docker run \ + -p 1111:1111 \ + -v "$PWD:/usr/src/app/website" \ + --name mlabs-zola \ + -it \ + sovanna/zola + + ctrl+d # to exit the container + ``` + +3. Start + + ``` + docker start mlabs-zola + docker exec -it mlabs-zola /bin/bash + cd website + zola serve --interface 0.0.0.0 --port 1111 + ``` \ No newline at end of file diff --git a/config.toml b/config.toml new file mode 100644 index 0000000..d3662d3 --- /dev/null +++ b/config.toml @@ -0,0 +1,11 @@ +base_url = "m-labs.hk" +title = "System-on-chip design capable of running MilkDrop" +description = "M-Labs has varied activities. One of them is ARTIQ, a leading-edge open source control system for quantum information experiments" + +compile_sass = true +highlight_code = true +insert_anchor_links = true +build_search_index = false + +[extra] +author = "M-Labs" \ No newline at end of file diff --git a/content/_index.md b/content/_index.md new file mode 100644 index 0000000..a2be2b5 --- /dev/null +++ b/content/_index.md @@ -0,0 +1,15 @@ ++++ +template = "index.html" +sort_by = "weight" ++++ + +Experiment control + - Artiq + - Sinara + +Gateware + - Migen + +Software + - Solvespace + - Smoltcp diff --git a/content/about-us/_index.md b/content/about-us/_index.md new file mode 100644 index 0000000..24137eb --- /dev/null +++ b/content/about-us/_index.md @@ -0,0 +1,7 @@ ++++ +title = "About us" +weight = 4 +template = "index.html" ++++ + +hello \ No newline at end of file diff --git a/content/experiment-control/_index.md b/content/experiment-control/_index.md new file mode 100644 index 0000000..5761acf --- /dev/null +++ b/content/experiment-control/_index.md @@ -0,0 +1,5 @@ ++++ +title = "Experiment control" +weight = 1 +sort_by = "weight" ++++ \ No newline at end of file diff --git a/content/experiment-control/artiq.md b/content/experiment-control/artiq.md new file mode 100644 index 0000000..5172163 --- /dev/null +++ b/content/experiment-control/artiq.md @@ -0,0 +1,4 @@ ++++ +title = "Artiq" +weight = 1 ++++ diff --git a/content/experiment-control/sinara.md b/content/experiment-control/sinara.md new file mode 100644 index 0000000..3928711 --- /dev/null +++ b/content/experiment-control/sinara.md @@ -0,0 +1,4 @@ ++++ +title = "Sinara" +weight = 2 ++++ diff --git a/content/gateware/_index.md b/content/gateware/_index.md new file mode 100644 index 0000000..89b0a7d --- /dev/null +++ b/content/gateware/_index.md @@ -0,0 +1,4 @@ ++++ +title = "Gateware" +weight = 2 ++++ \ No newline at end of file diff --git a/content/gateware/migen.md b/content/gateware/migen.md new file mode 100644 index 0000000..8849e8a --- /dev/null +++ b/content/gateware/migen.md @@ -0,0 +1,4 @@ ++++ +title = "Migen" +weight = 1 ++++ diff --git a/content/software/_index.md b/content/software/_index.md new file mode 100644 index 0000000..12f7ee1 --- /dev/null +++ b/content/software/_index.md @@ -0,0 +1,5 @@ ++++ +title = "Software" +weight = 3 +sort_by = "weight" ++++ \ No newline at end of file diff --git a/content/software/smoltcp.md b/content/software/smoltcp.md new file mode 100644 index 0000000..b1e7cb7 --- /dev/null +++ b/content/software/smoltcp.md @@ -0,0 +1,4 @@ ++++ +title = "Smoltcp" +weight = 2 ++++ diff --git a/content/software/solvespace.md b/content/software/solvespace.md new file mode 100644 index 0000000..0831f92 --- /dev/null +++ b/content/software/solvespace.md @@ -0,0 +1,4 @@ ++++ +title = "Solvespace" +weight = 1 ++++ diff --git a/sass/css/_base.scss b/sass/css/_base.scss new file mode 100644 index 0000000..37e6b7f --- /dev/null +++ b/sass/css/_base.scss @@ -0,0 +1,118 @@ +/** + * Basic styling + */ +body { + font: $base-font-weight #{$base-font-size}/#{$base-line-height} $base-font-family; + color: $text-color; + background-color: $background-color; + -webkit-text-size-adjust: 100%; + -webkit-font-feature-settings: "kern" 1; + -moz-font-feature-settings: "kern" 1; + -o-font-feature-settings: "kern" 1; + font-feature-settings: "kern" 1; + font-kerning: normal; + display: flex; + min-height: 100vh; + flex-direction: column; +} + +figcaption { + font-size: $small-font-size; +} + + + +/** + * Lists + */ +ul, ol { + margin-left: $spacing-unit; +} + +li { + > ul, + > ol { + margin-bottom: 0; + } +} + + + +/** + * Headings + */ +h1, h2, h3, h4, h5, h6 { + font-weight: $big-font-weight; + line-height: 1.1; +} + + + +/** + * Links + */ +a { + color: $btn-primary-2; + text-decoration: underline; + + &:hover { + color: $btn-secondary-2; + text-decoration: none; + } +} + +.navbar-light .navbar-nav .nav-link, +.dropdown-item { + outline: none; + color: $color-primary; + text-decoration: none; + + &:visited { + color: $color-primary; + } + + &:hover { + color: $color-secondary; + } +} + + + +/** + * Custom + */ +.shadow.th { + -webkit-box-shadow: 0px 2px 8px 0px rgba(218,218,218,1) !important; + -moz-box-shadow: 0px 2px 8px 0px rgba(218,218,218,1) !important; + box-shadow: 0px 2px 8px 0px rgba(218,218,218,1) !important; +} + +.card { + border: 1px solid transparent; +} + +.dropdown-menu { + border: none; + margin-top: 12px; +} +.dropdown-item { + &:hover { + background-color: transparent; + } +} + +.btn-primary { + background-color: $btn-primary-2; + color: #fff !important; + border: 1px solid $btn-primary-2 !important; + text-decoration: none; + + &:hover { + background-color: $btn-secondary-2; + border: 1px solid $btn-secondary-2 !important; + } +} +.btn-lg { + font-size: 1rem; + padding: 1rem 1.25rem; +} \ No newline at end of file diff --git a/sass/css/_layout.scss b/sass/css/_layout.scss new file mode 100644 index 0000000..fdf4bfb --- /dev/null +++ b/sass/css/_layout.scss @@ -0,0 +1,39 @@ +.hero { + height: 692px; + background: url("../images/hero@2x.png") repeat-x top center; + -webkit-background-size: contain; + -moz-background-size: contain; + -o-background-size: contain; + background-size: contain; + + h1 { + color: $background-color; + margin-bottom: 30px; + margin-top: -100px; + } +} + +main { + margin-top: -150px; +} + +.card-artiq { + background: #fff url("../images/artiq@2x.png") no-repeat top right; +} + +.card-gateware { + background: #fff url("../images/gateware@2x.png") no-repeat top right; +} + +.card h5, +h5 { + color: $brand-color; +} + +h3 { + color: $color-secondary; +} + +.shadow.sticky-top { + background: #fff; +} \ No newline at end of file diff --git a/sass/css/styles.scss b/sass/css/styles.scss new file mode 100644 index 0000000..5e5d731 --- /dev/null +++ b/sass/css/styles.scss @@ -0,0 +1,28 @@ +@charset "utf-8"; + +// Define defaults for each variable. + +$base-font-family: 'Noto Sans', Helvetica, Arial, sans-serif; +$base-font-size: 16px !default; +$base-font-weight: 400 !default; +$big-font-weight: 700 !default; +$small-font-size: $base-font-size * 0.875 !default; +$base-line-height: 1.5 !default; + +$spacing-unit: 30px !default; + +$text-color: #0d3547 !default; +$background-color: #fff !default; +$brand-color: #715ec7 !default; + +$color-primary: #0d3547 !default; +$color-secondary: #1a6d93 !default; + +$btn-primary-2: #715ec7 !default; +$btn-secondary-2: #a88cfd !default; + +// Import partials. +@import + "_base", + "_layout" +; diff --git a/static/images/artiq.png b/static/images/artiq.png new file mode 100644 index 0000000..6cca182 Binary files /dev/null and b/static/images/artiq.png differ diff --git a/static/images/artiq@2x.png b/static/images/artiq@2x.png new file mode 100755 index 0000000..4777714 Binary files /dev/null and b/static/images/artiq@2x.png differ diff --git a/static/images/gateware.png b/static/images/gateware.png new file mode 100644 index 0000000..bd48105 Binary files /dev/null and b/static/images/gateware.png differ diff --git a/static/images/gateware@2x.png b/static/images/gateware@2x.png new file mode 100755 index 0000000..be13aba Binary files /dev/null and b/static/images/gateware@2x.png differ diff --git a/static/images/hero.png b/static/images/hero.png new file mode 100755 index 0000000..47c2859 Binary files /dev/null and b/static/images/hero.png differ diff --git a/static/images/hero@2x.png b/static/images/hero@2x.png new file mode 100755 index 0000000..8dcd9ea Binary files /dev/null and b/static/images/hero@2x.png differ diff --git a/static/images/ion.png b/static/images/ion.png new file mode 100644 index 0000000..261ee92 Binary files /dev/null and b/static/images/ion.png differ diff --git a/static/images/ion@2x.png b/static/images/ion@2x.png new file mode 100755 index 0000000..7c5b6ea Binary files /dev/null and b/static/images/ion@2x.png differ diff --git a/static/images/logo-old.png b/static/images/logo-old.png new file mode 100644 index 0000000..e6b3370 Binary files /dev/null and b/static/images/logo-old.png differ diff --git a/static/images/logo.png b/static/images/logo.png new file mode 100644 index 0000000..ee0cb5b Binary files /dev/null and b/static/images/logo.png differ diff --git a/static/images/logo@2x-old.png b/static/images/logo@2x-old.png new file mode 100644 index 0000000..78c04cb Binary files /dev/null and b/static/images/logo@2x-old.png differ diff --git a/static/images/logo@2x.png b/static/images/logo@2x.png new file mode 100644 index 0000000..7829122 Binary files /dev/null and b/static/images/logo@2x.png differ diff --git a/static/images/map.jpg b/static/images/map.jpg new file mode 100644 index 0000000..a152f55 Binary files /dev/null and b/static/images/map.jpg differ diff --git a/static/images/map@2x.jpg b/static/images/map@2x.jpg new file mode 100644 index 0000000..5f082c7 Binary files /dev/null and b/static/images/map@2x.jpg differ diff --git a/templates/index.html b/templates/index.html new file mode 100644 index 0000000..0dd4c2e --- /dev/null +++ b/templates/index.html @@ -0,0 +1,312 @@ + + + + + + {% block title%}{{ config.title }}{% endblock %} + + + + + + + {% block ogtitle %} + + {% endblock %} + {% block ogdescription %} + + {% endblock %} + + + + {% block meta %}{% endblock meta %} + + + + + + + + + {% block styles %}{% endblock %} + + + + +
+ +
+ + + +
+ +
+ + +
+ +
+ +
+ +
+ +

Open tools for open physics.

+ + + +
+ +
+ +
+ +
+ + +
+ +
+ +
+ +
+ +
+ +
+ +
ARTIQ
+ +

+ ARTIQ (Advanced Real-Time Infrastructure for Quantum physics) is a leading-edge control system for quantum information experiments, developed in partnership with a growing number of research institutions worldwide. +

+ +

+ The system features a high-level programming language that helps describe complex experiments, which is compiled and executed on dedicated hardware with nanosecond timing resolution and sub-microsecond latency. +

+ + Read More + +
+ +
+ +
+ +
+ +
+ + +
+ +
+ +
+ +
+ +
+ +
Gateware and system-on-chip design
+ +

+ Traditional gateware design with Verilog and VHDL is well known to be tedious and inefficient. M-Labs have developed Migen, a Python-based HDL and toolbox that addresses many of their issues and makes gateware design more productive. +

+ +

+ Built on Migen, MiSoC provides a high performance, flexible and lightweight solution to build system-on-chips for various applications. +

+ + Read More + +
+ +
+ +
+ +
+ +
+ + +
+ +
+ +

We'd love to hear from you!

+ +
+ +
+ + +
+ + +
+ +
+ +
+ +
Sales inquiries
+ + + + + + + + + + + + + + + + + + + + + + +
Salessales@m-***s.hk
Sébastiensb@m-***s.hk
Robertrj@m-***s.hk
+ +
+ +
+ +
Technicals inquiries
+ +

+ Ask on the Mattermost chat room (or the IRC channel #m-labs on Freenode), open an issue in the relevant project, or write to the mailing list devel (for Migen/MiSoC) or ARTIQ. +
+ Patches should be sent via a pull request. +

+ +

+ Go to forum.m-labs.hk to discuss all things ARTIQ, (n)Migen, MiSoC and HeavyX with the community. +

+ +
+ +
+ + +
+ +
+ +
Office
+ +

+ M-Labs Limited +
+ G/F Kam Hoi Mansion, 31 Pan Hoi Street, Quarry Bay, Hong Kong +
+
+ + This is part of the building complex numbered 15-53A on the street entrance. +
+
+ + MTR: Island Line, Quarry Bay, exit A +
+ Tramway: Mount Parker Road +
+ Bus: Sunway Gardens / Westlands Road / Pan Hoi Street +
+
+ + Tel: +852 59362721 +

+ +

+

+ +
+ +
+ +
+ map +
+ +
+ +
+ + +

+ Copyright © , M-Labs. All Rights Reserved. +

+ +
+ + + + + + + + + +