content/experiment-control/resources.md

@@ -170,6 +170,13 @@ We welcome inquiries from research groups of all sizes.<br>[See what has been fu
 <a href="https://github.com/cnourshargh/Bham-ARTIQ-examples" target="_blank" rel="noopener noreferrer">Repository</a>
 {% end %}
 
+
+{% layout_card(title="Deltaflow-on-ARTIQ", sameheight=120) %}
+<small>Run programs in the Deltaflow language from Riverlane on simulated ARTIQ</small>
+
+<a href="https://github.com/riverlane/deltaflow-on-artiq" target="_blank" rel="noopener noreferrer">Repository</a>
+{% end %}
+
 {% layout_card(title="DAX - Duke ARTIQ extensions", sameheight=120) %}
 <small>A library to provide tools for system organization/abstraction and to improve usability by automating common functionality.</small>
 
@@ -227,12 +234,6 @@ We welcome inquiries from research groups of all sizes.<br>[See what has been fu
 <a href="https://github.com/vuthalab/artiq" target="_blank" rel="noopener noreferrer">Repository</a>
 {% end %}
 
-{% layout_card(title="OffsetStabilizer", sameheight=120) %}
-<small>Stabilizer firmware for laser frequency offset stabilization</small>
-
-<a href="https://github.com/PhBrb/OffsetStabilizer" target="_blank" rel="noopener noreferrer">Repository</a>
-{% end %}
-
 </div>
 
 {% layout_div(css="col-12 text-center") %}

sass/css/_base.scss

@@ -90,53 +90,29 @@ a {
   }
 }
 
-.navbar {
+.navbar-light .navbar-nav .nav-link,
-  .navbar-light .navbar-nav .nav-link,
+.dropdown-item {
-  .dropdown-item {
+  outline: none;
-    outline: none;
+  color: $color-primary;
+  text-decoration: none;
+
+  &:visited {
     color: $color-primary;
-    text-decoration: none;
-
-    &:visited {
-      color: $color-primary;
-    }
-
-    &:hover {
-      color: $color-secondary;
-    }
   }
 
-  .navbar-light .navbar-nav .active>.nav-link,
+  &:hover {
-  .navbar-light .navbar-nav .nav-link.active,
-  .navbar-light .navbar-nav .nav-link.show,
-  .navbar-light .navbar-nav .show>.nav-link {
     color: $color-secondary;
   }
-
-  .dropdown-menu {
-    border: none;
-  }
-  .dropdown-item {
-    &:hover,
-    &:active {
-      background-color: transparent;
-    }
-  }
-  .dropdown-item.active {
-    color: $color-secondary;
-    background-color: transparent;
-  }
-
-  .navbar-toggler {
-    outline: none;
-
-    &:focus,
-    &:hover {
-      outline: none;
-    }
-  }
 }
 
+.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;
+}
+
+
 
 /**
  * Custom
@@ -151,6 +127,22 @@ a {
   border: 1px solid transparent;
 }
 
+.dropdown-menu {
+  border: none;
+  margin-top: 0;
+  padding-top: 0;
+}
+.dropdown-item {
+  &:hover,
+  &:active {
+    background-color: transparent;
+  }
+}
+.dropdown-item.active {
+  color: $color-secondary;
+  background-color: transparent;
+}
+
 .btn-primary {
   background-color: $btn-primary-2;
   color: #fff !important;
@@ -163,11 +155,18 @@ a {
     border: 1px solid $btn-secondary-2 !important;
   }
 }
-
 .btn-lg {
   font-size: 1rem;
   padding: 1rem 1.25rem;
 }
+.navbar-toggler {
+  outline: none;
+
+  &:focus,
+  &:hover {
+    outline: none;
+  }
+}
 
 ul.th {
   list-style: none;
@@ -201,63 +200,6 @@ ul:not(.navbar-nav) li {
 }
 
 
-.download-selector {
-  display: inline-flex;
-
-  .divider {
-    border-right: solid 1px white;
-    margin: 0.125rem 0;
-    height: inherit;
-    z-index: 10;
-  }
-
-  .dropdown-menu {
-    border: none;
-    margin-top: 0;
-    padding-top: 0;
-  }
-
-  .btn {
-    background-color: $btn-primary-2;
-    &:hover {
-      background-color: $btn-secondary-2;
-    }
-    &:after {
-      align-self: center;
-    }
-  }
-  button {
-    &[aria-expanded='true']:after {
-      transform: rotate(-180deg);
-    }
-    span {
-      margin-right: 0.5rem;
-    }
-  }
-
-  ul {
-    list-style: none;
-    margin-left: 0!important;
-    width: 100%;
-    padding: 0;
-
-    li {
-      padding: 0;
-      margin: 0;
-
-      a {
-        padding: 0.75rem 0.5rem 0.75rem 1.25rem;
-      }
-    }
-
-    li::before {
-      content: none;
-      display: none;
-    }
-  }
-}
-
-
 .bg-white-shadow {
   background: url(../images/migen-links@2x.png);
   background-repeat: no-repeat;

static/images/icons/icon-windows.svg

@@ -1 +0,0 @@
-<svg width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg"><g fill="#fff" stroke-linecap="round" stroke-opacity=".6" stroke-width=".35269"><path d="m0.52917 0.52917h5.5563v5.5563h-5.5563z"/><path d="m6.6146 0.52917h5.5563v5.5563h-5.5563z"/><path d="m0.52917 6.6146h5.5563v5.5563h-5.5563z"/><path d="m6.6146 6.6146h5.5563v5.5563h-5.5563z"/></g></svg>

templates/index.html

@@ -53,29 +53,12 @@
               <a href="{{ get_url(path='@/experiment-control/place-order.md') }}" class="btn btn-primary btn-inversed btn-lg">Order hardware</a>
               <a href="https://m-labs.hk/artiq/manual/" class="btn btn-primary btn-lg">Manual</a>
               <a href="https://forum.m-labs.hk" class="btn btn-primary btn-lg">Forum</a>
+              <a href="https://nixbld.m-labs.hk/job/artiq/extra/msys2-offline-installer/latest/download/1" class="btn btn-primary btn-lg d-inline-flex">
+                  <img src="/images/icons/icon-download.svg" class="d-inline-block align-self-center mx-1" style="height: 1rem" alt="download">
+                Windows installer
+              </a>
               <a href="{{ get_url(path='@/experiment-control/artiq.md') }}" class="btn btn-primary btn-lg">More...</a>
-              <div class="btn-group download-selector">
+
-                <a class="btn btn-primary btn-lg d-inline-flex" href="https://nixbld.m-labs.hk/job/artiq/extra/msys2-offline-installer/latest/download/1">
-                  <img src="/images/icons/icon-windows.svg" class="d-inline-block align-self-center mx-1" style="height: 1rem" alt="windows">
-                  <span class="d-inline-block">Download <sup>.exe</sup></span>
-                </a>
-                <div class="divider"></div>
-                <button type="button" class="btn btn-primary btn-lg dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-expanded="false">
-                  <span>stable</span>
-                </button>
-                <ul class="dropdown-menu shadow dropdown-menu-end">
-                  <li>
-                    <a class="dropdown-item" href="https://nixbld.m-labs.hk/job/artiq/extra/msys2-offline-installer/latest/download/1">
-                    ARTIQ-8 (stable) for Windows
-                    </a>
-                  </li>
-                  <li>
-                    <a class="dropdown-item" href="https://nixbld.m-labs.hk/job/artiq/extra-beta/msys2-offline-installer/latest/download/1">
-                      ARTIQ-9 (beta) for Windows
-                    </a>
-                  </li>
-                </ul>
-              </div>
             </div>
 
           </div>