Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2306 from yglb/master

Browse source 
luci-theme-rosy: Repair form bug
This commit is contained in:
Jo-Philipp Wich 2018-11-19 07:51:06 +01:00 committed by GitHub
commit 90f728e536
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css
View file

@ -285,7 +285,6 @@ h4 {
.table {
width: 100%;
border-radius: 20px;
overflow: hidden;
}
.table > .tbody > .tr > .td,
@ -361,20 +360,30 @@ div > .table > .tbody > .tr:nth-of-type(2n) {
.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 {
border-top-left-radius: 10px;
}
.table .tr:first-child .td:last-child,
.table .tr:first-child .th:last-child {
border-top-right-radius: 10px;
}
.table .tr:last-child .td:first-child,
.table .tr:last-child::before {
border-bottom-left-radius: 10px;
}
.table .tr:last-child .td:last-child {
border-bottom-right-radius: 10px;
}
.table .tr.placeholder:last-child {
background-color: transparent;
}
.cbi-section .table .cbi-section-table-titles {
background-color: #e0e0e0;
}
.table .tr.cbi-rowstyle-1:nth-child(n),
.table .tr:nth-child(n) {
background-color: #f9f9f9;
}
.table .tr:nth-child(2n) {
background-color: #fff;
}
/* fix progress bar */
#swaptotal > div,
#swapfree > div,
@ -546,6 +555,7 @@ td > table > tbody > tr > td,
}
.container .cbi-map .cbi-tabmenu + div {
border-radius: 0;
border-bottom-left-radius: 10px;
border-bottom-right-radius: 10px;
overflow: hidden;
@ -1362,7 +1372,6 @@ header > .container > .pull-right > * {
}
/* fix status processes */
.node-status-processes > .main .table .tr .td:nth-child(3) {
white-space: normal;
}
@ -1480,7 +1489,7 @@ header > .container > .pull-right > * {
margin-left: 0;
}
.node-system-flashops .cbi-tabmenu {
.lang_zh-cnBackup .cbi-tabmenu {
margin-bottom: 1rem;
}
@ -1946,6 +1955,10 @@ footer {
border-bottom-right-radius: 50px;
}
.node-main-login input.cbi-input-text {
box-shadow: 0 0 0 1000px white inset;
}
/* Interface after login */
.logged-in {
@ -2531,7 +2544,3 @@ footer {
min-width: 25rem;
}
}
input.cbi-input-text {
box-shadow: 0 0 0 1000px white inset;
}

21
themes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js
View file

@ -264,10 +264,23 @@
})
if( $(window).width() > 992 ){
$('.logged-in .main-right').width( $(window).width() - $('.logged-in .main-left').width() - 50 );
}
$('body.logged-in').css('min-height', $(window).height());
$(function(){
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');
console.log(typeof a);
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');
console.log($('.cbi-section .table .tr:last-child .td:first-child'));
}
});
})(jQuery);