From c9556c02bb49d5eee903ade2e73ea586ee09afde Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 21 Nov 2012 16:04:10 +0000 Subject: [PATCH] themes: add cbi-button-download class, whitespace cleanup --- .../htdocs/luci-static/bootstrap/cascade.css | 12 ++ .../htdocs/luci-static/freifunk-bno/cascade.css | 12 +- .../luci-static/freifunk-generic/cascade.css | 173 +++++++++++---------- .../htdocs/luci-static/openwrt.org/cascade.css | 8 + 4 files changed, 117 insertions(+), 88 deletions(-) diff --git a/themes/bootstrap/htdocs/luci-static/bootstrap/cascade.css b/themes/bootstrap/htdocs/luci-static/bootstrap/cascade.css index bb732485e..26f2bbb2e 100644 --- a/themes/bootstrap/htdocs/luci-static/bootstrap/cascade.css +++ b/themes/bootstrap/htdocs/luci-static/bootstrap/cascade.css @@ -1457,6 +1457,18 @@ footer { background-image: url('../resources/cbi/link.gif'), linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); } +.cbi-button-download, +.cbi-input-download { + background-position: 6px center, left top; + padding-left: 28px; + background-image: url('../resources/cbi/download.gif'), -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); + background-image: url('../resources/cbi/download.gif'), -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + background-image: url('../resources/cbi/download.gif'), -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); + background-image: url('../resources/cbi/download.gif'), -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + background-image: url('../resources/cbi/download.gif'), -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); + background-image: url('../resources/cbi/download.gif'), linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); +} + .btn.active, .btn:active { -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); diff --git a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css b/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css index 5e5d75cd1..4f89b2d3a 100644 --- a/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css +++ b/themes/freifunk-bno/htdocs/luci-static/freifunk-bno/cascade.css @@ -8,16 +8,16 @@ body { color: #ffffff; font-family: Verdana, Arial, sans-serif; font-size: 100%; - line-height: 100%; + line-height: 100%; background-image: url(images/main-back.png); background-repeat: repeat-x; background-position: left bottom; } -#all { +#all { margin: 0px; padding: 0px; min-height: 800px; -} +} code { font-family: monospace; @@ -27,7 +27,7 @@ code { a:link, a:visited { color:#000000; font-weight:bold; - text-decoration:none; + text-decoration:none; } a:hover { color:#333333; @@ -201,7 +201,7 @@ div#maincontent ul { color: #000000; text-decoration: none; font-size: 70%; - font-weight: bold; + font-weight: bold; } @@ -211,7 +211,7 @@ div#maincontent ul { border-top:0.3em solid #FFCB05; margin-top: -0.2em; } -.mainmenu .active a{ +.mainmenu .active a{ color: #000000; font-weight: bold; border-top:0.2em solid #FFCB05; diff --git a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css b/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css index cd49fcbe2..d5fe77279 100644 --- a/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css +++ b/themes/freifunk-generic/htdocs/luci-static/freifunk-generic/cascade.css @@ -275,19 +275,19 @@ ul.dropdowns ul ul ul li:hover ul { left: 100%; } -#xhr_poll_status { - cursor: pointer; -} +#xhr_poll_status { + cursor: pointer; +} -#xhr_poll_status #xhr_poll_status_off { - font-weight: bold; - color: #FF0000; -} +#xhr_poll_status #xhr_poll_status_off { + font-weight: bold; + color: #FF0000; +} -#xhr_poll_status #xhr_poll_status_on { - font-weight: bold; - color: #00FF00; -} +#xhr_poll_status #xhr_poll_status_on { + font-weight: bold; + color: #00FF00; +} #menubar { position: relative; @@ -658,7 +658,7 @@ input.cbi-button-add { background-color: inherit; color: #000; padding: 0 1px 0 17px; - border: 1px solid #FFF; + border: 1px solid #FFF; } input.cbi-input-fieldadd, @@ -691,18 +691,27 @@ input.cbi-button-save { input.cbi-input-apply, input.cbi-button-apply { background: url('../resources/cbi/apply.gif') no-repeat scroll 1px center; - background-color: inherit; - color: #000; + background-color: inherit; + color: #000; padding: 0 1px 0 17px; -} +} -input.cbi-input-link, - input.cbi-button-link { - background: url('../resources/cbi/link.gif') no-repeat scroll 1px center; +input.cbi-input-link, +input.cbi-button-link { + background: url('../resources/cbi/link.gif') no-repeat scroll 1px center; background-color: inherit; - color: #000; + color: #000; + padding: 0 1px 0 17px; + border: none; +} + +input.cbi-input-download, +input.cbi-button-download { + background: url('../resources/cbi/download.gif') no-repeat scroll 1px center; + background-color: inherit; + color: #000; padding: 0 1px 0 17px; - border: none; + border: none; } input.cbi-input-remove, @@ -994,72 +1003,72 @@ td.cbi-value-error { padding: 0.5em; } -.uci-change-list { - font-family: monospace; -} - -.uci-change-list ins, -.uci-change-legend-label ins { - text-decoration: none; - border: 1px solid #00FF00; - background-color: #CCFFCC; - display: block; - padding: 2px; -} - -.uci-change-list del, -.uci-change-legend-label del { - text-decoration: none; +.uci-change-list { + font-family: monospace; +} + +.uci-change-list ins, +.uci-change-legend-label ins { + text-decoration: none; + border: 1px solid #00FF00; + background-color: #CCFFCC; + display: block; + padding: 2px; +} + +.uci-change-list del, +.uci-change-legend-label del { + text-decoration: none; border: 1px solid #FF0000; background-color: #FFCCCC; - display: block; - font-style: normal; - padding: 2px; -} - -.uci-change-list var, -.uci-change-legend-label var { - text-decoration: none; + display: block; + font-style: normal; + padding: 2px; +} + +.uci-change-list var, +.uci-change-legend-label var { + text-decoration: none; border: 1px solid #CCCCCC; background-color: #EEEEEE; - display: block; - font-style: normal; - padding: 2px; -} - -.uci-change-list var ins, -.uci-change-list var del { - /*display: inline;*/ - border: none; - white-space: pre; - font-style: normal; - padding: 0px; -} - -.uci-change-legend { - padding: 5px; -} - -.uci-change-legend-label { - width: 150px; - float: left; - font-size: 80%; -} - -.uci-change-legend-label>ins, -.uci-change-legend-label>del, -.uci-change-legend-label>var { - float: left; - margin-right: 4px; - width: 10px; - height: 10px; - display: block; -} - -.uci-change-legend-label var ins, + display: block; + font-style: normal; + padding: 2px; +} + +.uci-change-list var ins, +.uci-change-list var del { + /*display: inline;*/ + border: none; + white-space: pre; + font-style: normal; + padding: 0px; +} + +.uci-change-legend { + padding: 5px; +} + +.uci-change-legend-label { + width: 150px; + float: left; + font-size: 80%; +} + +.uci-change-legend-label>ins, +.uci-change-legend-label>del, +.uci-change-legend-label>var { + float: left; + margin-right: 4px; + width: 10px; + height: 10px; + display: block; +} + +.uci-change-legend-label var ins, .uci-change-legend-label var del { - line-height: 6px; - border: none; + line-height: 6px; + border: none; } -} +} diff --git a/themes/openwrt/htdocs/luci-static/openwrt.org/cascade.css b/themes/openwrt/htdocs/luci-static/openwrt.org/cascade.css index acb44f3de..4a6877fa9 100644 --- a/themes/openwrt/htdocs/luci-static/openwrt.org/cascade.css +++ b/themes/openwrt/htdocs/luci-static/openwrt.org/cascade.css @@ -529,6 +529,14 @@ input.cbi-button-link { padding-right: 1px; } +input.cbi-input-download, +input.cbi-button-download { + background-image: url('../resources/cbi/download.gif'); + color: #000000; + padding-left: 17px; + padding-right: 1px; +} + input.cbi-input-remove, div.cbi-section-remove input { background-image: url('../resources/cbi/remove.gif'); -- 2.11.0