Merge pull request #2367 from yglb/master

luci-theme-rosy: Fixed insufficient container container width

2 files changed, 8 insertions, 4 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 1ced4ed764..77f0ecf3e2 100644
--- a/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css
+++ b/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css
@@ -409,12 +409,12 @@ td>table>tbody>tr>td,
 .cbi-button {
     margin: 0 .8rem .5rem 0;
     -webkit-appearance: none;
-    color: rgba(0, 0, 0, 0.87);
-    background-color: #F0F0F0;
+    color: #354057;
+    background-color: transparent;
     transition: all 0.2s ease-in-out;
     display: inline-block;
     padding: .5rem .8rem;
-    border: none;
+    border: 1px solid;
     border-radius: 25px;
     cursor: pointer;
     -ms-touch-action: manipulation;
@@ -1415,7 +1415,9 @@ header>.container>.pull-right>* {
 }
 
 /* fix Services  Network Shares*/
-
+.node-services-samba.lang_enNetwork #cbi-samba-sambashare .table-container {
+    overflow-x: scroll;
+}
 .node-services-samba>.main .cbi-tabcontainer:nth-child(3) .cbi-value-title {
     margin-bottom: 1rem;
     width: auto;
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 9d9cc7a2f9..76ee383ccb 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
@@ -286,4 +286,6 @@
         });
     });
 
+    $('.lang_enNetwork #cbi-samba-sambashare .table').wrap('<div class="table-container"></div>');
+
 })(jQuery);