diff --git a/content/about-us/_index.md b/content/about-us/_index.md index 24137eb..6262f25 100644 --- a/content/about-us/_index.md +++ b/content/about-us/_index.md @@ -1,7 +1,6 @@ +++ title = "About us" weight = 4 -template = "index.html" +sort_by = "weight" +template = "about-us.html" +++ - -hello \ No newline at end of file diff --git a/content/gateware/_index.md b/content/gateware/_index.md index 89b0a7d..7e6eff5 100644 --- a/content/gateware/_index.md +++ b/content/gateware/_index.md @@ -1,4 +1,5 @@ +++ title = "Gateware" weight = 2 +sort_by = "weight" +++ \ No newline at end of file diff --git a/sass/css/_base.scss b/sass/css/_base.scss index 2598a84..925df73 100644 --- a/sass/css/_base.scss +++ b/sass/css/_base.scss @@ -76,6 +76,13 @@ a { } } +.navbar-light .navbar-nav .active>.nav-link, +.navbar-light .navbar-nav .nav-link.active, +.navbar-light .navbar-nav .nav-link.show, +.navbar-light .navbar-nav .show>.nav-link { + color: $color-secondary; +} + /** @@ -96,10 +103,15 @@ a { margin-top: 12px; } .dropdown-item { - &:hover { + &:hover, + &:active { background-color: transparent; } } +.dropdown-item.active { + color: $color-secondary; + background-color: transparent; +} .btn-primary { background-color: $btn-primary-2; diff --git a/sass/css/_layout.scss b/sass/css/_layout.scss index 3601780..849047c 100644 --- a/sass/css/_layout.scss +++ b/sass/css/_layout.scss @@ -44,7 +44,7 @@ h3 { } } - main { + .hero + main { margin-top: -150px; } diff --git a/templates/_base.html b/templates/_base.html new file mode 100644 index 0000000..766b7ce --- /dev/null +++ b/templates/_base.html @@ -0,0 +1,229 @@ + + + + + + {% block title%}{{ config.title }}{% endblock %} + + + + + + + {% block ogtitle %} + + {% endblock %} + {% block ogdescription %} + + {% endblock %} + + + + {% block meta %}{% endblock meta %} + + + + + + + + + {% block styles %}{% endblock %} + + + + + + +
+ +
+ + + +
+ +
+ + + + + {% block hero %} + {% endblock %} + + + + {% block main %} + {% endblock %} + + + + + + + + + + + + + + + + + + diff --git a/templates/about-us.html b/templates/about-us.html new file mode 100644 index 0000000..49dd4af --- /dev/null +++ b/templates/about-us.html @@ -0,0 +1,6 @@ +{% extends 'section.html' %} + + +{% block main_content %} + +{% endblock %} \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index 30caa9d..8151c0d 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,151 +1,89 @@ - - - - - - {% block title%}{{ config.title }}{% endblock %} - - - - - - - {% block ogtitle %} - - {% endblock %} - {% block ogdescription %} - - {% endblock %} - - - - {% block meta %}{% endblock meta %} - - - - - - - - - {% block styles %}{% endblock %} - - - - - - -
- -
- - - -
+
- + + +{% endblock %} - +{% block main %} -
+
-
+
-
+
-
+
-

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. +

-
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 - -
+ Read More
@@ -155,174 +93,19 @@
+
-
-
+
-
+
-
- -
- -
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!

+
-
+
-
- -

We'd love to hear from you!

- -
- -
- -
- - - - - - - - - - - - - - - - - - - - +{% endblock %} diff --git a/templates/page.html b/templates/page.html new file mode 100644 index 0000000..b9471aa --- /dev/null +++ b/templates/page.html @@ -0,0 +1 @@ +{% extends 'section.html' %} diff --git a/templates/section.html b/templates/section.html new file mode 100644 index 0000000..9c0893e --- /dev/null +++ b/templates/section.html @@ -0,0 +1,26 @@ +{% extends '_base.html' %} + + +{% block main %} + +
+ +
+ +
+ + {% block main_content %} + + {% if page and page.content %} + {{ page.content | safe }} + {% endif %} + + {% endblock %} + +
+ +
+ +
+ +{% endblock %}