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

Merge pull request #2663 from rosysong/rosy-bugs-fix

Browse source 
luci-theme-rosy: bugs fix
This commit is contained in:
Hannu Nyman 2019-04-07 17:28:58 +03:00 committed by GitHub
commit 4046fd8b7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 144 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -165,7 +165,7 @@ header {
} }
header .container { header .container {
padding: 0 0.5rem; padding: 0 0.5rem;
} }
select { select {
@ -588,7 +588,7 @@ footer > a {
.main-right .container .alert-message h4 { .main-right .container .alert-message h4 {
margin-top: 1rem; margin-top: 1rem;
background: url(./no-pwd.png) no-repeat left 1px / 28px; background: url(./no-pwd.png) no-repeat left 1px / 28px;
padding: 7px 0 0 32px; padding: 7px 0 0 32px;
} }
.main-right .container .alert-message .btn { .main-right .container .alert-message .btn {
@ -782,7 +782,7 @@ form[method="post"] + form[method="post"],
.cbi-button[name="zero"], .cbi-button[name="zero"],
.cbi-button[name="restart"], .cbi-button[name="restart"],
.cbi-button[onclick="hide_empty(this)"] { .cbi-button[onclick="hide_empty(this)"] {
border: 1px solid; border: 1px solid;
} }
/* dark blue */ /* dark blue */
@ -813,10 +813,10 @@ form[method="post"] + form[method="post"],
.cbi-button[value="Submit"], .cbi-button[value="Submit"],
.cbi-button[value$="Apply"], .cbi-button[value$="Apply"],
.cbi-button[onclick="addKey(event)"] { .cbi-button[onclick="addKey(event)"] {
font-weight: normal; font-weight: normal;
color: #fff; color: #fff;
border: 1px solid #468ea4; border: 1px solid #468ea4;
background-color: #468ea4; background-color: #468ea4;
} }
/* red */ /* red */
@ -830,10 +830,10 @@ form[method="post"] + form[method="post"],
.cbi-button[onclick="reboot(this)"], .cbi-button[onclick="reboot(this)"],
.cbi-button-neutral[value="Restart"] { .cbi-button-neutral[value="Restart"] {
padding: 5px .8rem; padding: 5px .8rem;
font-weight: 100; font-weight: 100;
color: #f24b7c; color: #f24b7c;
background-color: transparent; background-color: transparent;
border: 1px solid #f24b7c; border: 1px solid #f24b7c;
} }
/* yellow */ /* yellow */
@ -856,10 +856,10 @@ form[method="post"] + form[method="post"],
.cbi-button[name="backup"], .cbi-button[name="backup"],
.cbi-button[value="Upload"], .cbi-button[value="Upload"],
.cbi-button[value="Save mtdblock"] { .cbi-button[value="Save mtdblock"] {
font-weight: normal; font-weight: normal;
color: #468ea4; color: #468ea4;
border: thin solid #468ea4; border: thin solid #468ea4;
background-color: transparent; background-color: transparent;
} }
.cbi-page-actions .cbi-button-link:first-child { .cbi-page-actions .cbi-button-link:first-child {
@ -886,40 +886,40 @@ form[method="post"] + form[method="post"],
} }
.tabs > li { .tabs > li {
margin-right: .8rem; margin-right: .8rem;
padding: .5rem 4px; padding: 6px 10px;
position: relative; position: relative;
display: inline-block; display: inline-block;
text-align: center; text-align: center;
} }
.tabs > li a { .tabs > li a {
color: #468EA4; color: #468EA4;
font-size: 14px; font-size: 14px;
text-decoration: none; text-decoration: none;
position: relative; position: relative;
z-index: 1; z-index: 1;
} }
.tabs > li::after { .tabs > li::after {
content: ''; content: '';
background-color: #cccccc82; background-color: #cccccc82;
position: absolute; position: absolute;
width: 0; width: 0;
height: 100%; height: 100%;
bottom: 0; bottom: 0;
border-radius: 20px; border-radius: 20px;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
} }
.tabs > li:hover::after { .tabs > li:hover::after {
transition: width .35s; transition: width .35s;
width: calc(100% + 4px); width: calc(100% + 4px);
} }
.tabs > li.active::after { .tabs > li.active::after {
width: calc(100% + 4px); width: calc(100% + 4px);
background-color: #468ea473; background-color: #468ea473;
} }
.cbi-tabmenu > li { .cbi-tabmenu > li {
@ -1164,17 +1164,17 @@ form[method="post"] + form[method="post"],
} }
.cbi-dynlist > .item::after { .cbi-dynlist > .item::after {
position: absolute; position: absolute;
right: -2em; right: -2em;
bottom: 0; bottom: 0;
display: inline-flex; display: inline-flex;
min-height: 17px; min-height: 17px;
padding: 0 6px; padding: 0 6px;
content: "\00D7"; content: "\00D7";
pointer-events: auto; pointer-events: auto;
color: #f24b7c; color: #f24b7c;
border: thin solid #f24b7c; border: thin solid #f24b7c;
background-color: transparent; background-color: transparent;
} }
.cbi-dynlist > .item > span { .cbi-dynlist > .item > span {
@ -1455,6 +1455,11 @@ body.modal-overlay-active {
height: 100vh; height: 100vh;
} }
#modal_overlay .alert-message.warning {
background-color: #fff !important;
margin-bottom: 10px;
}
body.modal-overlay-active #modal_overlay { body.modal-overlay-active #modal_overlay {
right: 0; right: 0;
left: 0; left: 0;
@ -2066,9 +2071,9 @@ input[name="nslookup"] {
.login .alert-message > h4 { .login .alert-message > h4 {
padding: 7px 0 0 32px; padding: 7px 0 0 32px;
font-size: 18px; font-size: 18px;
background: url(./no-pwd.png) no-repeat left 0 / 28px; background: url(./no-pwd.png) no-repeat left 0 / 28px;
display: inline-block; display: inline-block;
} }
.login .alert-message > p { .login .alert-message > p {
@ -2128,30 +2133,30 @@ input[name="nslookup"] {
} }
.login > .main .cbi-value > .cbi-value-field { .login > .main .cbi-value > .cbi-value-field {
display: block; display: block;
position: relative; position: relative;
} }
.login > .main .cbi-value-last .cbi-value-field > div { .login > .main .cbi-value-last .cbi-value-field > div {
height: 24px; height: 24px;
width: 24px; width: 24px;
display: inline-block; display: inline-block;
background: url(./op-eye.png) no-repeat center center / cover; background: url(./op-eye.png) no-repeat center center / cover;
position: absolute; position: absolute;
top: 8px; top: 8px;
right: 12px; right: 12px;
} }
.login > .main .cbi-value-last .cbi-value-field.op-eye > div { .login > .main .cbi-value-last .cbi-value-field.op-eye > div {
background-image: url(./cl-eye.png); background-image: url(./cl-eye.png);
} }
.login > .main .cbi-value .cbi-input-text { .login > .main .cbi-value .cbi-input-text {
margin: 0 0 16px; margin: 0 0 16px;
padding-left: 36px; padding-left: 36px;
width: 100%; width: 100%;
height: 42px; height: 42px;
border: 1px solid #556270; border: 1px solid #556270;
border-radius: 20px; border-radius: 20px;
background: #fff no-repeat 11px center / 19px; background: #fff no-repeat 11px center / 19px;
} }
@ -2172,14 +2177,14 @@ input[name="nslookup"] {
.login .cbi-page-actions .cbi-button-apply, .login .cbi-page-actions .cbi-button-apply,
.login .cbi-button-apply { .login .cbi-button-apply {
border: 1px solid #f24b7c; border: 1px solid #f24b7c;
background-color: #f24b7c; background-color: #f24b7c;
} }
.login .cbi-button[value="Reset"] { .login .cbi-button[value="Reset"] {
color: #fff; color: #fff;
border: 1px solid #9a4569; border: 1px solid #9a4569;
background-color: #9a4569; background-color: #9a4569;
} }
.login footer { .login footer {
@ -2246,13 +2251,49 @@ input[name="nslookup"] {
.logged-in .main-right { .logged-in .main-right {
float: right; float: right;
width: 84%; width: 84%;
height: 100%; height: 100%;
} }
.logged-in .main-right .container { .logged-in .main-right .container {
margin: 5rem 1rem 1rem; margin: 5rem 1rem 1rem;
} }
/* rosy file server */
.login-info.node-main-login{
background-color: #ebf1f6;
}
.login-info.node-main-login header .container,
.login-info.node-main-login .main {
width: 1170px;
}
.login-info.node-main-login .main {
padding: 0 15px;
}
.login-info.node-main-login header {
display: block;
}
.login-info.node-main-login header .container {
margin: 1rem auto 0;
height: 3rem;
background-color: #fff;
border: 1px solid #ddd;
border-radius: 50px;
line-height: 44px;
}
.login-info.node-main-login .label.logout {
background-color: #f24b7c;
}
.login-info.node-main-login .label.logout a {
color: #fff;
text-decoration: none;
}
/* node main login */ /* node main login */
.login-info .main { .login-info .main {
margin: 0 auto; margin: 0 auto;
@ -2435,11 +2476,14 @@ input[name="nslookup"] {
flex-basis: 12%; flex-basis: 12%;
} }
#cbi-firewall-zone .table, #cbi-firewall-zone .table {
#cbi-network-switch_vlan .table {
display: table; display: table;
} }
#cbi-network-switch_vlan #vlan_table {
overflow-x: auto;
}
#cbi-firewall-zone .td.cbi-section-actions { #cbi-firewall-zone .td.cbi-section-actions {
width: 100%; width: 100%;
} }
@ -2592,10 +2636,6 @@ input[name="nslookup"] {
font-size: .7rem; font-size: .7rem;
} }
#modal_overlay {
top: 3.5rem;
}
[data-page="admin-network-firewall-forwards"] .table:not(.cbi-section-table) { [data-page="admin-network-firewall-forwards"] .table:not(.cbi-section-table) {
display: block; display: block;
} }
@ -2611,11 +2651,18 @@ input[name="nslookup"] {
} }
} }
@media screen and (max-width: 992px) {
.login-info.node-main-login header .container,
.login-info.node-main-login .main {
width: 970px;
}
}
@media screen and (max-width: 992px) { @media screen and (max-width: 992px) {
.login .main-right { .login .main-right {
background: #354057; background: #354057;
} }
.login > .main #maincontent { .login > .main #maincontent {
width: 90%; width: 90%;
} }
@ -2674,6 +2721,10 @@ input[name="nslookup"] {
width: 30px; width: 30px;
} }
.login-info.node-main-login header .showSide {
display: none;
}
.showSide::before { .showSide::before {
content: ''; content: '';
display: inline-block; display: inline-block;
@ -2882,6 +2933,22 @@ input[name="nslookup"] {
.logged-in .main-left .navbar-container:hover { .logged-in .main-left .navbar-container:hover {
scrollbar-face-color: #839dd67a; scrollbar-face-color: #839dd67a;
} }
.login-info.node-main-login header .container,
.login-info.node-main-login .main {
width: 750px;
}
}
@media screen and (max-width: 768px) {
.login-info.node-main-login header {
padding: 0 15px;
}
.login-info.node-main-login header .container,
.login-info.node-main-login .main {
width: 100%;
}
} }
@media screen and (max-width: 600px) { @media screen and (max-width: 600px) {
@ -2900,10 +2967,6 @@ input[name="nslookup"] {
padding: 1rem; padding: 1rem;
} }
.tabs {
margin: 0 -1rem;
}
.main-left .nav-container { .main-left .nav-container {
width: 70%; width: 70%;
} }

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

@ -273,7 +273,9 @@
thisParent.removeClass('op-eye'); thisParent.removeClass('op-eye');
$(this).prev().attr('type', 'password'); $(this).prev().attr('type', 'password');
} }
}); });
$('#cbi-network-switch_vlan .table').wrap('#vlan_table');
})(window, jQuery); })(window, jQuery);

2
themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm
View file

@ -28,7 +28,7 @@
</div> </div>
</div> </div>
</div> </div>
<footer class="mobile-hide"> <footer>
<a href="https://github.com/openwrt/luci">Powered by<%= ver.luciname %> (<%= ver.luciversion %>)</a> / <a href="https://github.com/openwrt/luci">Powered by<%= ver.luciname %> (<%= ver.luciversion %>)</a> /
<%= ver.distversion %> <%= ver.distversion %>
<% if #categories > 1 then %> <% if #categories > 1 then %>