[#312] Fix navbar-collapse colors, width and padding.

TeamDignitas · Feb 9, 2022 · fa01217 · fa01217
1 parent cd8df3a
commit fa01217
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 6 deletions.
diff --git a/scripts/cssDiff.php b/scripts/cssDiff.php
@@ -112,7 +112,7 @@ function getc() {
    * consumed.
    */
   function peek() {
-    while (ctype_space($this->peek0)) {
+    while (ctype_space((string)$this->peek0)) {
       $this->getc();
     }
     return $this->peek0;

diff --git a/templates/bits/navmenu.tpl b/templates/bits/navmenu.tpl
@@ -14,7 +14,7 @@
       {include "bits/icon.tpl" i=search}
     </button>
 
-    <div class="collapse navbar-collapse py-1" id="navbar-left">
+    <div class="collapse navbar-collapse py-3" id="navbar-left">
       {include "bits/searchForm.tpl"}
     </div>
 

diff --git a/www/css/main.css b/www/css/main.css
@@ -68,22 +68,24 @@ blockquote {
 
 @media (max-width: 768px) {
   .navbar-collapse {
-    background-color: var(--c-surface);
     margin-top: 3px;
     padding: 1rem;
     position: fixed;
     top: 36px;
     transition: left 0.3s linear;
-    width: 75%;
     z-index: 10;
   }
 
   #navbar-left {
-    left: -75%;
+    background-color: var(--c-navbar-bg);
+    left: -100%;
+    width: 100%;
   }
 
   #navbar-right {
+    background-color: var(--c-navbar-collapse-bg);
     left: 100%;
+    width: 75%;
   }
 
   #navbar-left.show {

diff --git a/www/css/third-party/bootstrap-diff.css b/www/css/third-party/bootstrap-diff.css
@@ -4,6 +4,7 @@ html.dark {
   --c-draft-indicator-color: var(--bs-body-bg);
   --c-hero-bg: var(--bs-body-bg);
   --c-navbar-bg: var(--bs-body-bg);
+  --c-navbar-collapse-bg: #303035;
   --c-notice: black;
   --c-notice-bg: #8a8178;
   --c-recent-statements: var(--bs-butter);
@@ -996,3 +997,4 @@ html.dark input:-webkit-autofill, html.dark input:-webkit-autofill:hover, html.d
   -webkit-box-shadow: 0 0 0px 1000px var(--bs-body-bg) inset !important;
   -webkit-text-fill-color: var(--bs-body-color) !important;
 }
+
diff --git a/www/css/third-party/bootstrap.min.css b/www/css/third-party/bootstrap.min.css
diff --git a/www/scss/main-dark.scss b/www/scss/main-dark.scss
@@ -70,6 +70,7 @@ html.dark {
   --c-draft-indicator-color: var(--bs-body-bg);
   --c-hero-bg: var(--bs-body-bg);
   --c-navbar-bg: var(--bs-body-bg);
+  --c-navbar-collapse-bg: #{$surface}; /* for the slide menus */
   --c-notice: black;
   --c-notice-bg: #8a8178;
   --c-recent-statements: var(--bs-butter);

diff --git a/www/scss/main-light.scss b/www/scss/main-light.scss
@@ -27,6 +27,7 @@ html.light {
   --c-draft-indicator-color: #232429;
   --c-hero-bg: #232429;
   --c-navbar-bg: #232429;
+  --c-navbar-collapse-bg: var(--bs-gray-800); /* for the slide menus */
   --c-notice: black;
   --c-notice-bg: #e0d9d1;
   --c-recent-statements: var(--bs-body-color);