From 12e94a40367284ce66199e1924c0d64e55820f81 Mon Sep 17 00:00:00 2001
From: Martin Wasley <martin@queens-park.com>
Date: Wed, 23 May 2018 15:40:23 +0100
Subject: [PATCH] Rebellion Theme fix for Firewall Schedule etc (#677)

---
 misc/theme-rebellion/Makefile                 |  2 +-
 .../rebellion/assets/stylesheets/main.scss    | 62 +++++++++++++++++++
 .../www/themes/rebellion/build/css/main.css   | 61 ++++++++++++++++--
 3 files changed, 118 insertions(+), 7 deletions(-)

diff --git a/misc/theme-rebellion/Makefile b/misc/theme-rebellion/Makefile
index d086ddb44..171c56cb0 100644
--- a/misc/theme-rebellion/Makefile
+++ b/misc/theme-rebellion/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		theme-rebellion
-PLUGIN_VERSION=		1.0
+PLUGIN_VERSION=		1.1
 PLUGIN_COMMENT=		A suitably dark theme
 PLUGIN_MAINTAINER=	team-rebellion@queens-park.com
 
diff --git a/misc/theme-rebellion/src/opnsense/www/themes/rebellion/assets/stylesheets/main.scss b/misc/theme-rebellion/src/opnsense/www/themes/rebellion/assets/stylesheets/main.scss
index 1b4450b9b..f9a2b2c64 100644
--- a/misc/theme-rebellion/src/opnsense/www/themes/rebellion/assets/stylesheets/main.scss
+++ b/misc/theme-rebellion/src/opnsense/www/themes/rebellion/assets/stylesheets/main.scss
@@ -645,3 +645,65 @@ select {
   background-repeat: no-repeat;
   background-position: right;
   background-image: url(/ui/themes/opnsense/build/images/caret.png) !important;}
+  
+  #grid-log th[data-column-id="__timestamp__"],
+#filter-log-entries th[data-column-id="__timestamp__"] {
+  min-width: 3.5em;
+}
+
+.table-responsive {
+  @media screen and (max-width: $screen-xs-max) {
+    margin-bottom: 0;
+    > .table {
+      > thead,
+      > tbody,
+      > tfoot {
+        > tr {
+          > th,
+          > td {
+            white-space: normal;
+          }
+        }
+      }
+    }
+  }
+}
+
+label>input[type="checkbox"],
+label>input[type="radio"] {
+  margin-right: .4em;
+  float:left;
+}
+
+div[data-for*="help_for"] {
+  padding-top: .4em;
+}
+
+#log-settings label[for^="act"] {
+  margin-right: 1.5em;
+}
+
+#log-settings table>tbody>tr>td {
+  vertical-align: middle;
+}
+
+#log-settings select#filterlogentries,
+#log-settings select#filterlogentriesupdateinterval {
+  width: 5em;
+}
+
+#log-settings select#filterlogentriesinterfaces {
+  min-width: 100%;
+  max-width: 100%;
+}
+
+/* fields in firewall schedule */
+[data-state="lightcoral"] {
+  background-color: lightcoral;
+}
+[data-state="white"] {
+  background-color: inherit;
+}
+[data-state="red"] {
+  background-color: #ec6d12;
+}
diff --git a/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/main.css b/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/main.css
index 25bd4dfb5..d4e0cd87a 100644
--- a/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/main.css
+++ b/misc/theme-rebellion/src/opnsense/www/themes/rebellion/build/css/main.css
@@ -2031,10 +2031,10 @@ th {
     padding: 10px 0px 10px 20px;
     line-height: 1.428571429;
     vertical-align: top;
-    border-top: 1px solid #111; }
+    border-top: 1px solid #aaa; }
   .table > thead > tr > th {
     vertical-align: bottom;
-    border-bottom: 1px solid #111; }
+    border-bottom: 1px solid #aaa; }
   .table > caption + thead > tr:first-child > th,
   .table > caption + thead > tr:first-child > td,
   .table > colgroup + thead > tr:first-child > th,
@@ -2045,7 +2045,7 @@ th {
     font-family: 'SourceSansProSemibold';
     font-weight: normal; }
   .table > tbody + tbody {
-    border-top: 2px solid #111; }
+    border-top: 2px solid #aaa; }
   .table .table {
     background-color: #333; }
 
@@ -2058,14 +2058,14 @@ th {
   padding: 5px; }
 
 .table-bordered {
-  border: 1px solid #111; }
+  border: 1px solid #aaa; }
   .table-bordered > thead > tr > th,
   .table-bordered > thead > tr > td,
   .table-bordered > tbody > tr > th,
   .table-bordered > tbody > tr > td,
   .table-bordered > tfoot > tr > th,
   .table-bordered > tfoot > tr > td {
-    border: 1px solid #111; }
+    border: 1px solid #aaa; }
   .table-bordered > thead > tr > th,
   .table-bordered > thead > tr > td {
     border-bottom-width: 2px; }
@@ -4548,7 +4548,7 @@ a.list-group-item-danger {
     border-bottom-right-radius: 2px; }
 .panel > .panel-body + .table,
 .panel > .panel-body + .table-responsive {
-  border-top: 1px solid #111; }
+  border-top: 1px solid #aaa; }
 .panel > .table > tbody:first-child > tr:first-child th,
 .panel > .table > tbody:first-child > tr:first-child td {
   border-top: 0; }
@@ -5846,3 +5846,52 @@ select {
   background-repeat: no-repeat;
   background-position: right;
   background-image: url(/ui/themes/opnsense/build/images/caret.png) !important; }
+
+#grid-log th[data-column-id="__timestamp__"],
+#filter-log-entries th[data-column-id="__timestamp__"] {
+  min-width: 3.5em; }
+
+@media screen and (max-width: 767px) {
+  .table-responsive {
+    margin-bottom: 0; }
+    .table-responsive > .table > thead > tr > th,
+    .table-responsive > .table > thead > tr > td,
+    .table-responsive > .table > tbody > tr > th,
+    .table-responsive > .table > tbody > tr > td,
+    .table-responsive > .table > tfoot > tr > th,
+    .table-responsive > .table > tfoot > tr > td {
+      white-space: normal; } }
+
+label > input[type="checkbox"],
+label > input[type="radio"] {
+  margin-right: .4em;
+  float: left; }
+
+div[data-for*="help_for"] {
+  padding-top: .4em; }
+
+#log-settings label[for^="act"] {
+  margin-right: 1.5em; }
+
+#log-settings table > tbody > tr > td {
+  vertical-align: middle; }
+
+#log-settings select#filterlogentries,
+#log-settings select#filterlogentriesupdateinterval {
+  width: 5em; }
+
+#log-settings select#filterlogentriesinterfaces {
+  min-width: 100%;
+  max-width: 100%; }
+
+/* fields in firewall schedule */
+[data-state="lightcoral"] {
+  background-color: lightcoral; }
+
+[data-state="white"] {
+  background-color: inherit; }
+
+[data-state="red"] {
+  background-color: #ec6d12; }
+
+/*# sourceMappingURL=main.css.map */