OPNsense 19.7.3: Colour of info logo is orange instead of green

color fix for both themes and smaller height of .page-content-head, .content-box-head (cherry picked from commit 3145be7)
Szeraax · Sep 6, 2019 · cffc627 · cffc627
1 parent c9fc4f2
commit cffc627
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 31 deletions.
diff --git a/misc/theme-cicada/Makefile b/misc/theme-cicada/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		theme-cicada
-PLUGIN_VERSION=		1.19
+PLUGIN_VERSION=		1.20
 PLUGIN_COMMENT=		The cicada theme - grey/orange
 PLUGIN_MAINTAINER=	[email protected]
 

diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/main.scss b/misc/theme-cicada/src/opnsense/www/themes/cicada/assets/stylesheets/main.scss
@@ -8836,19 +8836,19 @@ body {
     margin-right: 20px;
     border: 1px solid #515151;
     border-radius: 3px;
-    min-height: 38px;
+    min-height: 51px;
     height: auto;
-    padding: 10px 20px 10px 20px;
+    padding: 8px 20px 7px 20px;
     -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3);
     box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3);
   }
-  padding-bottom: 15px;
-  padding-top: 20px;
+  padding-bottom: 10px;
+  padding-top: 17px;
 }
 
 .content-box-head {
-  padding-bottom: 15px;
-  padding-top: 20px;
+  padding-bottom: 10px;
+  padding-top: 17px;
 }
 
 .page-content-head .navbar-nav, .content-box-head .navbar-nav {
@@ -9673,7 +9673,6 @@ textarea#update_status {
 .fa-info-circle::before, .fa-question-circle::before {
   content: "\f059";
   cursor: pointer;
-  color: #ec6d12;
 }
 
 div.container-fluid > {
@@ -9797,7 +9796,7 @@ input[type="checkbox"] {
   }
 }
 
-.modal-header > span, .m-r-5, .m-r-10 {
+.modal-header > span {
   color: #000;
 }
 

diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css
@@ -5749,14 +5749,14 @@ body {
   margin-right: 20px;
   border: 1px solid #515151;
   border-radius: 3px;
-  min-height: 38px;
+  min-height: 51px;
 	height: auto;
-  padding: 10px 20px 10px 20px;
+  padding: 8px 20px 7px 20px;
   -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30);
   box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); }
 .page-content-head, .content-box-head {
-  padding-bottom: 15px;
-  padding-top: 20px; }
+  padding-bottom: 10px;
+  padding-top: 17px; }
   .page-content-head .navbar-nav, .content-box-head .navbar-nav {
     width: 100%; }
   .page-content-head h1, .content-box-head h1, .page-content-head h2, .content-box-head h2, .page-content-head h3, .content-box-head h3 {
@@ -6396,7 +6396,6 @@ textarea#update_status, textarea#update_status:hover {
 .fa-info-circle::before,.fa-question-circle::before {
   content: "\f059";
   cursor: pointer;
-  color: #ec6d12;
 }
 
 div.container-fluid > .fa-search::before, div.container-fluid  > .fa-refresh::before {
@@ -6486,10 +6485,6 @@ input[type="checkbox"].checkbox-switch:checked + i::before, input[type="checkbox
   color: #000;
 }
 
-.m-r-5, .m-r-10 {
-  color: #000;
-}
-
 .sessions-body table > thead > tr > th, .sessions-body table > tbody > tr > td {
   border-color: #5A5A5A !important;
 }

diff --git a/misc/theme-tukan/Makefile b/misc/theme-tukan/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		theme-tukan
-PLUGIN_VERSION=		1.19
+PLUGIN_VERSION=		1.20
 PLUGIN_COMMENT=		The tukan theme - blue/white
 PLUGIN_MAINTAINER=	[email protected]
 

diff --git a/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/main.scss b/misc/theme-tukan/src/opnsense/www/themes/tukan/assets/stylesheets/main.scss
@@ -8810,20 +8810,20 @@ body {
     margin-right: 20px;
     border: 1px solid #b0b0b0;
     border-radius: 3px;
-    min-height: 38px;
+    min-height: 51px;
     height: auto;
-    padding: 10px 20px 10px 20px;
+    padding: 8px 20px 7px 20px;
     -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3);
     box-shadow: 0 5px 10px rgba(0, 0, 0, 0.3);
   }
-  padding-bottom: 15px;
-  padding-top: 20px;
+  padding-bottom: 10px;
+  padding-top: 17px;
   color: #000;
 }
 
 .content-box-head {
-  padding-bottom: 15px;
-  padding-top: 20px;
+  padding-bottom: 10px;
+  padding-top: 17px;
   color: #000;
 }
 
@@ -9675,7 +9675,6 @@ textarea#update_status {
 
 .fa-question-circle::before {
   content: "\f059";
-  color: #ff7e25;
   cursor: pointer;
 }
 

diff --git a/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/main.css b/misc/theme-tukan/src/opnsense/www/themes/tukan/build/css/main.css
@@ -5721,15 +5721,15 @@ body {
   margin-right: 20px;
   border: 1px solid #b0b0b0;
   border-radius: 3px;
-  min-height: 38px;
+  min-height: 51px;
   height:auto;
-  padding: 10px 20px 10px 20px;
+  padding: 8px 20px 7px 20px;
   -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30);
   box-shadow: 0 5px 10px rgba(0, 0, 0, 0.30); }
 
 .page-content-head, .content-box-head {
-  padding-bottom: 15px;
-  padding-top: 20px;
+  padding-bottom: 10px;
+  padding-top: 17px;
   color:#000;}
   .page-content-head .navbar-nav, .content-box-head .navbar-nav {
     width: 100%; }
@@ -6377,7 +6377,6 @@ textarea#update_status, textarea#update_status:hover {
 
 .fa-question-circle::before {
   content: "\f059";
-  color: #ff7e25;
   cursor: pointer;
 }
 .fa-refresh::before {