From 5bc6ceba2f1215c8e99fa36e61709b19b7ec8f63 Mon Sep 17 00:00:00 2001 From: Rosy Song Date: Sun, 7 Apr 2019 15:24:52 +0800 Subject: [PATCH 1/7] luci-theme-rosy: tweak padding for tabs Signed-off-by: Rosy Song --- themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4ae8151050..a0fbb814d5 100644 --- a/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css +++ b/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css @@ -887,7 +887,7 @@ form[method="post"] + form[method="post"], .tabs > li { margin-right: .8rem; - padding: .5rem 4px; + padding: 6px 10px; position: relative; display: inline-block; text-align: center; From e63eecff856c3b6e47ababa1f4db29433021047f Mon Sep 17 00:00:00 2001 From: Rosy Song Date: Sun, 7 Apr 2019 15:34:13 +0800 Subject: [PATCH 2/7] luci-theme-rosy: add css style for modal-overlay warning Signed-off-by: Rosy Song --- themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 a0fbb814d5..f0f4f87204 100644 --- a/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css +++ b/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css @@ -1455,6 +1455,11 @@ body.modal-overlay-active { height: 100vh; } +#modal_overlay .alert-message.warning { + background-color: #fff !important; + margin-bottom: 10px; +} + body.modal-overlay-active #modal_overlay { right: 0; left: 0; @@ -2615,7 +2620,7 @@ input[name="nslookup"] { .login .main-right { background: #354057; } - + .login > .main #maincontent { width: 90%; } From df629699bbdd37a67d6062c2ebc4e27bf49735f8 Mon Sep 17 00:00:00 2001 From: Rosy Song Date: Sun, 7 Apr 2019 15:35:28 +0800 Subject: [PATCH 3/7] luci-theme-rosy: fix #2645 fix view on network / switch https://github.com/openwrt/luci/issues/2645 Signed-off-by: Rosy Song --- themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 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 f0f4f87204..0d64dfce65 100644 --- a/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css +++ b/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css @@ -2440,11 +2440,14 @@ input[name="nslookup"] { flex-basis: 12%; } -#cbi-firewall-zone .table, -#cbi-network-switch_vlan .table { +#cbi-firewall-zone .table { display: table; } +#cbi-network-switch_vlan #vlan_table { + overflow-x: auto; +} + #cbi-firewall-zone .td.cbi-section-actions { width: 100%; } From 533a39a6634cb84945054947061217581ea26883 Mon Sep 17 00:00:00 2001 From: Rosy Song Date: Sun, 7 Apr 2019 15:41:37 +0800 Subject: [PATCH 4/7] luci-theme-rosy: fix indent fix indent for htdocs/luci-static/rosy/cascade.css Signed-off-by: Rosy Song --- .../htdocs/luci-static/rosy/cascade.css | 130 +++++++++--------- 1 file changed, 65 insertions(+), 65 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 0d64dfce65..517f8a3645 100644 --- a/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css +++ b/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css @@ -165,7 +165,7 @@ header { } header .container { - padding: 0 0.5rem; + padding: 0 0.5rem; } select { @@ -588,7 +588,7 @@ footer > a { .main-right .container .alert-message h4 { margin-top: 1rem; 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 { @@ -782,7 +782,7 @@ form[method="post"] + form[method="post"], .cbi-button[name="zero"], .cbi-button[name="restart"], .cbi-button[onclick="hide_empty(this)"] { - border: 1px solid; + border: 1px solid; } /* dark blue */ @@ -813,10 +813,10 @@ form[method="post"] + form[method="post"], .cbi-button[value="Submit"], .cbi-button[value$="Apply"], .cbi-button[onclick="addKey(event)"] { - font-weight: normal; - color: #fff; - border: 1px solid #468ea4; - background-color: #468ea4; + font-weight: normal; + color: #fff; + border: 1px solid #468ea4; + background-color: #468ea4; } /* red */ @@ -830,10 +830,10 @@ form[method="post"] + form[method="post"], .cbi-button[onclick="reboot(this)"], .cbi-button-neutral[value="Restart"] { padding: 5px .8rem; - font-weight: 100; - color: #f24b7c; - background-color: transparent; - border: 1px solid #f24b7c; + font-weight: 100; + color: #f24b7c; + background-color: transparent; + border: 1px solid #f24b7c; } /* yellow */ @@ -856,10 +856,10 @@ form[method="post"] + form[method="post"], .cbi-button[name="backup"], .cbi-button[value="Upload"], .cbi-button[value="Save mtdblock"] { - font-weight: normal; - color: #468ea4; - border: thin solid #468ea4; - background-color: transparent; + font-weight: normal; + color: #468ea4; + border: thin solid #468ea4; + background-color: transparent; } .cbi-page-actions .cbi-button-link:first-child { @@ -886,40 +886,40 @@ form[method="post"] + form[method="post"], } .tabs > li { - margin-right: .8rem; + margin-right: .8rem; padding: 6px 10px; - position: relative; - display: inline-block; - text-align: center; + position: relative; + display: inline-block; + text-align: center; } .tabs > li a { - color: #468EA4; + 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%); + 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); + transition: width .35s; + width: calc(100% + 4px); } .tabs > li.active::after { - width: calc(100% + 4px); - background-color: #468ea473; + width: calc(100% + 4px); + background-color: #468ea473; } .cbi-tabmenu > li { @@ -1164,17 +1164,17 @@ form[method="post"] + form[method="post"], } .cbi-dynlist > .item::after { - position: absolute; - right: -2em; - bottom: 0; - display: inline-flex; - min-height: 17px; - padding: 0 6px; - content: "\00D7"; - pointer-events: auto; - color: #f24b7c; - border: thin solid #f24b7c; - background-color: transparent; + position: absolute; + right: -2em; + bottom: 0; + display: inline-flex; + min-height: 17px; + padding: 0 6px; + content: "\00D7"; + pointer-events: auto; + color: #f24b7c; + border: thin solid #f24b7c; + background-color: transparent; } .cbi-dynlist > .item > span { @@ -2071,9 +2071,9 @@ input[name="nslookup"] { .login .alert-message > h4 { padding: 7px 0 0 32px; - font-size: 18px; - background: url(./no-pwd.png) no-repeat left 0 / 28px; - display: inline-block; + font-size: 18px; + background: url(./no-pwd.png) no-repeat left 0 / 28px; + display: inline-block; } .login .alert-message > p { @@ -2133,30 +2133,30 @@ input[name="nslookup"] { } .login > .main .cbi-value > .cbi-value-field { - display: block; - position: relative; + display: block; + position: relative; } .login > .main .cbi-value-last .cbi-value-field > div { - height: 24px; - width: 24px; - display: inline-block; - background: url(./op-eye.png) no-repeat center center / cover; - position: absolute; - top: 8px; - right: 12px; + height: 24px; + width: 24px; + display: inline-block; + background: url(./op-eye.png) no-repeat center center / cover; + position: absolute; + top: 8px; + right: 12px; } .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 { margin: 0 0 16px; padding-left: 36px; width: 100%; - height: 42px; - border: 1px solid #556270; + height: 42px; + border: 1px solid #556270; border-radius: 20px; background: #fff no-repeat 11px center / 19px; } @@ -2177,14 +2177,14 @@ input[name="nslookup"] { .login .cbi-page-actions .cbi-button-apply, .login .cbi-button-apply { - border: 1px solid #f24b7c; - background-color: #f24b7c; + border: 1px solid #f24b7c; + background-color: #f24b7c; } .login .cbi-button[value="Reset"] { - color: #fff; - border: 1px solid #9a4569; - background-color: #9a4569; + color: #fff; + border: 1px solid #9a4569; + background-color: #9a4569; } .login footer { @@ -2251,7 +2251,7 @@ input[name="nslookup"] { .logged-in .main-right { float: right; width: 84%; - height: 100%; + height: 100%; } .logged-in .main-right .container { From 1b2c0fd0fa44ae701fd887ee4598942246211cc4 Mon Sep 17 00:00:00 2001 From: yglb <39110824+yglb@users.noreply.github.com> Date: Sun, 7 Apr 2019 17:15:14 +0800 Subject: [PATCH 5/7] luci-theme-rosy: fix view for rosy-file-server packages Signed-off-by: YanlanShen --- .../htdocs/luci-static/rosy/cascade.css | 51 +++++++++++++++++++ .../htdocs/luci-static/rosy/js/script.js | 4 +- 2 files changed, 54 insertions(+), 1 deletion(-) 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 517f8a3645..b8b97ea577 100644 --- a/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css +++ b/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css @@ -2258,6 +2258,38 @@ input[name="nslookup"] { 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 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 */ .login-info .main { margin: 0 auto; @@ -2619,6 +2651,13 @@ input[name="nslookup"] { } } +@media screen and (max-width: 992px) { + .login-info.node-main-login header .container, + .login-info.node-main-login .main .container { + width: 970px; + } +} + @media screen and (max-width: 992px) { .login .main-right { background: #354057; @@ -2890,6 +2929,18 @@ input[name="nslookup"] { .logged-in .main-left .navbar-container:hover { scrollbar-face-color: #839dd67a; } + + .login-info.node-main-login header .container, + .login-info.node-main-login .main .container { + width: 750px; + } +} + +@media screen and (max-width: 768px) { + .login-info.node-main-login header .container, + .login-info.node-main-login .main .container { + width: 100%; + } } @media screen and (max-width: 600px) { 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 7f5f1ad0b0..886e175cc4 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 @@ -273,7 +273,9 @@ thisParent.removeClass('op-eye'); $(this).prev().attr('type', 'password'); } - + }); + $('#cbi-network-switch_vlan .table').wrap('#vlan_table'); + })(window, jQuery); From f5209f378eefd04be67dd21be86614bfc2a3014f Mon Sep 17 00:00:00 2001 From: YanlanShen Date: Sun, 7 Apr 2019 17:51:20 +0800 Subject: [PATCH 6/7] luci-theme-rosy: fix issue on header and footer compatibility Signed-off-by: YanlanShen --- .../htdocs/luci-static/rosy/cascade.css | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 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 b8b97ea577..26a08be463 100644 --- a/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css +++ b/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css @@ -2268,6 +2268,10 @@ input[name="nslookup"] { width: 1170px; } +.login-info.node-main-login .main { + padding: 0 15px; +} + .login-info.node-main-login header { display: block; } @@ -2632,10 +2636,6 @@ input[name="nslookup"] { font-size: .7rem; } - #modal_overlay { - top: 3.5rem; - } - [data-page="admin-network-firewall-forwards"] .table:not(.cbi-section-table) { display: block; } @@ -2653,7 +2653,7 @@ input[name="nslookup"] { @media screen and (max-width: 992px) { .login-info.node-main-login header .container, - .login-info.node-main-login .main .container { + .login-info.node-main-login .main { width: 970px; } } @@ -2721,6 +2721,10 @@ input[name="nslookup"] { width: 30px; } + .login-info.node-main-login header .showSide { + display: none; + } + .showSide::before { content: ''; display: inline-block; @@ -2931,14 +2935,18 @@ input[name="nslookup"] { } .login-info.node-main-login header .container, - .login-info.node-main-login .main .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 .container { + .login-info.node-main-login .main { width: 100%; } } @@ -2959,10 +2967,6 @@ input[name="nslookup"] { padding: 1rem; } - .tabs { - margin: 0 -1rem; - } - .main-left .nav-container { width: 70%; } From 14c9de571aa85d8683b9558afe7901618804c398 Mon Sep 17 00:00:00 2001 From: YanlanShen Date: Sun, 7 Apr 2019 18:11:00 +0800 Subject: [PATCH 7/7] luci-theme-rosy: fix hidden footer for mobile devices Signed-off-by: YanlanShen --- themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm b/themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm index 4377e1ca98..25997d145e 100755 --- a/themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm +++ b/themes/luci-theme-rosy/luasrc/view/themes/rosy/footer.htm @@ -28,7 +28,7 @@ -