Update HVAMP32 according to the factual specs

Signed-off-by: Egor Savkin <es@m-labs.hk>
Optimize the download button
2024-10-24 17:25:29 +08:00 · 2024-10-21 17:46:40 +08:00 · 2024-10-21 15:32:19 +08:00 · 2024-10-18 12:29:19 +08:00 · 2024-10-17 11:10:40 +08:00
4 changed files with 125 additions and 58 deletions
--- a/sass/css/_base.scss
+++ b/sass/css/_base.scss
@ -90,28 +90,52 @@ a {
  }
 }

-.navbar-light .navbar-nav .nav-link,
-.dropdown-item {
-  outline: none;
-  color: $color-primary;
-  text-decoration: none;
-
-  &:visited {
+.navbar {
+  .navbar-light .navbar-nav .nav-link,
+  .dropdown-item {
+    outline: none;
    color: $color-primary;
+    text-decoration: none;
+
+    &:visited {
+      color: $color-primary;
+    }
+
+    &:hover {
+      color: $color-secondary;
+    }
  }

-  &:hover {
+  .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;
  }
-}

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


 /**
@ -127,22 +151,6 @@ 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;
@ -155,18 +163,11 @@ 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;
@ -200,6 +201,63 @@ 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;
--- a/static/images/icons/icon-windows.svg
+++ b/static/images/icons/icon-windows.svg
@ -0,0 +1 @@
+<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>
--- a/static/js/shop_data.js
+++ b/static/js/shop_data.js
@ -51,8 +51,8 @@ const shop_data = {
          title: "Optional pre-installed NUC mini-computer",
          outvar: "nuc",
          tip: "Pre-installed NixOS desktop with ARTIQ and other scientific software. " +
-               "Hardware: Intel® NUC 13 Pro Kit NUC13ANKi7, i7-1360P CPU, " +
-               "32GB RAM, 1TB NVMe. Other options contact us.",
+               "Hardware: ASUS® NUC 14 Pro Kit, Intel® i7-155H CPU, " +
+               "32GB RAM, 1TB NVMe. For other options contact us.",
          fallback: true,
        }},
        {
@ -877,23 +877,14 @@ const shop_data = {
      price: 1500,
      image: '/images/shop/graphic-03_HVAMP32.svg',
      specs: [
-        'Amplifier: LTC6090 or OPA462, 32 channels.',
-        'Amplification range up to ±25V and ±55V available.',
+        'Amplifier: LTC6090, 32 channels.',
+        'Amplification range: ±50V.',
        'Over-temperature protection.',
        'External 12V power supply.',
        'Slew rate 21V/us typical.',
-        'Bandwidth: 12MHz/gain, for ±25V range BW is 4.8MHz typical.',
+        'Bandwidth: 12MHz/gain, 2.4MHz typical.',
        'The same connector as in Zotino and Fastino.'
      ],
-      options: [
-        {type: "Radio",
-          args: {
-            title: "Amplification range",
-            outvar: "hvamp",
-            variants: ["±25V", "±55V"],
-            fallback: 0
-        }},
-      ],
      size: 'small',
      warnings: [
        "no_idc_source"
--- a/templates/index.html
+++ b/templates/index.html
@ -53,12 +53,29 @@
              <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>
Author	SHA1	Message	Date
Egor Savkin	130b8b67d9	Update HVAMP32 according to the factual specs Signed-off-by: Egor Savkin <es@m-labs.hk>	2024-10-24 17:25:29 +08:00
Egor Savkin	f29807a913	Optimize the download button Replace download button with windows icon (just four squares). Make the download button last so on certain screens it wouldn't cause additional empty-ish lines. Redo the wording so the button is shorter, but the dropdown menu is filled. Signed-off-by: Egor Savkin <es@m-labs.hk>	2024-10-21 17:46:40 +08:00
Egor Savkin	9d9a4c9f5a	Split dropdown On main click it downloads stable, in dropdown there are two choices - stable and beta. Similar to the downloads on jetbrains website Signed-off-by: Egor Savkin <es@m-labs.hk>	2024-10-21 15:32:19 +08:00
Egor Savkin	92f7428ac8	Replace download button with dropdown Signed-off-by: Egor Savkin <es@m-labs.hk>	2024-10-18 12:29:19 +08:00
Egor Savkin	a163a269b9	Update NUC Signed-off-by: Egor Savkin <es@m-labs.hk>	2024-10-17 11:10:40 +08:00
				`@ -0,0 +1 @@`
				`<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>`