From 8569ef239cc3b1f976cc05af09df3b59f216d9fc Mon Sep 17 00:00:00 2001
From: Jacob Hoffman-Andrews <github@hoffman-andrews.com>
Date: Wed, 14 Oct 2020 00:23:33 -0700
Subject: [PATCH 1/4] Make right-side menus onclick.

---
 templates/header/package_navigation.html |  2 +-
 templates/header/topbar_begin.html       | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/templates/header/package_navigation.html b/templates/header/package_navigation.html
index 38cd6802d..2d30e4e4f 100644
--- a/templates/header/package_navigation.html
+++ b/templates/header/package_navigation.html
@@ -43,7 +43,7 @@ <h1 id="crate-title">
                     {# If there are platforms, show a dropdown with them #}
                     {%- if platforms -%}
                         <ul class="pure-menu-list platforms-menu">
-                            <li class="pure-menu-item pure-menu-has-children pure-menu-allow-hover">
+                            <li class="pure-menu-item pure-menu-has-children">
                                 <a href="#" class="pure-menu-link">Platform</a>
                                 <ul class="pure-menu-children">
                                     {%- for platform in platforms -%}
diff --git a/templates/header/topbar_begin.html b/templates/header/topbar_begin.html
index b6b67303b..849a82121 100644
--- a/templates/header/topbar_begin.html
+++ b/templates/header/topbar_begin.html
@@ -28,13 +28,14 @@
                 </a>
 
                 <ul class="pure-menu-list pure-menu-right">
-                    <li class="pure-menu-item pure-menu-has-children pure-menu-allow-hover pure-menu-opt-children">
-                        <a href="/about" class="pure-menu-link">
+                    <li class="pure-menu-item pure-menu-has-children pure-menu-opt-children">
+                        <a href="#" class="pure-menu-link">
                             <span title="About">{{ "info-circle" | fas }}</span>
                             <span class="title">About</span>
                         </a>
 
                         <ul class="pure-menu-children">
+                            {{ macros::menu_link(href="/about", text="About") }}
                             {{ macros::menu_link(href="/about/badges", text="Badges") }}
                             {{ macros::menu_link(href="/about/builds", text="Builds") }}
                             {{ macros::menu_link(href="/about/metadata", text="Metadata") }}
@@ -42,13 +43,14 @@
                         </ul>
                     </li>{#
 
-                    #}<li class="pure-menu-item pure-menu-has-children pure-menu-allow-hover pure-menu-opt-children">
-                        <a href="/releases" class="pure-menu-link">
+                    #}<li class="pure-menu-item pure-menu-has-children pure-menu-opt-children">
+                        <a href="#" class="pure-menu-link">
                             <span title="Releases">{{ "leaf" | fas }}</span>
                             <span class="title">Releases</span>
                         </a>
 
                         <ul class="pure-menu-children">
+                            {{ macros::menu_link(href="/releases", text="Releases by Recency") }}
                             {{ macros::menu_link(href="/releases/stars", text="Releases by Stars") }}
                             {{ macros::menu_link(href="/releases/recent-failures", text="Recent Build Failures") }}
                             {{ macros::menu_link(href="/releases/failures", text="Build Failures by Stars") }}
@@ -58,12 +60,18 @@
                     </li>{#
 
                     The Rust dropdown menu
-                    #}<li class="pure-menu-item pure-menu-has-children pure-menu-allow-hover pure-menu-opt">
-                        <a href="https://www.rust-lang.org/" target="_blank" class="pure-menu-link">
+                    #}<li class="pure-menu-item pure-menu-has-children pure-menu-opt">
+                        <a href="#" target="_blank" class="pure-menu-link">
                             Rust
                         </a>
 
                         <ul class="pure-menu-children">
+                            {{ macros::menu_link(
+                                href="https://www.rust-lang.org/",
+                                text="Rust-Lang.org",
+                                target="_blank"
+                            ) }}
+
                             {{ macros::menu_link(
                                 href="https://doc.rust-lang.org/book/",
                                 text="The Book",

From ceaa7a461bb567210aa1855c72bf794305ceb01d Mon Sep 17 00:00:00 2001
From: Jacob Hoffman-Andrews <github@hoffman-andrews.com>
Date: Thu, 15 Oct 2020 18:36:32 -0700
Subject: [PATCH 2/4] Update templates/header/topbar_begin.html

Co-authored-by: Joshua Nelson <joshua@yottadb.com>
---
 templates/header/topbar_begin.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/templates/header/topbar_begin.html b/templates/header/topbar_begin.html
index 849a82121..d9e43d661 100644
--- a/templates/header/topbar_begin.html
+++ b/templates/header/topbar_begin.html
@@ -50,7 +50,7 @@
                         </a>
 
                         <ul class="pure-menu-children">
-                            {{ macros::menu_link(href="/releases", text="Releases by Recency") }}
+                            {{ macros::menu_link(href="/releases", text="Recent Releases") }}
                             {{ macros::menu_link(href="/releases/stars", text="Releases by Stars") }}
                             {{ macros::menu_link(href="/releases/recent-failures", text="Recent Build Failures") }}
                             {{ macros::menu_link(href="/releases/failures", text="Build Failures by Stars") }}
@@ -111,4 +111,3 @@
                         </ul>
                     </li>
                 </ul>
-

From 22ef37db5d9e47562c1389beddf0dcc87d8d3009 Mon Sep 17 00:00:00 2001
From: Jacob Hoffman-Andrews <github@hoffman-andrews.com>
Date: Thu, 15 Oct 2020 18:36:45 -0700
Subject: [PATCH 3/4] Update templates/header/topbar_begin.html

Co-authored-by: Joshua Nelson <joshua@yottadb.com>
---
 templates/header/topbar_begin.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/header/topbar_begin.html b/templates/header/topbar_begin.html
index d9e43d661..75e186265 100644
--- a/templates/header/topbar_begin.html
+++ b/templates/header/topbar_begin.html
@@ -68,7 +68,7 @@
                         <ul class="pure-menu-children">
                             {{ macros::menu_link(
                                 href="https://www.rust-lang.org/",
-                                text="Rust-Lang.org",
+                                text="The Rust Programming Language",
                                 target="_blank"
                             ) }}
 

From 0177419b64b226677e78585c650febe98b9c631e Mon Sep 17 00:00:00 2001
From: Jacob Hoffman-Andrews <github@hoffman-andrews.com>
Date: Fri, 16 Oct 2020 03:46:04 +0000
Subject: [PATCH 4/4] Re-add links with menu.js handler.

---
 static/menu.js                     | 10 ++++++++++
 templates/header/topbar_begin.html |  6 +++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/static/menu.js b/static/menu.js
index 275e2921f..11540a243 100644
--- a/static/menu.js
+++ b/static/menu.js
@@ -49,6 +49,16 @@
         backdrop.style.display = "block";
     }
     function menuOnClick(e) {
+        // The "About", "Releases", and "Rust" menus act as menus on desktop,
+        // and links on mobile (due to pure-menu-opt-children). On desktop,
+        // we inhibit navigation events on click so the menu open action can
+        // take effect. Detect desktop by noticing that the second child
+        // is hidden.
+        console.log(this.children[1]);
+        console.log(window.getComputedStyle(this.children[1]).display);
+        if (this.children.length > 1 && window.getComputedStyle(this.children[1]).display != 'none') {
+            return false;
+        }
         if (this.getAttribute("href") != "#") {
             return;
         }
diff --git a/templates/header/topbar_begin.html b/templates/header/topbar_begin.html
index 75e186265..f1510d66d 100644
--- a/templates/header/topbar_begin.html
+++ b/templates/header/topbar_begin.html
@@ -29,7 +29,7 @@
 
                 <ul class="pure-menu-list pure-menu-right">
                     <li class="pure-menu-item pure-menu-has-children pure-menu-opt-children">
-                        <a href="#" class="pure-menu-link">
+                        <a href="/about" class="pure-menu-link">
                             <span title="About">{{ "info-circle" | fas }}</span>
                             <span class="title">About</span>
                         </a>
@@ -44,7 +44,7 @@
                     </li>{#
 
                     #}<li class="pure-menu-item pure-menu-has-children pure-menu-opt-children">
-                        <a href="#" class="pure-menu-link">
+                        <a href="/releases" class="pure-menu-link">
                             <span title="Releases">{{ "leaf" | fas }}</span>
                             <span class="title">Releases</span>
                         </a>
@@ -61,7 +61,7 @@
 
                     The Rust dropdown menu
                     #}<li class="pure-menu-item pure-menu-has-children pure-menu-opt">
-                        <a href="#" target="_blank" class="pure-menu-link">
+                        <a href="https://www.rust-lang.org/" target="_blank" class="pure-menu-link">
                             Rust
                         </a>