From: Jo-Philipp Wich Date: Fri, 27 Mar 2020 18:19:57 +0000 (+0100) Subject: luci-theme-openwrt-2020: improve compatibility with luci-theme-bootstrap X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f08cb4f22e93864c666d2ed622c9aa928893ca5a;p=oweals%2Fluci.git luci-theme-openwrt-2020: improve compatibility with luci-theme-bootstrap - Style input fields without type to treat them like text inputs - Style modal overlay as flex column to fix float clearing with adblock 4 - Add margin to standalone textareas Signed-off-by: Jo-Philipp Wich --- diff --git a/themes/luci-theme-openwrt-2020/htdocs/luci-static/openwrt2020/cascade.css b/themes/luci-theme-openwrt-2020/htdocs/luci-static/openwrt2020/cascade.css index eb25f5975..eeb487fa6 100644 --- a/themes/luci-theme-openwrt-2020/htdocs/luci-static/openwrt2020/cascade.css +++ b/themes/luci-theme-openwrt-2020/htdocs/luci-static/openwrt2020/cascade.css @@ -218,6 +218,8 @@ body.modal-overlay-active #modal_overlay { box-shadow: 0 0 3px 1px var(--main-bright-color); padding: .5em; border-radius: .25em; + display: flex; + flex-direction: column; } .modal > h4:first-child { @@ -282,6 +284,7 @@ body.modal-overlay-active #modal_overlay { vertical-align: middle; } +.td input:not([type]), .td input[type="text"], .td input[type="password"], .td select, @@ -555,10 +558,14 @@ h6 { font-size: 110%; } .cbi-section > legend:first-child { font-size: 140%; } -p, ul { +p, ul, textarea { margin: 0 0 1em 0; } +p > textarea:last-child { + margin: 0; +} + var { color: var(--main-dark-color); font-weight: bold; @@ -920,6 +927,7 @@ button[disabled], button.disabled, .btn[disabled], .btn.disabled { cursor: pointer; } +input:not([type]), input[type="text"], input[type="password"], select, @@ -933,6 +941,7 @@ select, border-radius: .25em; } +input:not([type]):focus, input[type="text"]:focus, input[type="password"]:focus, select:focus, @@ -941,6 +950,7 @@ select:focus, border-color: var(--main-dark-color); } +input:not([type]) + .btn, input:not([type]) + button, input[type="text"] + .btn, input[type="text"] + button, input[type="password"] + .btn, input[type="password"] + button { margin: 0 0 2px -1px; @@ -952,6 +962,7 @@ input[type="password"] + .btn, input[type="password"] + button { margin-left: .25em; } +.control-group > input:not([type]) + .btn, .control-group > input:not([type]) + button, .control-group > input[type="text"] + .btn, .control-group > input[type="text"] + button, .control-group > input[type="password"] + .btn, .control-group > input[type="password"] + button { margin: .125em .125em calc(.125em + 2px) calc(-.125em - .25em) !important; @@ -999,6 +1010,7 @@ textarea { } .control-group > select, +.control-group > input:not([type]), .control-group > input[type="text"] { flex: 10; } @@ -1715,6 +1727,7 @@ ul.errors { margin: 5% auto; } + input:not([type]), input[type="text"], input[type="password"], select,