From 6bff4efefffe455b2f79b0623eddf3acd1b1510d Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Wed, 11 Mar 2020 01:21:02 +0800 Subject: [PATCH] luci-theme-bootstrap-mod: sync with upstream source --- .../lienol/luci-theme-bootstrap-mod/Makefile | 4 +- .../luci-static/bootstrap_blue/cascade.css | 23 +-- .../luci-static/bootstrap_blue/mobile.css | 141 +++++++++--------- .../luci-static/bootstrap_mod/cascade.css | 23 +-- .../luci-static/bootstrap_mod/mobile.css | 141 +++++++++--------- .../view/themes/bootstrap_blue/header.htm | 2 +- .../view/themes/bootstrap_mod/header.htm | 2 +- 7 files changed, 170 insertions(+), 166 deletions(-) diff --git a/package/lienol/luci-theme-bootstrap-mod/Makefile b/package/lienol/luci-theme-bootstrap-mod/Makefile index 989aaa76dc..e613bf4f33 100644 --- a/package/lienol/luci-theme-bootstrap-mod/Makefile +++ b/package/lienol/luci-theme-bootstrap-mod/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Bootstrap Mod Theme By Lienol LUCI_DEPENDS:= -PKG_VERSION:=1.2 -PKG_RELEASE:=20200306 +PKG_VERSION:=1.3 +PKG_RELEASE:=20200310 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_blue/cascade.css b/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_blue/cascade.css index 08c99cc481..1c9cad9af6 100644 --- a/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_blue/cascade.css +++ b/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_blue/cascade.css @@ -10,7 +10,7 @@ body { font-size: 14px; line-height: 1.8; margin: 0; - padding-top: 60px; + /* padding-top: 60px; */ margin: unset; } @@ -101,7 +101,8 @@ legend { /* Style */ .container:first-child { - min-height: 40px; + /* min-height: 40px; */ + display: flow-root; } .container { @@ -113,10 +114,10 @@ legend { header { font-size: 14px; - position: fixed; + /* position: fixed; top: 0; left: 0; - right: 0; + right: 0; */ background: #34aee8; box-shadow: 0 2px 2px rgba(0, 0, 0, .1); z-index: 100; @@ -387,6 +388,10 @@ header { opacity: .6; } +#maincontent.container { + margin-top: 10px; +} + /* Label */ @@ -1336,17 +1341,17 @@ body.node-main-login .alert-message { /* luci18 */ .cbi-section-table-titles.named::before { - content: attr(data-title) " "; + content: attr(data-title) " "; display: table-cell; padding: 5px 3px !important; line-height: 18px; font-weight: bold; vertical-align: middle; - color: #811; + color: #811; } .cbi-section-table-descr.named::before { - content: attr(data-title) " "; + content: attr(data-title) " "; display: table-cell; padding: 10px 10px 9px; line-height: 18px; @@ -1356,7 +1361,7 @@ body.node-main-login .alert-message { .cbi-section-table-row[data-title]::before { border-top: 1px solid #a9b1bb26; - content: attr(data-title) " "; + content: attr(data-title) " "; display: table-cell; padding: 10px 10px 9px; line-height: 18px; @@ -1574,4 +1579,4 @@ body.modal-overlay-active #modal_overlay>.modal { white-space: pre; overflow: hidden; text-overflow: ellipsis; -} +} \ No newline at end of file diff --git a/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_blue/mobile.css b/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_blue/mobile.css index 146335b59d..5c485041e4 100644 --- a/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_blue/mobile.css +++ b/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_blue/mobile.css @@ -1,81 +1,78 @@ -header h3 a, header .brand { - display:none !important; +@media screen and (max-width: 1600px) { + + header h3 a, + header .brand { + display: none !important; + } } -@media screen and (max-device-width: 1600px) { - .container>.pull-right>* { - position: absolute; - right: 0.5rem; - cursor: pointer; - } +@media screen and (max-width: 1600px) { + .container>.pull-right>* { + position: absolute; + right: 0.5rem; + cursor: pointer; + } } -@media screen and (max-width: 480px) { - body { - font-size: 12px; - } - header { - font-size: 13px; - } - legend { - font-size: 14px; - } - .dropdown-menu a { - font-size: 13px; - min-width: 130px; - padding: 0 15px; - } - .mobile-hide { - display: none; - } - #maincontent.container { - padding: 0px 10px; - } - div.cbi-section, fieldset { - min-width: inherit; - overflow-x: auto; - overflow-y: hidden; - } - .cbi-value { - } - .cbi-value-title { - width: 30%; - min-width: 0rem !important; - margin-right: 1em; - /* text-align: left; +@media screen and (max-width: 1024px) { + body { + font-size: 12px; + } + + header { + font-size: 13px; + } + + legend { + font-size: 14px; + } + + .dropdown-menu a { + font-size: 13px; + min-width: 130px; + padding: 0 15px; + } + + .mobile-hide { + display: none; + } + + #maincontent.container { + padding: 0px 10px; + } + + div.cbi-section, + fieldset { + min-width: inherit; + overflow-x: auto; + overflow-y: hidden; + } + + .cbi-value {} + + .cbi-value-title { + width: 30%; + min-width: 0rem !important; + margin-right: 1em; + /* text-align: left; padding-left: 1em; */ - } - .cbi-value-field { - width: 55%; - } - .cbi-value-description { - width: 75%; - display: inline-table; - padding: 1px 1.2rem; - background-position-y: 3px; - } - .cbi-value-field .cbi-input-select, - .cbi-value input[type="password"], - .cbi-value input[type="text"] { - min-width: unset; - /* width: 95%; */ - } -} + } -@media screen and (max-device-width: 600px) { - #maincontent.container { - margin-top: 30px; - } -} + .cbi-value-field { + width: 55%; + } -@media screen and (max-device-width: 360px) { - #maincontent.container { - margin-top: 30px; - } -} + .cbi-value-description { + width: 75%; + display: inline-table; + padding: 1px 1.2rem; + background-position-y: 3px; + } -@media screen and (max-device-width: 200px) { - #maincontent.container { - margin-top: 30px; - } + .cbi-value-field .cbi-input-select, + .cbi-value input[type="password"], + .cbi-value input[type="text"] { + min-width: unset; + /* width: 95%; */ + } } \ No newline at end of file diff --git a/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_mod/cascade.css b/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_mod/cascade.css index f910792eca..b611633823 100644 --- a/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_mod/cascade.css +++ b/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_mod/cascade.css @@ -10,7 +10,7 @@ body { font-size: 14px; line-height: 1.8; margin: 0; - padding-top: 60px; + /* padding-top: 60px; */ margin: unset; } @@ -101,7 +101,8 @@ legend { /* Style */ .container:first-child { - min-height: 40px; + /* min-height: 40px; */ + display: flow-root; } .container { @@ -113,10 +114,10 @@ legend { header { font-size: 14px; - position: fixed; + /* position: fixed; top: 0; left: 0; - right: 0; + right: 0; */ background: #222; box-shadow: 0 2px 2px rgba(0, 0, 0, .1); z-index: 100; @@ -390,6 +391,10 @@ header { opacity: .6; } +#maincontent.container { + margin-top: 10px; +} + /* Label */ @@ -1329,17 +1334,17 @@ body.node-main-login .alert-message { /* luci18 */ .cbi-section-table-titles.named::before { - content: attr(data-title) " "; + content: attr(data-title) " "; display: table-cell; padding: 5px 3px !important; line-height: 18px; font-weight: bold; vertical-align: middle; - color: #811; + color: #811; } .cbi-section-table-descr.named::before { - content: attr(data-title) " "; + content: attr(data-title) " "; display: table-cell; padding: 10px 10px 9px; line-height: 18px; @@ -1349,7 +1354,7 @@ body.node-main-login .alert-message { .cbi-section-table-row[data-title]::before { border-top: 1px solid #a9b1bb26; - content: attr(data-title) " "; + content: attr(data-title) " "; display: table-cell; padding: 10px 10px 9px; line-height: 18px; @@ -1567,4 +1572,4 @@ body.modal-overlay-active #modal_overlay>.modal { white-space: pre; overflow: hidden; text-overflow: ellipsis; -} +} \ No newline at end of file diff --git a/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_mod/mobile.css b/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_mod/mobile.css index 146335b59d..5c485041e4 100644 --- a/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_mod/mobile.css +++ b/package/lienol/luci-theme-bootstrap-mod/htdocs/luci-static/bootstrap_mod/mobile.css @@ -1,81 +1,78 @@ -header h3 a, header .brand { - display:none !important; +@media screen and (max-width: 1600px) { + + header h3 a, + header .brand { + display: none !important; + } } -@media screen and (max-device-width: 1600px) { - .container>.pull-right>* { - position: absolute; - right: 0.5rem; - cursor: pointer; - } +@media screen and (max-width: 1600px) { + .container>.pull-right>* { + position: absolute; + right: 0.5rem; + cursor: pointer; + } } -@media screen and (max-width: 480px) { - body { - font-size: 12px; - } - header { - font-size: 13px; - } - legend { - font-size: 14px; - } - .dropdown-menu a { - font-size: 13px; - min-width: 130px; - padding: 0 15px; - } - .mobile-hide { - display: none; - } - #maincontent.container { - padding: 0px 10px; - } - div.cbi-section, fieldset { - min-width: inherit; - overflow-x: auto; - overflow-y: hidden; - } - .cbi-value { - } - .cbi-value-title { - width: 30%; - min-width: 0rem !important; - margin-right: 1em; - /* text-align: left; +@media screen and (max-width: 1024px) { + body { + font-size: 12px; + } + + header { + font-size: 13px; + } + + legend { + font-size: 14px; + } + + .dropdown-menu a { + font-size: 13px; + min-width: 130px; + padding: 0 15px; + } + + .mobile-hide { + display: none; + } + + #maincontent.container { + padding: 0px 10px; + } + + div.cbi-section, + fieldset { + min-width: inherit; + overflow-x: auto; + overflow-y: hidden; + } + + .cbi-value {} + + .cbi-value-title { + width: 30%; + min-width: 0rem !important; + margin-right: 1em; + /* text-align: left; padding-left: 1em; */ - } - .cbi-value-field { - width: 55%; - } - .cbi-value-description { - width: 75%; - display: inline-table; - padding: 1px 1.2rem; - background-position-y: 3px; - } - .cbi-value-field .cbi-input-select, - .cbi-value input[type="password"], - .cbi-value input[type="text"] { - min-width: unset; - /* width: 95%; */ - } -} + } -@media screen and (max-device-width: 600px) { - #maincontent.container { - margin-top: 30px; - } -} + .cbi-value-field { + width: 55%; + } -@media screen and (max-device-width: 360px) { - #maincontent.container { - margin-top: 30px; - } -} + .cbi-value-description { + width: 75%; + display: inline-table; + padding: 1px 1.2rem; + background-position-y: 3px; + } -@media screen and (max-device-width: 200px) { - #maincontent.container { - margin-top: 30px; - } + .cbi-value-field .cbi-input-select, + .cbi-value input[type="password"], + .cbi-value input[type="text"] { + min-width: unset; + /* width: 95%; */ + } } \ No newline at end of file diff --git a/package/lienol/luci-theme-bootstrap-mod/luasrc/view/themes/bootstrap_blue/header.htm b/package/lienol/luci-theme-bootstrap-mod/luasrc/view/themes/bootstrap_blue/header.htm index 1aeffbc65c..b1d095f217 100644 --- a/package/lienol/luci-theme-bootstrap-mod/luasrc/view/themes/bootstrap_blue/header.htm +++ b/package/lienol/luci-theme-bootstrap-mod/luasrc/view/themes/bootstrap_blue/header.htm @@ -168,7 +168,7 @@ - + <% if node and node.css then %> diff --git a/package/lienol/luci-theme-bootstrap-mod/luasrc/view/themes/bootstrap_mod/header.htm b/package/lienol/luci-theme-bootstrap-mod/luasrc/view/themes/bootstrap_mod/header.htm index 1aeffbc65c..b1d095f217 100644 --- a/package/lienol/luci-theme-bootstrap-mod/luasrc/view/themes/bootstrap_mod/header.htm +++ b/package/lienol/luci-theme-bootstrap-mod/luasrc/view/themes/bootstrap_mod/header.htm @@ -168,7 +168,7 @@ - + <% if node and node.css then %>