From eb3976c64af6d2d3c67fd255ce9420c28b176392 Mon Sep 17 00:00:00 2001 From: Yanlan Shen Date: Thu, 10 Jan 2019 11:51:06 +0800 Subject: [PATCH] luci-theme-rosy: Fixed some table rounded display issues Signed-off-by: Yanlan Shen --- .../htdocs/luci-static/rosy/js/script.js | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) 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 cffa3676fa..c1a3dcd000 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 @@ -278,10 +278,10 @@ }else { $('.node-main-login form .cbi-value-last input[type="text"]').prop('type', 'password'); $('.node-main-login form .cbi-value-field .iconeye').removeClass('cleye').addClass('opeye'); - num = true + num = true; } - }) + }); $('body.logged-in').css('min-height', $(window).height()); @@ -290,17 +290,22 @@ $('.logged-in .main-right').outerWidth( $(window).width() - $('.logged-in .main-left').width() - 50 ); } - $('.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); + $('.cbi-section .table').each(function () { + var firTr = $(this).children('.tr').get(0); + var firTd = $(firTr).children('.td').get(0); + var th = $(firTr).children('.th').get(0); + + var laTr = $(this).children('.tr').get($(this).children('.tr').length - 1); + var laTd = $(laTr).children('.td').get(0); + var a = window.getComputedStyle(firTr, ':before').getPropertyValue('content'); - if( th && a != 'none' ){ + if (th && a != 'none') { $(th).css('border-top-left-radius', '0'); - }else if( td && a != 'none' ){ - $(td).css('border-top-left-radius', '0'); + } else if (firTd && a != 'none') { + $(firTd).css('border-top-left-radius', '0'); + } + if (laTd && a != 'none') { + $(laTd).css('border-bottom-left-radius', '0'); } }); }); -- 2.30.2