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

Merge pull request #2539 from yglb/rosy-bugsfix

Browse source 
luci-theme-rosy: Fix typo errors and style errors
This commit is contained in:
Hannu Nyman 2019-02-21 17:39:06 +02:00 committed by GitHub
commit 5e312f956a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 76 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -180,6 +180,12 @@ body {
header { header {
display: none; display: none;
height: 3rem;
z-index: 1000;
}
header .container {
padding: 0 0.5rem;
} }
select { select {
@ -904,35 +910,54 @@ form[method="post"] + form[method="post"],
border-radius: 20px; border-radius: 20px;
} }
.cbi-tabmenu > li,
.tabs > li { .tabs > li {
margin-right: .8rem;
padding: .5rem 4px;
position: relative;
display: inline-block;
text-align: center;
}
.tabs > li a {
color: #468EA4;
font-size: 14px;
text-decoration: none;
position: relative;
z-index: 1;
}
.tabs > li::after {
content: '';
background-color: #cccccc82;
position: absolute;
width: 0;
height: 100%;
bottom: 0;
border-radius: 20px;
left: 50%;
transform: translateX(-50%);
}
.tabs > li:hover::after {
transition: width .35s;
width: calc(100% + 4px);
}
.tabs > li.active::after {
width: calc(100% + 4px);
background-color: #468ea473;
}
.cbi-tabmenu > li {
display: inline-block; display: inline-block;
padding: .6rem 0; padding: .6rem 0;
} }
.cbi-tabmenu > li > a, .cbi-tabmenu > li > a {
.tabs > li > a {
padding: .5rem .8rem; padding: .5rem .8rem;
text-decoration: none; text-decoration: none;
color: #404040; color: #404040;
} }
.tabs > li[class~="active"],
.tabs > li:hover {
cursor: pointer;
background-color: #468ea4;
border-radius: 20px;
}
.tabs > li[class~="active"],
.tabs > li:hover a {
color: #fff;
}
.tabs > li[class~="active"] > a {
color: #fff;
}
.cbi-tabmenu { .cbi-tabmenu {
border: thin solid #d4d4d4; border: thin solid #d4d4d4;
border-bottom: 0; border-bottom: 0;
@ -2207,16 +2232,14 @@ body.login {
} }
.logged-in header { .logged-in header {
padding: 0 1rem;
height: 4rem;
width: 100%;
position: fixed;
top: 0;
background: #fff;
color: #fff;
z-index: 1000;
border-bottom: 1px solid #f5f5f5;
display: block; display: block;
position: fixed;
top: 1rem;
right: 1rem;
border: 1px solid #ddd;
background-color: #fff;
border-radius: 20px;
width: calc(85% - 20px - 2rem);
} }
.logged-in .main { .logged-in .main {
@ -2228,8 +2251,8 @@ body.login {
} }
.logged-in header .container .btn-con { .logged-in header .container .btn-con {
height: 4rem; height: 3rem;
line-height: 4rem; line-height: 3rem;
} }
.logged-in header .container .btn-con #xhr_poll_status { .logged-in header .container .btn-con #xhr_poll_status {
@ -2628,8 +2651,13 @@ body.login {
} }
.logged-in header { .logged-in header {
height: 3rem;
z-index: 2000; z-index: 2000;
top: 0;
left: 0;
width: 100%;
border-radius: 0;
border: none;
border-bottom: 1px solid #ddd;
} }
.showSide, .showSide,

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

@ -170,22 +170,22 @@
* Sidebar expand * Sidebar expand
*/ */
var showSide = false; var showSide = false;
if ($(win).height() == 992) { $(".showSide").click(function () {
$(".showSide").click(function () { if (showSide) {
if (showSide) { $(".darkMask").stop(true).fadeOut("fast");
$(".darkMask").stop(true).fadeOut("fast"); $(".main-left").stop(true).fadeOut("fast");
$(".main-left").stop(true).fadeOut("fast"); $(".main-right").css("overflow-y", "visible");
$(".main-right").css("overflow-y", "visible"); showSide = false;
showSide = false; } else {
} else { $(".darkMask").stop(true).fadeIn("fast");
$(".darkMask").stop(true).fadeIn("fast"); $(".main-left").stop(true).animate({
$(".main-left").stop(true).animate({ width: "100%"
width: "100%" }, "fast").fadeIn("fast");
}, "fast").fadeIn("fast"); $(".main-right").css("overflow-y", "hidden");
$(".main-right").css("overflow-y", "hidden"); showSide = true;
showSide = true; }
} });
}); if($(win).width() <= 992){
$(".main-left").click(function(e) { $(".main-left").click(function(e) {
e.preventDefault(); e.preventDefault();
$(".main-left").stop(true).fadeOut("fast"); $(".main-left").stop(true).fadeOut("fast");
@ -274,4 +274,4 @@
} }
}); });
})(window, jQuery); })(window, jQuery);