From fc53d7efa2404d3afd42ff37f83f47b82a9387e9 Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 11 Dec 2023 17:48:17 -0500
Subject: [PATCH] FIX: adjust mobile specificity  (#71)

* FIX: adjust mobile specificity

* prettier
---
 common/common.scss                            | 122 ++++++++++--------
 .../discourse/initializers/disco-toc-main.js  |  16 +--
 2 files changed, 73 insertions(+), 65 deletions(-)

diff --git a/common/common.scss b/common/common.scss
index 3b153cf..9d9c99c 100644
--- a/common/common.scss
+++ b/common/common.scss
@@ -191,60 +191,6 @@ a.d-toc-close {
   .d-toc-mini {
     display: block;
   }
-  // overlayed timeline (on mobile and narrow screens)
-  .topic-navigation.with-topic-progress {
-    .d-toc-wrapper {
-      position: fixed;
-      margin-top: 0.25em;
-      height: calc(100dvh - 50px - var(--header-offset));
-      opacity: 0.5;
-      right: -100vw;
-      top: var(--header-offset);
-      width: 75vw;
-      max-width: 350px;
-      background-color: var(--secondary);
-      box-shadow: var(--shadow-dropdown);
-      z-index: z("modal", "overlay");
-      transition: all 0.2s ease-in-out;
-      .d-toc-main {
-        width: 100%;
-        padding: 0.5em;
-        height: 100%;
-        #d-toc {
-          max-height: calc(100% - 2.25em);
-        }
-      }
-      &.overlay {
-        right: 0;
-        width: 75vw;
-        opacity: 1;
-        .d-toc-main {
-          display: block;
-          #d-toc li.d-toc-item ul {
-            transition: none;
-          }
-        }
-      }
-
-      a.scroll-to-bottom {
-        margin-top: 0.33em;
-      }
-
-      a.scroll-to-bottom,
-      a.d-toc-close {
-        display: inline-block;
-        padding: 0.5em;
-      }
-
-      .d-toc-icons {
-        position: absolute;
-        background: var(--secondary);
-        right: 1.5em;
-        top: 0.25em;
-        z-index: z("timeline");
-      }
-    }
-  }
 
   // core overrides when timeline is active
   .timeline-container {
@@ -255,13 +201,69 @@ a.d-toc-close {
   }
 }
 
+// overlayed timeline (on mobile and narrow screens)
+.topic-navigation.with-topic-progress {
+  .d-toc-timeline-toggle {
+    display: none;
+  }
+  .d-toc-wrapper {
+    position: fixed;
+    margin-top: 0.25em;
+    height: calc(100dvh - 50px - var(--header-offset));
+    opacity: 0.5;
+    right: -100vw;
+    top: var(--header-offset);
+    width: 75vw;
+    max-width: 350px;
+    background-color: var(--secondary);
+    box-shadow: var(--shadow-dropdown);
+    z-index: z("modal", "overlay");
+    transition: all 0.2s ease-in-out;
+    .d-toc-main {
+      width: 100%;
+      padding: 0.5em;
+      height: 100%;
+      #d-toc {
+        max-height: calc(100% - 2.25em);
+      }
+    }
+    &.overlay {
+      right: 0;
+      width: 75vw;
+      opacity: 1;
+      .d-toc-main {
+        display: block;
+        #d-toc li.d-toc-item ul {
+          transition: none;
+        }
+      }
+    }
+
+    a.scroll-to-bottom {
+      margin-top: 0.33em;
+    }
+
+    a.scroll-to-bottom,
+    a.d-toc-close {
+      display: inline-block;
+      padding: 0.5em;
+    }
+
+    .d-toc-icons {
+      position: absolute;
+      background: var(--secondary);
+      right: 1.5em;
+      top: 0.25em;
+      z-index: z("timeline");
+    }
+  }
+}
+
 #topic-progress-wrapper {
   align-items: stretch;
   .d-toc-mini {
     display: none;
-    .d-toc-timeline-visible & {
-      display: block;
-    }
+
     height: 100%;
     .btn {
       height: 100%;
@@ -275,6 +277,12 @@ a.d-toc-close {
   }
 }
 
+.d-toc-timeline-toggleable {
+  #topic-progress-wrapper .d-toc-mini {
+    display: block;
+  }
+}
+
 // core sets first child's top margin to 0
 // ensure it's also 0 when TOC markup is first
 .cooked > div[data-theme-toc]:first-child + * {
diff --git a/javascripts/discourse/initializers/disco-toc-main.js b/javascripts/discourse/initializers/disco-toc-main.js
index 4324a7c..2a7b598 100644
--- a/javascripts/discourse/initializers/disco-toc-main.js
+++ b/javascripts/discourse/initializers/disco-toc-main.js
@@ -231,14 +231,6 @@ export default {
       return false;
     }
 
-    if (
-      !classNames.some((className) =>
-        document.body.classList.contains(className)
-      )
-    ) {
-      return;
-    }
-
     // link to each heading
     if (
       e.target.closest(".d-toc-item") &&
@@ -291,6 +283,14 @@ export default {
     if (!e.target.closest(".d-toc-wrapper.overlay")) {
       document.querySelector(".d-toc-wrapper").classList.remove("overlay");
     }
+
+    if (
+      !classNames.some((className) =>
+        document.body.classList.contains(className)
+      )
+    ) {
+      return;
+    }
   },
 
   buildTOC(headings) {