diff options
Diffstat (limited to 'themes')
5 files changed, 186 insertions, 33 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 f8f1c11105..7e9c8eb324 100644 --- a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css +++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css @@ -99,6 +99,7 @@ input[type="reset"], input[type="submit"] { cursor: pointer; -webkit-appearance: button; + word-break: break-all; } button[disabled], @@ -1201,6 +1202,7 @@ footer { flex-basis: 100%; line-height: normal; margin-bottom: .5em; + max-width: 100%; } .modal > pre, @@ -1707,8 +1709,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .alert-message { position: relative; - padding: 7px 15px; - margin-bottom: 18px; + padding: .5em .5em .25em .5em; + margin-bottom: .5em; color: #404040; background: linear-gradient(to bottom, #fceec1, #eedc94) repeat-x; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); @@ -1725,30 +1727,22 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { *margin-top: 0; } -.alert-message a { - font-weight: bold; - color: #404040; -} - -.alert-message.danger p a, -.alert-message.error p a, -.alert-message.success p a, -.alert-message.info p a { - color: #fff; -} - -.alert-message h5 { - line-height: 18px; -} - +.alert-message h4, +.alert-message h5, +.alert-message pre, +.alert-message ul, +.alert-message li, .alert-message p { - margin-bottom: 0; + color: inherit; + border: none; + line-height: inherit; + background: transparent; + padding: 0; + margin: .25em 0; } -.alert-message div { - margin-top: 5px; - margin-bottom: 2px; - line-height: 28px; +.alert-message button { + margin: .25em 0; } .label { @@ -2248,3 +2242,110 @@ html body.apply-overlay-active { overflow: visible; transition: opacity .25s ease-in; } + +.cbi-filebrowser { + min-width: 210px; + max-width: 100%; + border: 1px solid #ccc; + border-radius: 3px; + display: flex; + flex-direction: column; + opacity: 0; + height: 0; + overflow: hidden; +} + +.cbi-filebrowser.open { + opacity: 1; + height: auto; + overflow: visible; + transition: opacity .25s ease-in; +} + +.cbi-filebrowser > * { + max-width: 100%; + overflow: hidden; + text-overflow: ellipsis; + padding: 0 0 .25em 0; + margin: .25em .25em 0px .25em; + white-space: nowrap; + border-bottom: 1px solid #ccc; +} + +.cbi-filebrowser .cbi-button-positive { + margin-right: .25em; +} + +.cbi-filebrowser > div { + border-bottom: none; +} + +.cbi-filebrowser > ul > li { + display: flex; + flex-direction: row; +} + +.cbi-filebrowser > ul > li:hover { + background: #f5f5f5; +} + +.cbi-filebrowser > ul > li > div:first-child { + flex: 10; + overflow: hidden; + text-overflow: ellipsis; +} + +.cbi-filebrowser > ul > li > div:last-child { + flex: 3; + text-align: right; +} + +.cbi-filebrowser > ul > li > div:last-child > button { + padding: .125em .25em; + margin: 1px 0 1px .25em; +} + +.cbi-filebrowser .upload { + display: flex; + flex-direction: row; + flex-wrap: wrap; + margin: 0 -.125em .25em -.125em; + padding: 0 0 .125em 0px; + border-bottom: 1px solid #ccc; +} + +.cbi-filebrowser .upload > * { + margin: .125em; + flex: 1; +} + +.cbi-filebrowser .upload > .btn { + flex-basis: 60px; +} + +.cbi-filebrowser .upload > div { + flex: 10; + min-width: 150px; +} + +.cbi-filebrowser .upload > div > input { + width: 100%; +} + +@keyframes fade-in { + 0% { opacity: 0; } + 100% { opacity: 1; } +} + +@keyframes fade-out { + 0% { opacity: 1; } + 100% { opacity: 0; } +} + +.fade-in { + animation: fade-in .4s ease; +} + +.fade-out { + animation: fade-out .4s ease; +} 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 062d274b75..b8892fbf0a 100644 --- a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css +++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css @@ -355,18 +355,24 @@ header h3 a, header .brand { text-overflow: ellipsis; } - body[data-page="admin-network-wireless"] .td.col-2 { + body[data-page="admin-network-wireless"] .td[data-name="_badge"] { max-width: 50px; + align-self: center; } - body[data-page="admin-network-wireless"] .td.col-2 > .ifacebadge { + body[data-page="admin-network-wireless"] .td[data-name="_badge"] .ifacebadge { display: flex; align-items: center; flex-direction: column; } - body[data-page="admin-network-network"] .td.col-3 { - min-width: 250px; + body[data-page="admin-network-wireless"] .td[data-name="_stat"] { + flex-basis: 60%; + } + + body[data-page="admin-network-network"] .td.cbi-section-actions::before, + body[data-page="admin-network-wireless"] .td.cbi-section-actions::before { + content: none !important; } } 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 d74077853a..1d78edf0cf 100644 --- a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css +++ b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css @@ -214,6 +214,7 @@ input:not(.cbi-button):focus, border-color: var(--main-color); } +.cbi-dropdown, select[multiple="multiple"] { height: auto; } @@ -401,10 +402,6 @@ header > .fill > .container > #logo > img { margin-top: -.1rem; } -body:not(.logged-in) > header > .fill > .container > #logo { - display: none; -} - header > .fill > .container > .brand { font-size: 1.4rem; position: absolute; @@ -693,6 +690,7 @@ h5 { #cbi-network > .cbi-section-node, #cbi-wireless > .cbi-section-node, #cbi-wireless > #wifi_assoclist_table, +[data-tab-title], [data-page^="admin-system-admin"]:not(.node-main-login) .cbi-map:not(#cbi-dropbear), [data-page="admin-system-opkg"] #maincontent > .container { font-family: inherit; @@ -708,6 +706,16 @@ h5 { box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .16), 0 0 2px 0 rgba(0, 0, 0, .12); } +.cbi-modal .cbi-section, +.cbi-section .cbi-section { + padding: 0; + box-shadow: none; +} + +.cbi-modal .cbi-tabmenu { + margin-left: 0; +} + .cbi-map-descr, .cbi-section-descr { font-size: small; @@ -745,6 +753,15 @@ fieldset > fieldset, border-bottom: thin solid #eee; } +.cbi-section > h3:first-child, +.cbi-section > h4:first-child, +.cbi-section > p:first-child, +[data-tab-title] > h3:first-child, +[data-tab-title] > h4:first-child, +[data-tab-title] > p:first-child { + padding-top: 1rem; +} + table { border-spacing: 0; border-collapse: collapse; @@ -1123,6 +1140,8 @@ td > table > tbody > tr > td, overflow: hidden; height: 0; opacity: 0; + margin: 0; + padding: 0rem 1rem !important; } [data-tab-active="true"] { @@ -1130,6 +1149,7 @@ td > table > tbody > tr > td, height: auto; opacity: 1; transition: opacity .25s ease-in; + margin: inherit !important; } .cbi-section[id] .cbi-section-remove:nth-of-type(4n+3), @@ -1599,6 +1619,8 @@ body:not(.Interfaces) .cbi-rowstyle-2:first-child { .modal > * { line-height: normal; flex-basis: 100%; + margin-bottom: .5em; + max-width: 100%; } .modal > pre, @@ -1655,6 +1677,11 @@ body:not(.Interfaces) .cbi-rowstyle-2:first-child { margin-bottom: 2em; } +.modal.cbi-modal { + max-width: 90%; + max-height: none; +} + body.modal-overlay-active { overflow: hidden; height: 100vh; @@ -2824,7 +2851,7 @@ input[name="nslookup"] { } #maincontent > .container { - margin: 0 1rem 1.5rem 1rem; + margin: 0 .5rem 1.5rem .5rem; } .main > .main-left > .nav > .slide > .menu, @@ -2982,6 +3009,22 @@ input[name="nslookup"] { .hide-xs:not([data-title="MAC-Address"]) { display: none; } + + .cbi-modal { + padding: .5rem; + } + + .cbi-modal .cbi-value { + padding: 0 0 .25rem 0; + } + + .cbi-modal [data-tab-title] { + padding: 0 .25rem !important; + } + + [data-tab-title] { + padding: 0 .5rem !important; + } } @media screen and (min-width: 600px) { diff --git a/themes/luci-theme-material/luasrc/view/themes/material/header.htm b/themes/luci-theme-material/luasrc/view/themes/material/header.htm index 7ce195cc9f..76eeec05eb 100644 --- a/themes/luci-theme-material/luasrc/view/themes/material/header.htm +++ b/themes/luci-theme-material/luasrc/view/themes/material/header.htm @@ -186,7 +186,7 @@ <div class="fill"> <div class="container"> <span class="showSide"></span> - <a id="logo" href="<%=url("admin/status/overview")%>"><img src="<%=media%>/brand.png" alt="OpenWrt"></a> + <a id="logo" href="<% if luci.dispatcher.context.authsession then %><%=url('admin/status/overview')%><% else %>#<% end %>"><img src="<%=media%>/brand.png" alt="OpenWrt"></a> <a class="brand" href="#"><%=boardinfo.hostname or "?"%></a> <div class="status"> <span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()"> 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 d6460532fa..fca731cadd 100644 --- a/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css +++ b/themes/luci-theme-rosy/htdocs/luci-static/rosy/cascade.css @@ -55,6 +55,8 @@ line-height: normal; display: table-cell; padding: .5em; + word-break: break-all; + word-wrap: break-word; text-align: center; vertical-align: middle; } @@ -136,6 +138,7 @@ .col-10 { flex: 10 10 300px !important; + width: 60%; } /* dom 元素 */ |