From 1a585e3680607e5fd36598b1d87460c52e969bf8 Mon Sep 17 00:00:00 2001 From: lukabazuka Date: Thu, 10 Nov 2011 00:57:24 +0100 Subject: [PATCH 1/3] CC-2959 Status box design for each stream Signed-off-by: lukabazuka --- .../public/css/images/stream_status.png | Bin 0 -> 1091 bytes airtime_mvc/public/css/styles.css | 42 +++++++++++++++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 airtime_mvc/public/css/images/stream_status.png diff --git a/airtime_mvc/public/css/images/stream_status.png b/airtime_mvc/public/css/images/stream_status.png new file mode 100644 index 0000000000000000000000000000000000000000..99c2ca38ca4a3b32e5dfada0438e6abc03be065c GIT binary patch literal 1091 zcmeAS@N?(olHy`uVBq!ia0vp^{6IX7gBeJgB`SReQj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS=07#JG@d_r8GGBQ5?ck&erOVm-OpO%)tK7S59$nfgxxynmg zFRvVWs;j%~cIBO)hZ4>({L|J>zs&xIoBQILHTPfaylr6-v72$-?at%Nmpu7*Ds&ga zkN5B2NJs>3Wr*Fw?X`np+2P*LX=!hTgdTc%bsS6Fcy7k)`nnHnZ10kiDo&cbF*Exl zAdt0LD|9xm`~Uy{qup!vKAwAP@`PK?&aa_e)DR+;98wNOn; zxS*^1WBKw`S0=nFEQr|0@c949lFzskrs# zLU{C}00FiKCl%Ecm>8KjSrj=q6dRa=M5Mo!z1ds7ae>~t+UcLK`+le_%m2&xbKSGK ztMl176p!=&zBa4$|HFvcjRD{1z0Pevys`G}&gCZM5oe!nI-90F{p>Y9rYjpPL$73b z8)|+wV0AVP4)lMuwp;UBTS8`+;nW#Q#-Dl~pSdDbkv8+d{O^9fnZm}e8@qRA$(Zk| zdt9>h=A7LPy}lc(S`GcC&+;uSX7*d|y6^L=ui>6gDhq#!ys~8so%(3eiSDcg%lVvA z+NOtiUY+*G$K}GWzNhCxJttlHd}qeJ>5G&m?@Te8IlCud7pLH>>VpXd>-Dz0yX^cj z)A#;A`NM6z(q=g~KKSo_RDw}ETdO=llld+$bHa+h zwf4;uNMO%cYFm@JpJ%)F7Y6QW>PPqA<~V++H+KK0l*Yv@>fe*^FXsQQ9rK9eoYou} z?zNA<2KYSFN-ucuJmpE=;oLlx;(yE$>lC&;Iz0cz_NIVTNxr)i?jKa-csSQ)2miw~ zJO0i*hYNEX{`}$HaL$qCzGJhWn8!l>%?t7`I4xVh;Jdzsx{>@|`I(&Qjv054ugk04 kdv9&%H}?NOg%TK!Gu+&5=y>KFFp)8My85}Sb4q9e0AdMjegFUf literal 0 HcmV?d00001 diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 9671cf476..20d9bc78e 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -2304,4 +2304,44 @@ tfoot tr th { -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 2px 2px inset; } #stream_url {font-size:12px; line-height: 170%;} -.stream-setting-content fieldset {border-width:0 1px 1px 1px;} \ No newline at end of file +.stream-setting-content fieldset {border-width:0 1px 1px 1px;} + +/*---//////////////////// STREAM SETTINGS STATUS ////////////////////---*/ +.stream-status { + border: 1px solid; + padding:2px 10px 4px 22px; + margin:2px 1px 10px 0px; + width: auto; +} +.stream-status h3 { + font-size: 12px; + font-weight: bold; + line-height: 12px; + padding:0; + margin:5px 4px 2px 4px; +} +.stream-status p { + padding:0; + margin:2px 3px 1px 4px; + color:#4F4F4F; + font-size: 11px; +} +.stream-config dd.stream-status { + padding:2px 10px 4px 22px; + margin:4px 0 10px 14px; + width: 65%; +} +.status-good { + background:#e3ffc9 url(images/stream_status.png) no-repeat 5px 5px; + border-color:#54b300; +} +.status-good h3 { + color:#54b300; +} +.status-error { + background:#ffeded url(images/stream_status.png) no-repeat 5px -128px; + border-color:#f90000; +} +.status-error h3 { + color:#DA0101; +} \ No newline at end of file From d174b39d5b8a7a5d07c7e6356ec8e90b3d21aea8 Mon Sep 17 00:00:00 2001 From: lukabazuka Date: Thu, 10 Nov 2011 02:03:02 +0100 Subject: [PATCH 2/3] CC-2836 Signed-off-by: lukabazuka --- airtime_mvc/public/css/styles.css | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 20d9bc78e..a1945933e 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -1212,7 +1212,8 @@ button, input { .button-bar-top .input_text { height:25px; - margin-right:6px + margin-right:6px; + padding: 0 3px; } .button-bar-top .input_text.hasDatepicker, .input_text.hasDatepicker { background-image:url(images/input_with_calendar_bg.png); @@ -1948,7 +1949,16 @@ dd .info-text-small { /*width:98.5%;*/ min-width:152px; } - +.stream-config .display_field dd input[type="text"], .stream-config .display_field dd textarea { + min-width:99%; + padding: 4px 3px; +} +.stream-config .display_field dd textarea { + min-height:60px; +} +.simple-formblock .display_field dd { + min-width:68%; +} .stream-config dd input[id$=port] { width:152px; } @@ -2306,6 +2316,17 @@ tfoot tr th { #stream_url {font-size:12px; line-height: 170%;} .stream-setting-content fieldset {border-width:0 1px 1px 1px;} +.stream-setting-content fieldset { + border-width: 0 1px 1px; +} +.stream-setting-content fieldset.display_field { + border: 1px solid #8F8F8F; + padding: 10px; +} +.stream-setting-content fieldset.display_field.closed { + border-width: 1px 0 0; +} + /*---//////////////////// STREAM SETTINGS STATUS ////////////////////---*/ .stream-status { border: 1px solid; From 18f21e480a4484ab7e13f45ad2730322dc142ab9 Mon Sep 17 00:00:00 2001 From: lukabazuka Date: Thu, 10 Nov 2011 02:17:58 +0100 Subject: [PATCH 3/3] CC-2438 Signed-off-by: lukabazuka --- airtime_mvc/public/css/styles.css | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index a1945933e..c695fdb7d 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -241,7 +241,7 @@ select { color:#a5a5a5; } -.listen-control-block a { +.listen-control-block a, .listen-control-button { font-size:11px; text-transform:uppercase; padding:0; @@ -251,9 +251,13 @@ select { font-weight:bold; margin-top:34px; display:block; + text-align:center; } -.listen-control-block a span { +.listen-control-button { + margin-top:6px; +} +.listen-control-block a span, .listen-control-button span { background-color: #6e6e6e; background: -moz-linear-gradient(top, #868686 0, #6e6e6e 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #868686), color-stop(100%, #6e6e6e)); @@ -265,10 +269,13 @@ select { text-shadow: #555555 0px -1px; display:block; } -.listen-control-block a:hover { +.listen-control-button span { + padding:2px 10px; +} +.listen-control-block a:hover, .listen-control-button:hover { border:1px solid #000; } -.listen-control-block a:hover span { +.listen-control-block a:hover span, .listen-control-button:hover span { background-color: #292929; background: -moz-linear-gradient(top, #3b3b3b 0, #292929 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #3b3b3b), color-stop(100%, #292929));