diff options
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css | 9 | ||||
| -rw-r--r-- | themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css | 1 | ||||
| -rw-r--r-- | themes/luci-theme-material/htdocs/luci-static/material/cascade.css | 193 | ||||
| -rw-r--r--[-rwxr-xr-x] | themes/luci-theme-material/htdocs/luci-static/material/favicon.ico | bin | 2462 -> 4286 bytes | |||
| -rwxr-xr-x | themes/luci-theme-material/htdocs/luci-static/material/logo.png | bin | 2224 -> 0 bytes | |||
| -rw-r--r-- | themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css | 2 |
6 files changed, 179 insertions, 26 deletions
diff --git a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css index 394361ecd..98f6022ca 100644 --- a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css +++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css @@ -174,6 +174,10 @@ a:hover { float: left; } +.nowrap { + white-space: nowrap; +} + /* Typography.less * Headings, body text, lists, code, and more for a versatile and durable typography system * ---------------------------------------------------------------------------------------- */ @@ -1020,8 +1024,9 @@ header .dropdown-menu a.hover, padding: 0 2px; list-style: none; display: flex; - background: linear-gradient(#ddd 0%, #ddd 100%) repeat-x; - background-size: 1px 1px; + flex-wrap: wrap; + background: linear-gradient(#fff 28px, #ddd 28px); + background-size: 1px 29px; background-position: left bottom; } diff --git a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css index 2e1ffb035..062d274b7 100644 --- a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css +++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css @@ -11,7 +11,6 @@ header h3 a, header .brand { background: linear-gradient(#fff 20%, #ddd 100%); background-size: 1px 34px; margin-bottom: 10px; - flex-wrap: wrap; } .tabs > li, .cbi-tabmenu > li { diff --git a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css index 48812c1c8..828365703 100644 --- a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css +++ b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css @@ -491,7 +491,7 @@ h3 { } h4 { - margin: 2rem 0 0 0; + margin: 1.5rem 0 0 0; font-size: 1.2rem; padding-bottom: 10px; } @@ -599,27 +599,6 @@ div > .table > .tbody > .tr:nth-of-type(2n) { background-color: #f9f9f9; } -/* fix progress bar */ -#swaptotal > div, -#swapfree > div, -#memfree > div, -#membuff > div, -#conns > div, -#memtotal > div { - width: 100% !important; - height: 1.2rem !important; -} - -#swaptotal > div > div, -#swapfree > div > div, -#memfree > div > div, -#membuff > div > div, -#conns > div > div, -#memtotal > div > div { - height: 100% !important; - background-color: var(--main-color, #0099CC) !important; -} - /* fix multiple table */ table table, @@ -853,6 +832,29 @@ td > table > tbody > tr > td, line-height: 1.25; } +.cbi-input-invalid, +.cbi-value-error input { + color: #f00; + border-color: #f00; +} + +.cbi-section-error { + border: 1px solid #f00; + border-radius: 3px; + background-color: #fce6e6; + padding: 5px; + margin: 18px; +} + +.cbi-section-error ul { + margin: 0 0 0 20px; +} + +.cbi-section-error ul li { + color: #f00; + font-weight: bold; +} + .cbi-value-helpicon > img { display: none; } @@ -1200,6 +1202,113 @@ td > table > tbody > tr > td, pointer-events: auto; } +#modal_overlay { + position: fixed; + top: 5rem; + bottom: 0; + left: -10000px; + right: 10000px; + background: rgba(0, 0, 0, 0.7); + z-index: 900; + overflow-y: scroll; + -webkit-overflow-scrolling: touch; + transition: opacity .125s ease-in; + opacity: 0; +} + +.modal { + width: 90%; + margin: 5em auto; + display: flex; + flex-wrap: wrap; + min-height: 32px; + max-width: 600px; + align-items: center; + border-radius: 3px; + background: #fff; + box-shadow: 0 0 3px #444; + padding: 1em 1em .5em 1em; + max-height: 2400px; + min-width: 270px; +} + +.modal > * { + flex-basis: 100%; + line-height: normal; + margin-bottom: .5em; +} + +.modal > pre, +.modal > textarea { + white-space: pre-wrap; + overflow: auto; +} + +body.modal-overlay-active { + overflow: hidden; + height: 100vh; +} + +body.modal-overlay-active #modal_overlay { + left: 0; + right: 0; + opacity: 1; +} + +#modal_overlay > .modal { + width: 90%; + margin: 5em auto; + display: flex; + flex-wrap: wrap; + min-height: 32px; + max-width: 600px; + align-items: center; + border-radius: 3px; + background: #fff; + box-shadow: 0 0 3px #444; + padding: 1em 1em 1em 1em; + max-height: 2400px; + min-width: 270px; +} + +#modal_overlay .modal > * { + flex-basis: 100%; + line-height: normal; + margin-bottom: .5em; +} + +#modal_overlay .modal > pre, +#modal_overlay .modal > textarea { + white-space: pre-wrap; + overflow: auto; +} + +body.modal-overlay-active { + overflow: hidden; + height: 100vh; +} + +body.modal-overlay-active #modal_overlay { + left: 0; + right: 0; + opacity: 1; +} + +.spinning { + position: relative; + padding-left: 32px !important; +} + +.spinning::before { + position: absolute; + top: 0; + left: 0; + bottom: 0; + width: 32px; + content: " "; + background: url(../resources/icons/loading.gif) no-repeat center; + background-size: 16px; +} /* luci */ @@ -1250,6 +1359,38 @@ td > table > tbody > tr > td, min-width: 15rem; } +/* progressbar */ +.cbi-progressbar { + border: 1px solid #ccc; + border-radius: 3px; + position: relative; + min-width: 170px; + height: 20px; + margin: 0; + background: #fff; +} + +.cbi-progressbar > div { + background: var(--main-color, #0099CC); + height: 100%; + transition: width .25s ease-in; + width: 0%; +} + +.cbi-progressbar::after { + position: absolute; + bottom: 2px; + top: 2px; + right: 0; + left: 0; + text-align: center; + text-shadow: 0 0 2px #fff; + content: attr(title); + white-space: pre; + overflow: hidden; + text-overflow: ellipsis; +} + .cbi-value-field .cbi-input-select { width: 15rem; } @@ -1660,8 +1801,14 @@ header > .container > .pull-right > * { text-decoration: none; } +label > input[type="checkbox"], +label > input[type="radio"] { + vertical-align: bottom; + margin: 0; +} + .notice { - background-color: #5BC0DE; + background-color: #5BC0DE !important; } .showSide { diff --git a/themes/luci-theme-material/htdocs/luci-static/material/favicon.ico b/themes/luci-theme-material/htdocs/luci-static/material/favicon.ico Binary files differindex b407d1845..72c311555 100755..100644 --- a/themes/luci-theme-material/htdocs/luci-static/material/favicon.ico +++ b/themes/luci-theme-material/htdocs/luci-static/material/favicon.ico diff --git a/themes/luci-theme-material/htdocs/luci-static/material/logo.png b/themes/luci-theme-material/htdocs/luci-static/material/logo.png Binary files differdeleted file mode 100755 index 459148c6b..000000000 --- a/themes/luci-theme-material/htdocs/luci-static/material/logo.png +++ /dev/null diff --git a/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css index f6ea9645f..f8133833e 100644 --- a/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css +++ b/themes/luci-theme-openwrt/htdocs/luci-static/openwrt.org/cascade.css @@ -211,6 +211,7 @@ hr { -webkit-overflow-scrolling: touch; transition: opacity .125s ease-in; opacity: 0; + visibility: hidden; } .modal { @@ -250,6 +251,7 @@ body.modal-overlay-active #modal_overlay { left: 0; right: 0; opacity: 1; + visibility: visible; } .warning { |
