From a21d24f4b7d14701205a6805422de31da84da6ca Mon Sep 17 00:00:00 2001
From: Khloe Leclair <xivkhloeleclair@gmail.com>
Date: Tue, 12 Apr 2022 02:07:21 -0400
Subject: Replace bitfields for state and just use comma-separated strings. Add
 a note that numbers may be inaccurate if filtering is used when sections are
 collapsed. Add quick navigation links.

---
 src/SMAPI.Web/wwwroot/Content/css/main.css | 32 ++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(limited to 'src/SMAPI.Web/wwwroot/Content/css')

diff --git a/src/SMAPI.Web/wwwroot/Content/css/main.css b/src/SMAPI.Web/wwwroot/Content/css/main.css
index dcc7a798..52b304d0 100644
--- a/src/SMAPI.Web/wwwroot/Content/css/main.css
+++ b/src/SMAPI.Web/wwwroot/Content/css/main.css
@@ -72,6 +72,7 @@ a {
     color: #666;
 }
 
+#quickNav h4,
 #sidebar h4 {
     margin: 1.5em 0 0.2em 0;
     width: 10em;
@@ -80,11 +81,13 @@ a {
     font-weight: normal;
 }
 
+#quickNav a,
 #sidebar a {
     color: #77B;
     border: 0;
 }
 
+#quickNav ul, #quickNav li,
 #sidebar ul, #sidebar li {
     margin: 0;
     padding: 0;
@@ -93,10 +96,29 @@ a {
     color: #888;
 }
 
+#quickNav li,
 #sidebar li {
     margin-left: 1em;
 }
 
+/* quick navigation */
+
+#quickNav {
+    position: fixed;
+    left: 8px;
+    bottom: 3em;
+    width: 12em;
+    color: #666;
+}
+
+@media (max-height: 400px) {
+    #quickNav {
+        position: unset;
+        width: auto;
+    }
+}
+
+
 /* footer */
 #footer {
     margin: 1em;
@@ -111,11 +133,16 @@ a {
 
 /* mobile fixes */
 @media (min-width: 1020px) and (max-width: 1199px) {
+    #quickNav,
     #sidebar {
         width: 7em;
         background: none;
     }
 
+    #quickNav h4 {
+        width: unset;
+    }
+
     #content-column {
         left: 7em;
     }
@@ -138,4 +165,9 @@ a {
         top: inherit;
         left: inherit;
     }
+
+    #quickNav {
+        position: unset;
+        width: auto;
+    }
 }
-- 
cgit 


From 0b9227564979b3e6e71dbd48ced2a9b7407fd640 Mon Sep 17 00:00:00 2001
From: Khloe Leclair <xivkhloeleclair@gmail.com>
Date: Tue, 12 Apr 2022 02:18:51 -0400
Subject: Make horizontal scrolling with the quick navigation links less bad.
 Probably need to move them into the actual sidebar element though for proper
 sorting.

---
 src/SMAPI.Web/wwwroot/Content/css/log-parser.css | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/SMAPI.Web/wwwroot/Content/css')

diff --git a/src/SMAPI.Web/wwwroot/Content/css/log-parser.css b/src/SMAPI.Web/wwwroot/Content/css/log-parser.css
index 41b54e11..e47a938d 100644
--- a/src/SMAPI.Web/wwwroot/Content/css/log-parser.css
+++ b/src/SMAPI.Web/wwwroot/Content/css/log-parser.css
@@ -13,6 +13,9 @@ caption {
 #output {
     padding: 10px;
     overflow: auto;
+    z-index: 1;
+    background: #fff;
+    position: relative;
 }
 
 #output h2 {
-- 
cgit 


From 4f54f517ce3d6fd6e87cfee6b0ce61346d62c3e3 Mon Sep 17 00:00:00 2001
From: Khloe Leclair <xivkhloeleclair@gmail.com>
Date: Tue, 12 Apr 2022 13:50:51 -0400
Subject: Use an optional section for rendering quick navigation links on the
 mod viewer, containing them within the #sidebar element.

