summaryrefslogtreecommitdiffhomepage
path: root/themes/luci-theme-rosy/htdocs
diff options
context:
space:
mode:
authorYanlan Shen <yanlan.shen.@rosinson.com>2018-11-29 18:30:12 +0800
committerYanlan Shen <yanlan.shen.@rosinson.com>2018-12-03 15:08:11 +0800
commitc7bd4397fbd761591237c7171e147969099fc4d1 (patch)
treeece9bee876fe7c028d43748857116321b1ad05e9 /themes/luci-theme-rosy/htdocs
parent6cb25970b8089afc9dffd0b82ff1a64837633344 (diff)
luci-theme-rosy: Fixed bug with rounded corners and drop down boxes
Signed-off-by: Yanlan Shen <yanlan.shen.@rosinson.com>
Diffstat (limited to 'themes/luci-theme-rosy/htdocs')
-rw-r--r--themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css8
-rwxr-xr-xthemes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js24
2 files changed, 16 insertions, 16 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 d380caf92..0b30ee3c4 100644
--- a/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css
+++ b/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css
@@ -528,7 +528,6 @@ td>table>tbody>tr>td,
border-radius: 0;
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
- overflow: hidden;
}
.tabs {
background-color: #FFFFFF;
@@ -654,11 +653,6 @@ td>table>tbody>tr>td,
background-color: #eee;
}
-.cbi-rowstyle-2 .cbi-button-up,
-.cbi-rowstyle-2 .cbi-button-down {
- background-color: #468ea4 !important;
-}
-
.cbi-section-table .cbi-section-table-titles .cbi-section-table-cell {
width: auto !important;
}
@@ -2475,4 +2469,4 @@ footer {
.cbi-value-field .cbi-dropdown {
min-width: 25rem;
}
-} \ No newline at end of file
+}
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 9da67062a..e8ba02060 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
@@ -270,15 +270,20 @@
if( $(window).width() > 992 ){
$('.logged-in .main-right').outerWidth( $(window).width() - $('.logged-in .main-left').width() - 50 );
}
- var a = window.getComputedStyle($(".cbi-section .table .tr:first-child")[0], ':before').getPropertyValue('content');
- var b = window.getComputedStyle($('.cbi-section .table .tr:last-child')[0], ':before').getPropertyValue('content');
-
- if( a != 'none' || b != 'none' ){
- $('.cbi-section .table .tr:first-child .td:first-child').css('border-top-left-radius', '0');
- $('.cbi-section .table .tr:last-child .td:first-child').css('border-bottom-left-radius', '0');
- $('.cbi-section .table .tr:first-child .th:first-child').css('border-top-left-radius', '0');
-
- }
+
+ $('.cbi-section .table').each(function(){
+ var thisTr = $(this).children('.tr').get(0);
+ var td = $(thisTr).children('.td').get(0);
+ var th = $(thisTr).children('.th').get(0)
+ var a = window.getComputedStyle(thisTr, ':before').getPropertyValue('content');
+ console.log(td, th);
+
+ if( th && a != 'none' ){
+ $(th).css('border-top-left-radius', '0');
+ }else if( td && a != 'none' ){
+ $(td).css('border-top-left-radius', '0');
+ }
+ });
});
$('<samll>').text($('.cbi-progressbar').attr('title')).appendTo('.cbi-progressbar');
@@ -288,5 +293,6 @@
});
}, 5000);
+
})(jQuery);