From 611ed35b0766f58e4bc8dd1b0c03888a5768d82e Mon Sep 17 00:00:00 2001 From: Thomas Park Date: Sat, 1 Dec 2012 11:08:19 -0500 Subject: [PATCH] cerulean: fixes #48 --- cerulean/bootstrap.css | 54 +++++++++++++++++++------------------- cerulean/bootstrap.min.css | 34 ++++++++++++------------ cerulean/variables.less | 8 +++--- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/cerulean/bootstrap.css b/cerulean/bootstrap.css index df330c4..9c9f2f7 100644 --- a/cerulean/bootstrap.css +++ b/cerulean/bootstrap.css @@ -509,10 +509,10 @@ cite { color: #999999; } .text-warning { - color: #126b9e; + color: #dd5600; } a.text-warning:hover { - color: #0d4c70; + color: #aa4200; } .text-error { color: #bd4247; @@ -1116,19 +1116,19 @@ input[type="checkbox"][readonly] { .control-group.warning > label, .control-group.warning .help-block, .control-group.warning .help-inline { - color: #126b9e; + color: #dd5600; } .control-group.warning .checkbox, .control-group.warning .radio, .control-group.warning input, .control-group.warning select, .control-group.warning textarea { - color: #126b9e; + color: #dd5600; } .control-group.warning input, .control-group.warning select, .control-group.warning textarea { - border-color: #126b9e; + border-color: #dd5600; -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); @@ -1136,16 +1136,16 @@ input[type="checkbox"][readonly] { .control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus { - border-color: #0d4c70; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #2fa4e7; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #2fa4e7; - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #2fa4e7; + border-color: #aa4200; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ff8d44; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ff8d44; + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ff8d44; } .control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { - color: #126b9e; - background-color: #8accf2; - border-color: #126b9e; + color: #dd5600; + background-color: #f1ceab; + border-color: #dd5600; } .control-group.error > label, .control-group.error .help-block, @@ -1178,7 +1178,7 @@ input[type="checkbox"][readonly] { .control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { color: #bd4247; - background-color: #eddbe3; + background-color: #f2bdb1; border-color: #bd4247; } .control-group.success > label, @@ -1212,7 +1212,7 @@ input[type="checkbox"][readonly] { .control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { color: #669533; - background-color: #ccddbb; + background-color: #d5ecbf; border-color: #669533; } .control-group.info > label, @@ -1774,25 +1774,25 @@ table th[class*="span"], margin-left: 0; } .table tbody tr.success td { - background-color: #ccddbb; + background-color: #d5ecbf; } .table tbody tr.error td { - background-color: #eddbe3; + background-color: #f2bdb1; } .table tbody tr.warning td { - background-color: #8accf2; + background-color: #f1ceab; } .table tbody tr.info td { background-color: #a7dff1; } .table-hover tbody tr.success:hover td { - background-color: #bfd4aa; + background-color: #c8e6ab; } .table-hover tbody tr.error:hover td { - background-color: #e4cad6; + background-color: #eeab9b; } .table-hover tbody tr.warning:hover td { - background-color: #74c2ef; + background-color: #edc195; } .table-hover tbody tr.info:hover td { background-color: #91d7ee; @@ -3124,12 +3124,12 @@ input[type="submit"].btn.btn-mini { padding: 8px 35px 8px 14px; margin-bottom: 20px; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - background-color: #8accf2; - border: 1px solid #7dd9f0; + background-color: #f1ceab; + border: 1px solid #efb99e; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - color: #126b9e; + color: #dd5600; } .alert h4 { margin: 0; @@ -3141,14 +3141,14 @@ input[type="submit"].btn.btn-mini { line-height: 20px; } .alert-success { - background-color: #ccddbb; - border-color: #c6d4aa; + background-color: #d5ecbf; + border-color: #d2e6ab; color: #669533; } .alert-danger, .alert-error { - background-color: #eddbe3; - border-color: #e8d1df; + background-color: #f2bdb1; + border-color: #f0a5a4; color: #bd4247; } .alert-info { diff --git a/cerulean/bootstrap.min.css b/cerulean/bootstrap.min.css index 3553fbb..4c51d29 100644 --- a/cerulean/bootstrap.min.css +++ b/cerulean/bootstrap.min.css @@ -109,8 +109,8 @@ strong{font-weight:bold;} em{font-style:italic;} cite{font-style:normal;} .muted{color:#999999;} -.text-warning{color:#126b9e;} -a.text-warning:hover{color:#0d4c70;} +.text-warning{color:#dd5600;} +a.text-warning:hover{color:#aa4200;} .text-error{color:#bd4247;} a.text-error:hover{color:#983538;} .text-info{color:#817b58;} @@ -212,18 +212,18 @@ input.span1, textarea.span1, .uneditable-input.span1{width:46px;} .controls-row .checkbox[class*="span"],.controls-row .radio[class*="span"]{padding-top:5px;} input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#f5f5f5;} input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"][readonly],input[type="checkbox"][readonly]{background-color:transparent;} -.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#126b9e;} -.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#126b9e;} -.control-group.warning input,.control-group.warning select,.control-group.warning textarea{border-color:#126b9e;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#0d4c70;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #2fa4e7;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #2fa4e7;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #2fa4e7;} -.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#126b9e;background-color:#8accf2;border-color:#126b9e;} +.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#dd5600;} +.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#dd5600;} +.control-group.warning input,.control-group.warning select,.control-group.warning textarea{border-color:#dd5600;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#aa4200;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ff8d44;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ff8d44;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #ff8d44;} +.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#dd5600;background-color:#f1ceab;border-color:#dd5600;} .control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#bd4247;} .control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#bd4247;} .control-group.error input,.control-group.error select,.control-group.error textarea{border-color:#bd4247;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#983538;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #d88e90;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #d88e90;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #d88e90;} -.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#bd4247;background-color:#eddbe3;border-color:#bd4247;} +.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#bd4247;background-color:#f2bdb1;border-color:#bd4247;} .control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#669533;} .control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#669533;} .control-group.success input,.control-group.success select,.control-group.success textarea{border-color:#669533;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#4c6f26;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #99ca63;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #99ca63;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #99ca63;} -.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#669533;background-color:#ccddbb;border-color:#669533;} +.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#669533;background-color:#d5ecbf;border-color:#669533;} .control-group.info>label,.control-group.info .help-block,.control-group.info .help-inline{color:#817b58;} .control-group.info .checkbox,.control-group.info .radio,.control-group.info input,.control-group.info select,.control-group.info textarea{color:#817b58;} .control-group.info input,.control-group.info select,.control-group.info textarea{border-color:#817b58;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.info input:focus,.control-group.info select:focus,.control-group.info textarea:focus{border-color:#625e43;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #b1ad8d;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #b1ad8d;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #b1ad8d;} @@ -299,13 +299,13 @@ table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span .table td.span10,.table th.span10{float:none;width:764px;margin-left:0;} .table td.span11,.table th.span11{float:none;width:844px;margin-left:0;} .table td.span12,.table th.span12{float:none;width:924px;margin-left:0;} -.table tbody tr.success td{background-color:#ccddbb;} -.table tbody tr.error td{background-color:#eddbe3;} -.table tbody tr.warning td{background-color:#8accf2;} +.table tbody tr.success td{background-color:#d5ecbf;} +.table tbody tr.error td{background-color:#f2bdb1;} +.table tbody tr.warning td{background-color:#f1ceab;} .table tbody tr.info td{background-color:#a7dff1;} -.table-hover tbody tr.success:hover td{background-color:#bfd4aa;} -.table-hover tbody tr.error:hover td{background-color:#e4cad6;} -.table-hover tbody tr.warning:hover td{background-color:#74c2ef;} +.table-hover tbody tr.success:hover td{background-color:#c8e6ab;} +.table-hover tbody tr.error:hover td{background-color:#eeab9b;} +.table-hover tbody tr.warning:hover td{background-color:#edc195;} .table-hover tbody tr.info:hover td{background-color:#91d7ee;} [class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat;margin-top:1px;} .icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:url("../img/glyphicons-halflings-white.png");} @@ -557,11 +557,11 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .btn-group-vertical .btn:last-child{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;} .btn-group-vertical .btn-large:first-child{-webkit-border-radius:6px 6px 0 0;-moz-border-radius:6px 6px 0 0;border-radius:6px 6px 0 0;} .btn-group-vertical .btn-large:last-child{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;} -.alert{padding:8px 35px 8px 14px;margin-bottom:20px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#8accf2;border:1px solid #7dd9f0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#126b9e;} +.alert{padding:8px 35px 8px 14px;margin-bottom:20px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#f1ceab;border:1px solid #efb99e;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#dd5600;} .alert h4{margin:0;} .alert .close{position:relative;top:-2px;right:-21px;line-height:20px;} -.alert-success{background-color:#ccddbb;border-color:#c6d4aa;color:#669533;} -.alert-danger,.alert-error{background-color:#eddbe3;border-color:#e8d1df;color:#bd4247;} +.alert-success{background-color:#d5ecbf;border-color:#d2e6ab;color:#669533;} +.alert-danger,.alert-error{background-color:#f2bdb1;border-color:#f0a5a4;color:#bd4247;} .alert-info{background-color:#a7dff1;border-color:#88e4ec;color:#817b58;} .alert-block{padding-top:14px;padding-bottom:14px;} .alert-block>p,.alert-block>ul{margin-bottom:0;} diff --git a/cerulean/variables.less b/cerulean/variables.less index bf30cdf..22a0d4b 100755 --- a/cerulean/variables.less +++ b/cerulean/variables.less @@ -230,16 +230,16 @@ // Form states and alerts // ------------------------- -@warningText: darken(@linkColor, 20%); -@warningBackground: lighten(@linkColor, 20%); +@warningText: @orange; +@warningBackground: #F1CEAB; @warningBorder: darken(spin(@warningBackground, -10), 3%); @errorText: darken(#C45559, 5%); -@errorBackground: #EDDBE3; +@errorBackground: #F2BDB1; @errorBorder: darken(spin(@errorBackground, -10), 3%); @successText: darken(@green, 5%); -@successBackground: #CDB; +@successBackground: #D5ECBF; @successBorder: darken(spin(@successBackground, -10), 5%); @infoText: darken(#908A62, 5%); -- 2.39.2