Place more of the generic style fixes in hmBootstrap.css and revert '…

…Fix #menubar style in style.css'
jens-maus · Nov 9, 2021 · 50ab606 · 50ab606
1 parent 54dba9c
commit 50ab606
Show file tree

Hide file tree

Showing 5 changed files with 109 additions and 10 deletions.
diff --git a/buildroot-external/patches/occu/0002-WebUI-Bootstrap.patch b/buildroot-external/patches/occu/0002-WebUI-Bootstrap.patch
@@ -45,10 +45,35 @@
 \ No newline at end of file
 --- occu/WebUI/www/webui/css/extern/hmBootstrap.css.orig
 +++ occu/WebUI/www/webui/css/extern/hmBootstrap.css
-@@ -0,0 +1,3 @@
+@@ -0,0 +1,28 @@
 +/*!
 + * Place all our bootstrap related style fixes into this file
 + */
++
++#header *,
++#header ::after,
++#header ::before,
++#menubar,
++#content *,
++#content ::after,
++#content ::before {
++  box-sizing: content-box;
++}
++
++#header,
++.UIFrameContent {
++  line-height: initial;
++}
++
++.FooterButton {
++  box-sizing: content-box;
++}
++
++#header table,
++#content table,
++#messagebox table {
++  border-collapse: separate;
++}
 --- occu/WebUI/www/webui/js/extern/bootstrap.bundle.min.js.map.orig
 +++ occu/WebUI/www/webui/js/extern/bootstrap.bundle.min.js.map
 @@ -0,0 +1 @@

diff --git a/...xternal/patches/occu/0002-WebUI-Bootstrap/occu/WebUI/www/webui/css/extern/hmBootstrap.css b/...xternal/patches/occu/0002-WebUI-Bootstrap/occu/WebUI/www/webui/css/extern/hmBootstrap.css
@@ -1,3 +1,28 @@
 /*!
  * Place all our bootstrap related style fixes into this file
  */
+
+#header *,
+#header ::after,
+#header ::before,
+#menubar,
+#content *,
+#content ::after,
+#content ::before {
+  box-sizing: content-box;
+}
+
+#header,
+.UIFrameContent {
+  line-height: initial;
+}
+
+.FooterButton {
+  box-sizing: content-box;
+}
+
+#header table,
+#content table,
+#messagebox table {
+  border-collapse: separate;
+}
diff --git a/buildroot-external/patches/occu/0057-WebUI-ImprovedDutyCycleDisplay.patch b/buildroot-external/patches/occu/0057-WebUI-ImprovedDutyCycleDisplay.patch
@@ -206,10 +206,10 @@
            </table>
 --- occu/WebUI/www/webui/css/extern/hmBootstrap.css.orig
 +++ occu/WebUI/www/webui/css/extern/hmBootstrap.css
-@@ -1,3 +1,19 @@
- /*!
-  * Place all our bootstrap related style fixes into this file
-  */
+@@ -26,3 +26,19 @@
+ #messagebox table {
+   border-collapse: separate;
+ }
 +
 +#hmBootstrap .progress {
 +  position: relative; /* inserted */
@@ -226,7 +226,6 @@
 +  font-size: 11px; /* 12px */
 +  line-height: 14px; /* 20px */
 +}
-\ No newline at end of file
 --- occu/WebUI/www/webui/style.css.orig
 +++ occu/WebUI/www/webui/style.css
 @@ -2234,27 +2234,6 @@
@@ -369,7 +368,8 @@
 +                dutyCycleBar.addClass("bg-danger");
 +              } else if (arInterfaceDutyCycle[ifaceBidCosRF] > dcWarn) {
 +                dutyCycleBar.addClass("bg-warning");
-+              } else {
+               } else {
+-                trDutyCycle.removeClass("attention");
 +                dutyCycleBar.addClass("bg-success");
 +              }
 +              
@@ -388,8 +388,7 @@
 +                } else {
 +                  carrierSenseBar.addClass("bg-info");
 +                }
-               } else {
--                trDutyCycle.removeClass("attention");
++              } else {
 +                carrierSenseValElm.text("n/a");
 +                carrierSenseBar.css("width", "0%");
                }

diff --git a/.../occu/0057-WebUI-ImprovedDutyCycleDisplay/occu/WebUI/www/webui/css/extern/hmBootstrap.css b/.../occu/0057-WebUI-ImprovedDutyCycleDisplay/occu/WebUI/www/webui/css/extern/hmBootstrap.css
@@ -2,6 +2,31 @@
  * Place all our bootstrap related style fixes into this file
  */
 
+#header *,
+#header ::after,
+#header ::before,
+#menubar,
+#content *,
+#content ::after,
+#content ::before {
+  box-sizing: content-box;
+}
+
+#header,
+.UIFrameContent {
+  line-height: initial;
+}
+
+.FooterButton {
+  box-sizing: content-box;
+}
+
+#header table,
+#content table,
+#messagebox table {
+  border-collapse: separate;
+}
+
 #hmBootstrap .progress {
   position: relative; /* inserted */
   height: 14px; /* 20px */
@@ -16,4 +41,4 @@
 #hmBootstrap .progress-bar {
   font-size: 11px; /* 12px */
   line-height: 14px; /* 20px */
-}
+}
diff --git a/.../0057-WebUI-ImprovedDutyCycleDisplay/occu/WebUI/www/webui/css/extern/hmBootstrap.css.orig b/.../0057-WebUI-ImprovedDutyCycleDisplay/occu/WebUI/www/webui/css/extern/hmBootstrap.css.orig
@@ -1,3 +1,28 @@
 /*!
  * Place all our bootstrap related style fixes into this file
  */
+
+#header *,
+#header ::after,
+#header ::before,
+#menubar,
+#content *,
+#content ::after,
+#content ::before {
+  box-sizing: content-box;
+}
+
+#header,
+.UIFrameContent {
+  line-height: initial;
+}
+
+.FooterButton {
+  box-sizing: content-box;
+}
+
+#header table,
+#content table,
+#messagebox table {
+  border-collapse: separate;
+}