---
 src/SMAPI.Web/Views/LogParser/Index.cshtml       | 22 ++++++++++++----------
 src/SMAPI.Web/Views/Shared/_Layout.cshtml        |  2 ++
 src/SMAPI.Web/wwwroot/Content/css/log-parser.css |  3 ---
 src/SMAPI.Web/wwwroot/Content/css/main.css       |  6 ------
 4 files changed, 14 insertions(+), 19 deletions(-)

(limited to 'src/SMAPI.Web/wwwroot/Content/css')

diff --git a/src/SMAPI.Web/Views/LogParser/Index.cshtml b/src/SMAPI.Web/Views/LogParser/Index.cshtml
index d95499b7..d55bfd4d 100644
--- a/src/SMAPI.Web/Views/LogParser/Index.cshtml
+++ b/src/SMAPI.Web/Views/LogParser/Index.cshtml
@@ -95,16 +95,18 @@
 }
 
 @* quick navigation links *@
-@if (log != null)
-{
-    <aside id="quickNav">
-        <h4>Scroll To...</h4>
-        <ul>
-            <li><a href="#content">Top</a></li>
-            <li><a href="#filterHolder">Log Start</a></li>
-            <li><a href="#footer">Bottom</a></li>
-        </ul>
-    </aside>
+@section SidebarExtra {
+    @if (log != null)
+    {
+        <aside id="quickNav">
+            <h4>Scroll To...</h4>
+            <ul>
+                <li><a href="#content">Top</a></li>
+                <li><a href="#filterHolder">Log Start</a></li>
+                <li><a href="#footer">Bottom</a></li>
+            </ul>
+        </aside>
+    }
 }
 
 @* upload result banner *@
diff --git a/src/SMAPI.Web/Views/Shared/_Layout.cshtml b/src/SMAPI.Web/Views/Shared/_Layout.cshtml
index 7c86a68c..248cc7ef 100644
--- a/src/SMAPI.Web/Views/Shared/_Layout.cshtml
+++ b/src/SMAPI.Web/Views/Shared/_Layout.cshtml
@@ -30,6 +30,8 @@
             <li><a href="@Url.PlainAction("Index", "LogParser", values: null)">Log parser</a></li>
             <li><a href="@Url.PlainAction("Index", "JsonValidator", values: null)">JSON validator</a></li>
         </ul>
+
+        @RenderSection("SidebarExtra", required: false)
     </div>
     <div id="content-column">
         <div id="content">
diff --git a/src/SMAPI.Web/wwwroot/Content/css/log-parser.css b/src/SMAPI.Web/wwwroot/Content/css/log-parser.css
index e47a938d..41b54e11 100644
--- a/src/SMAPI.Web/wwwroot/Content/css/log-parser.css
+++ b/src/SMAPI.Web/wwwroot/Content/css/log-parser.css
@@ -13,9 +13,6 @@ caption {
 #output {
     padding: 10px;
     overflow: auto;
-    z-index: 1;
-    background: #fff;
-    position: relative;
 }
 
 #output h2 {
diff --git a/src/SMAPI.Web/wwwroot/Content/css/main.css b/src/SMAPI.Web/wwwroot/Content/css/main.css
index 52b304d0..a0a407d8 100644
--- a/src/SMAPI.Web/wwwroot/Content/css/main.css
+++ b/src/SMAPI.Web/wwwroot/Content/css/main.css
@@ -72,7 +72,6 @@ a {
     color: #666;
 }
 
-#quickNav h4,
 #sidebar h4 {
     margin: 1.5em 0 0.2em 0;
     width: 10em;
@@ -81,13 +80,11 @@ a {
     font-weight: normal;
 }
 
-#quickNav a,
 #sidebar a {
     color: #77B;
     border: 0;
 }
 
-#quickNav ul, #quickNav li,
 #sidebar ul, #sidebar li {
     margin: 0;
     padding: 0;
@@ -96,7 +93,6 @@ a {
     color: #888;
 }
 
-#quickNav li,
 #sidebar li {
     margin-left: 1em;
 }
@@ -105,10 +101,8 @@ a {
 
 #quickNav {
     position: fixed;
-    left: 8px;
     bottom: 3em;
     width: 12em;
-    color: #666;
 }
 
 @media (max-height: 400px) {
-- 
cgit