From fa407b036a70067eb7de6912644b98fe0c18b642 Mon Sep 17 00:00:00 2001
From: Yanlan Shen <yanlan.shen.@rosinson.com>
Date: Thu, 10 Jan 2019 11:49:37 +0800
Subject: [PATCH] luci-theme-rosy: Fixed table color matching problem

Signed-off-by: Yanlan Shen <yanlan.shen.@rosinson.com>
---
 .../htdocs/luci-static/rosy/cascade.css       | 36 ++++++-------------
 .../htdocs/luci-static/rosy/js/script.js      |  2 +-
 2 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css b/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css
index ca65dad85..3132a4849 100644
--- a/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css
+++ b/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css
@@ -403,20 +403,6 @@ h4 {
     width: calc(100% - 1.5rem);
 }
 
-div>table>tbody>tr:nth-of-type(2n),
-div>.table>.tbody>.tr:nth-of-type(2n) {
-    background-color: #f9f9f9;
-}
-
-div>table>tbody>tr:nth-of-type(2n),
-div>.table>.tbody>.tr:nth-of-type(2n) {
-    background-color: #f9f9f9;
-}
-
-.cbi-section .table .tr.table-titles {
-    background-color: #eee;
-}
-
 .table .tr:first-child .td:first-child,
 .table .tr:first-child::before,
 .table .tr:first-child .th:first-child {
@@ -441,10 +427,6 @@ div>.table>.tbody>.tr:nth-of-type(2n) {
     background-color: transparent;
 }
 
-.cbi-section .table .cbi-section-table-titles {
-    background-color: #e0e0e0;
-}
-
 /* fix progress bar */
 .cbi-progressbar {
     background-color: #9bc1cc;
@@ -776,12 +758,19 @@ td>table>tbody>tr>td,
     vertical-align: middle;
 }
 
-.cbi-rowstyle-1 {
+.table .tr.cbi-rowstyle-2,
+.table .tr:nth-child(n) {
+    background-color: #eee;
+}
+
+.table .tr.cbi-rowstyle-1,
+.table .tr:nth-child(2n) {
     background-color: #f9f9f9;
 }
 
-.cbi-rowstyle-2 {
-    background-color: #eee;
+.table .tr.table-titles,
+.table .tr.cbi-section-table-titles {
+    background-color: #ddd;
 }
 
 .cbi-section-table .cbi-section-table-titles .cbi-section-table-cell {
@@ -1488,11 +1477,6 @@ header>.container>.pull-right>* {
     overflow-x: scroll;
 }
 
-.node-status-iptables #iptables .table-titles,
-.node-system-opkg #packages .cbi-section-table-titles {
-    background-color: #eee;
-}
-
 /* fix status realtime traffic and wireless */
 
 .node-status-realtime.lang_enTraffic .cbi-tabmenu,
diff --git a/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js b/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js
index cda7b471b..cffa3676f 100755
--- a/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js
+++ b/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js
@@ -305,6 +305,6 @@
         });
     });
 
-    $('.lang_enNetwork #cbi-samba-sambashare .table').wrap('<div class="table-container"></div>');
+    $('#iptables').prev().css('margin-top', '10px');
 
 })(jQuery);
-- 
2.25.1