diff options
-rw-r--r-- | amelia/bootstrap.css | 100 | ||||
-rw-r--r-- | amelia/bootstrap.min.css | 54 | ||||
-rwxr-xr-x | amelia/variables.less | 8 |
3 files changed, 81 insertions, 81 deletions
diff --git a/amelia/bootstrap.css b/amelia/bootstrap.css index 6fc7e56a..a89811d8 100644 --- a/amelia/bootstrap.css +++ b/amelia/bootstrap.css @@ -142,11 +142,11 @@ body { background-color: #003f4d; } a { - color: #fcdd3f; + color: #e8d069; text-decoration: none; } a:hover { - color: #fcdd3f; + color: #e8d069; text-decoration: underline; } .row { @@ -1036,8 +1036,8 @@ select:focus:required:invalid:focus { } .input-prepend .active, .input-append .active { - background-color: #c5f086; - border-color: #7fc518; + background-color: #b8ebb3; + border-color: #48ca3b; } .input-prepend .add-on, .input-prepend .btn { @@ -2148,16 +2148,16 @@ table .span24 { background-color: #b25818 \9; } .btn-danger { - background-color: #dbb804; - background-image: -moz-linear-gradient(top, #dbb804, #dbb804); - background-image: -ms-linear-gradient(top, #dbb804, #dbb804); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#dbb804), to(#dbb804)); - background-image: -webkit-linear-gradient(top, #dbb804, #dbb804); - background-image: -o-linear-gradient(top, #dbb804, #dbb804); - background-image: linear-gradient(top, #dbb804, #dbb804); + background-color: #debb27; + background-image: -moz-linear-gradient(top, #debb27, #debb27); + background-image: -ms-linear-gradient(top, #debb27, #debb27); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#debb27), to(#debb27)); + background-image: -webkit-linear-gradient(top, #debb27, #debb27); + background-image: -o-linear-gradient(top, #debb27, #debb27); + background-image: linear-gradient(top, #debb27, #debb27); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#dbb804', endColorstr='#dbb804', GradientType=0); - border-color: #dbb804 #dbb804 #907902; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#debb27', endColorstr='#debb27', GradientType=0); + border-color: #debb27 #debb27 #a08618; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); filter: progid:dximagetransform.microsoft.gradient(enabled=false); } @@ -2166,23 +2166,23 @@ table .span24 { .btn-danger.active, .btn-danger.disabled, .btn-danger[disabled] { - background-color: #dbb804; + background-color: #debb27; } .btn-danger:active, .btn-danger.active { - background-color: #a98e03 \9; + background-color: #b6991c \9; } .btn-success { - background-color: #7fc518; - background-image: -moz-linear-gradient(top, #7fc518, #7fc518); - background-image: -ms-linear-gradient(top, #7fc518, #7fc518); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#7fc518), to(#7fc518)); - background-image: -webkit-linear-gradient(top, #7fc518, #7fc518); - background-image: -o-linear-gradient(top, #7fc518, #7fc518); - background-image: linear-gradient(top, #7fc518, #7fc518); + background-color: #48ca3b; + background-image: -moz-linear-gradient(top, #48ca3b, #48ca3b); + background-image: -ms-linear-gradient(top, #48ca3b, #48ca3b); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#48ca3b), to(#48ca3b)); + background-image: -webkit-linear-gradient(top, #48ca3b, #48ca3b); + background-image: -o-linear-gradient(top, #48ca3b, #48ca3b); + background-image: linear-gradient(top, #48ca3b, #48ca3b); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#7fc518', endColorstr='#7fc518', GradientType=0); - border-color: #7fc518 #7fc518 #538110; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#48ca3b', endColorstr='#48ca3b', GradientType=0); + border-color: #48ca3b #48ca3b #319127; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); filter: progid:dximagetransform.microsoft.gradient(enabled=false); } @@ -2191,11 +2191,11 @@ table .span24 { .btn-success.active, .btn-success.disabled, .btn-success[disabled] { - background-color: #7fc518; + background-color: #48ca3b; } .btn-success:active, .btn-success.active { - background-color: #629812 \9; + background-color: #38a52d \9; } .btn-info { background-color: #4d3a7d; @@ -2517,7 +2517,7 @@ input[type="submit"].btn.btn-mini { .nav-list > .active > a:hover { color: #ffffff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #fcdd3f; + background-color: #e8d069; } .nav-list [class^="icon-"] { margin-right: 2px; @@ -2595,7 +2595,7 @@ input[type="submit"].btn.btn-mini { .nav-pills > .active > a, .nav-pills > .active > a:hover { color: #ffffff; - background-color: #fcdd3f; + background-color: #e8d069; } .nav-stacked > li { float: none; @@ -2644,14 +2644,14 @@ input[type="submit"].btn.btn-mini { } .nav-tabs .dropdown-toggle .caret, .nav-pills .dropdown-toggle .caret { - border-top-color: #fcdd3f; - border-bottom-color: #fcdd3f; + border-top-color: #e8d069; + border-bottom-color: #e8d069; margin-top: 6px; } .nav-tabs .dropdown-toggle:hover .caret, .nav-pills .dropdown-toggle:hover .caret { - border-top-color: #fcdd3f; - border-bottom-color: #fcdd3f; + border-top-color: #e8d069; + border-bottom-color: #e8d069; } .nav-tabs .active .dropdown-toggle .caret, .nav-pills .active .dropdown-toggle .caret { @@ -3551,7 +3551,7 @@ input[type="submit"].btn.btn-mini { box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); } a.thumbnail:hover { - border-color: #fcdd3f; + border-color: #e8d069; -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); @@ -4238,7 +4238,7 @@ div.subnav-fixed { background-color: #2d2249 \9; } .btn-success { - background-color: #7fc518; + background-color: #48ca3b; border-color: transparent; } .btn-success:hover, @@ -4246,19 +4246,19 @@ div.subnav-fixed { .btn-success.active, .btn-success.disabled, .btn-success[disabled] { - background-color: #70ae15; + background-color: #3eb932; text-shadow: none; } .btn-success:active, .btn-success.active { - background-color: #538110; + background-color: #319127; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; } .btn-success:active, .btn-success.active { - background-color: #538110 \9; + background-color: #319127 \9; } .btn-warning { background-color: #df6e1e; @@ -4284,7 +4284,7 @@ div.subnav-fixed { background-color: #9c4d15 \9; } .btn-danger { - background-color: #dbb804; + background-color: #debb27; border-color: transparent; } .btn-danger:hover, @@ -4292,19 +4292,19 @@ div.subnav-fixed { .btn-danger.active, .btn-danger.disabled, .btn-danger[disabled] { - background-color: #c2a303; + background-color: #ccab1f; text-shadow: none; } .btn-danger:active, .btn-danger.active { - background-color: #907902; + background-color: #a08618; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; } .btn-danger:active, .btn-danger.active { - background-color: #907902 \9; + background-color: #a08618 \9; } .btn-inverse { background-color: #27666d; @@ -4401,11 +4401,11 @@ textarea, } .control-group.error > label, .control-group.error .help-inline { - color: #fde671; + color: #efde96; } .control-group.success > label, .control-group.success .help-inline { - color: #afeb58; + color: #93e08b; } .input-prepend .add-on, .input-append .add-on { @@ -4438,7 +4438,7 @@ textarea, text-shadow: none; } .breadcrumb .divider { - color: #fcdd3f; + color: #e8d069; } .pager > li > a { background-color: #3CB9C6; @@ -4459,7 +4459,7 @@ textarea, } .pagination li a:hover { background-color: rgba(255, 255, 255, 0.4); - color: #fcdd3f; + color: #e8d069; } .pagination .active a, .pagination .active a:hover { @@ -4476,7 +4476,7 @@ textarea, .nav-tabs .dropdown.open > .dropdown-toggle, .nav-pills .dropdown.open > .dropdown-toggle { background-color: #8AD5DC; - color: #fcdd3f; + color: #e8d069; border-color: transparent; } .nav-tabs, @@ -4608,13 +4608,13 @@ pre { .label-important, .label-important:hover, .alert-error { - background-color: #dbb804; + background-color: #d5b321; color: rgba(255, 255, 255, 0.9); } .label-success, .label-success:hover, .alert-success { - background-color: #7fc518; + background-color: #48ca3b; color: rgba(255, 255, 255, 0.9); } .label-info, @@ -4652,10 +4652,10 @@ pre { } .progress-success .bar { background-image: none; - background-color: #7fc518; + background-color: #48ca3b; } .progress-success.progress-striped .bar { - background-color: #7fc518; + background-color: #48ca3b; background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); diff --git a/amelia/bootstrap.min.css b/amelia/bootstrap.min.css index 89309d36..01c4ef2b 100644 --- a/amelia/bootstrap.min.css +++ b/amelia/bootstrap.min.css @@ -22,8 +22,8 @@ textarea{overflow:auto;vertical-align:top;} .hide-text{overflow:hidden;text-indent:100%;white-space:nowrap;} .input-block-level{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;} body{margin:0;font-family:'Cabin',Verdana,sans-serif;font-size:14px;line-height:20px;color:rgba(255, 255, 255, 0.9);background-color:#003f4d;} -a{color:#fcdd3f;text-decoration:none;} -a:hover{color:#fcdd3f;text-decoration:underline;} +a{color:#e8d069;text-decoration:none;} +a:hover{color:#e8d069;text-decoration:underline;} .row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";} .row:after{clear:both;} [class*="span"]{float:left;margin-left:20px;} @@ -185,7 +185,7 @@ input:focus:required:invalid,textarea:focus:required:invalid,select:focus:requir .input-prepend .uneditable-input,.input-append .uneditable-input{border-left-color:#ccc;} .input-prepend .add-on,.input-append .add-on{display:inline-block;width:auto;min-width:16px;height:20px;padding:4px 5px;font-weight:normal;line-height:20px;text-align:center;text-shadow:0 1px 0 #ffffff;vertical-align:middle;background-color:#dddddd;border:1px solid #ccc;} .input-prepend .add-on,.input-append .add-on,.input-prepend .btn,.input-append .btn{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -.input-prepend .active,.input-append .active{background-color:#c5f086;border-color:#7fc518;} +.input-prepend .active,.input-append .active{background-color:#b8ebb3;border-color:#48ca3b;} .input-prepend .add-on,.input-prepend .btn{margin-right:-1px;} .input-append input,.input-append select .uneditable-input{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} .input-append .uneditable-input{border-left-color:#eee;border-right-color:#ccc;} @@ -409,10 +409,10 @@ table .span24{float:none;width:1884px;margin-left:0;} .btn-primary:active,.btn-primary.active{background-color:#812816 \9;} .btn-warning{background-color:#df6e1e;background-image:-moz-linear-gradient(top, #df6e1e, #df6e1e);background-image:-ms-linear-gradient(top, #df6e1e, #df6e1e);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#df6e1e), to(#df6e1e));background-image:-webkit-linear-gradient(top, #df6e1e, #df6e1e);background-image:-o-linear-gradient(top, #df6e1e, #df6e1e);background-image:linear-gradient(top, #df6e1e, #df6e1e);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#df6e1e', endColorstr='#df6e1e', GradientType=0);border-color:#df6e1e #df6e1e #9c4d15;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#df6e1e;} .btn-warning:active,.btn-warning.active{background-color:#b25818 \9;} -.btn-danger{background-color:#dbb804;background-image:-moz-linear-gradient(top, #dbb804, #dbb804);background-image:-ms-linear-gradient(top, #dbb804, #dbb804);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#dbb804), to(#dbb804));background-image:-webkit-linear-gradient(top, #dbb804, #dbb804);background-image:-o-linear-gradient(top, #dbb804, #dbb804);background-image:linear-gradient(top, #dbb804, #dbb804);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#dbb804', endColorstr='#dbb804', GradientType=0);border-color:#dbb804 #dbb804 #907902;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{background-color:#dbb804;} -.btn-danger:active,.btn-danger.active{background-color:#a98e03 \9;} -.btn-success{background-color:#7fc518;background-image:-moz-linear-gradient(top, #7fc518, #7fc518);background-image:-ms-linear-gradient(top, #7fc518, #7fc518);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#7fc518), to(#7fc518));background-image:-webkit-linear-gradient(top, #7fc518, #7fc518);background-image:-o-linear-gradient(top, #7fc518, #7fc518);background-image:linear-gradient(top, #7fc518, #7fc518);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#7fc518', endColorstr='#7fc518', GradientType=0);border-color:#7fc518 #7fc518 #538110;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{background-color:#7fc518;} -.btn-success:active,.btn-success.active{background-color:#629812 \9;} +.btn-danger{background-color:#debb27;background-image:-moz-linear-gradient(top, #debb27, #debb27);background-image:-ms-linear-gradient(top, #debb27, #debb27);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#debb27), to(#debb27));background-image:-webkit-linear-gradient(top, #debb27, #debb27);background-image:-o-linear-gradient(top, #debb27, #debb27);background-image:linear-gradient(top, #debb27, #debb27);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#debb27', endColorstr='#debb27', GradientType=0);border-color:#debb27 #debb27 #a08618;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{background-color:#debb27;} +.btn-danger:active,.btn-danger.active{background-color:#b6991c \9;} +.btn-success{background-color:#48ca3b;background-image:-moz-linear-gradient(top, #48ca3b, #48ca3b);background-image:-ms-linear-gradient(top, #48ca3b, #48ca3b);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#48ca3b), to(#48ca3b));background-image:-webkit-linear-gradient(top, #48ca3b, #48ca3b);background-image:-o-linear-gradient(top, #48ca3b, #48ca3b);background-image:linear-gradient(top, #48ca3b, #48ca3b);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#48ca3b', endColorstr='#48ca3b', GradientType=0);border-color:#48ca3b #48ca3b #319127;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{background-color:#48ca3b;} +.btn-success:active,.btn-success.active{background-color:#38a52d \9;} .btn-info{background-color:#4d3a7d;background-image:-moz-linear-gradient(top, #4d3a7d, #4d3a7d);background-image:-ms-linear-gradient(top, #4d3a7d, #4d3a7d);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#4d3a7d), to(#4d3a7d));background-image:-webkit-linear-gradient(top, #4d3a7d, #4d3a7d);background-image:-o-linear-gradient(top, #4d3a7d, #4d3a7d);background-image:linear-gradient(top, #4d3a7d, #4d3a7d);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#4d3a7d', endColorstr='#4d3a7d', GradientType=0);border-color:#4d3a7d #4d3a7d #2d2249;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{background-color:#4d3a7d;} .btn-info:active,.btn-info.active{background-color:#382a5a \9;} .btn-inverse{background-color:#27666d;background-image:-moz-linear-gradient(top, #27666d, #27666d);background-image:-ms-linear-gradient(top, #27666d, #27666d);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#27666d), to(#27666d));background-image:-webkit-linear-gradient(top, #27666d, #27666d);background-image:-o-linear-gradient(top, #27666d, #27666d);background-image:linear-gradient(top, #27666d, #27666d);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#27666d', endColorstr='#27666d', GradientType=0);border-color:#27666d #27666d #133135;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{background-color:#27666d;} @@ -462,7 +462,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .nav-list{padding-left:15px;padding-right:15px;margin-bottom:0;} .nav-list>li>a,.nav-list .nav-header{margin-left:-15px;margin-right:-15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);} .nav-list>li>a{padding:3px 15px;} -.nav-list>.active>a,.nav-list>.active>a:hover{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#fcdd3f;} +.nav-list>.active>a,.nav-list>.active>a:hover{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#e8d069;} .nav-list [class^="icon-"]{margin-right:2px;} .nav-list .divider{height:1px;margin:9px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;*width:100%;*margin:-5px 0 5px;} .nav-tabs,.nav-pills{*zoom:1;}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;content:"";} @@ -474,7 +474,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:20px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.nav-tabs>li>a:hover{border-color:#dddddd #dddddd #dddddd;} .nav-tabs>.active>a,.nav-tabs>.active>a:hover{color:#555555;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;} .nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} -.nav-pills>.active>a,.nav-pills>.active>a:hover{color:#ffffff;background-color:#fcdd3f;} +.nav-pills>.active>a,.nav-pills>.active>a:hover{color:#ffffff;background-color:#e8d069;} .nav-stacked>li{float:none;} .nav-stacked>li>a{margin-right:0;} .nav-tabs.nav-stacked{border-bottom:0;} @@ -486,8 +486,8 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px;} .nav-tabs .dropdown-menu,.nav-pills .dropdown-menu{margin-top:1px;border-width:1px;} .nav-pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.nav-tabs .dropdown-toggle .caret,.nav-pills .dropdown-toggle .caret{border-top-color:#fcdd3f;border-bottom-color:#fcdd3f;margin-top:6px;} -.nav-tabs .dropdown-toggle:hover .caret,.nav-pills .dropdown-toggle:hover .caret{border-top-color:#fcdd3f;border-bottom-color:#fcdd3f;} +.nav-tabs .dropdown-toggle .caret,.nav-pills .dropdown-toggle .caret{border-top-color:#e8d069;border-bottom-color:#e8d069;margin-top:6px;} +.nav-tabs .dropdown-toggle:hover .caret,.nav-pills .dropdown-toggle:hover .caret{border-top-color:#e8d069;border-bottom-color:#e8d069;} .nav-tabs .active .dropdown-toggle .caret,.nav-pills .active .dropdown-toggle .caret{border-top-color:#333333;border-bottom-color:#333333;} .nav>.dropdown.active>a:hover{color:#000000;cursor:pointer;} .nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>.open.active>a:hover{color:#ffffff;background-color:#aaaaaa;border-color:#aaaaaa;} @@ -622,7 +622,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .thumbnails:after{clear:both;} .thumbnails>li{float:left;margin:0 0 20px 20px;} .thumbnail{display:block;padding:4px;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);} -a.thumbnail:hover{border-color:#fcdd3f;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} +a.thumbnail:hover{border-color:#e8d069;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} .thumbnail>img{display:block;max-width:100%;margin-left:auto;margin-right:auto;} .thumbnail .caption{padding:9px;} .label{padding:1px 4px 2px;font-size:11.844px;font-weight:bold;line-height:13px;color:#ffffff;vertical-align:middle;white-space:nowrap;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#aaaaaa;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} @@ -725,15 +725,15 @@ div.subnav-fixed{top:50px;} .btn-info{background-color:#4d3a7d;border-color:transparent;}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{background-color:#42326c;text-shadow:none;} .btn-info:active,.btn-info.active{background-color:#2d2249;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .btn-info:active,.btn-info.active{background-color:#2d2249 \9;} -.btn-success{background-color:#7fc518;border-color:transparent;}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{background-color:#70ae15;text-shadow:none;} -.btn-success:active,.btn-success.active{background-color:#538110;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.btn-success:active,.btn-success.active{background-color:#538110 \9;} +.btn-success{background-color:#48ca3b;border-color:transparent;}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{background-color:#3eb932;text-shadow:none;} +.btn-success:active,.btn-success.active{background-color:#319127;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +.btn-success:active,.btn-success.active{background-color:#319127 \9;} .btn-warning{background-color:#df6e1e;border-color:transparent;}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#c9631b;text-shadow:none;} .btn-warning:active,.btn-warning.active{background-color:#9c4d15;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .btn-warning:active,.btn-warning.active{background-color:#9c4d15 \9;} -.btn-danger{background-color:#dbb804;border-color:transparent;}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{background-color:#c2a303;text-shadow:none;} -.btn-danger:active,.btn-danger.active{background-color:#907902;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.btn-danger:active,.btn-danger.active{background-color:#907902 \9;} +.btn-danger{background-color:#debb27;border-color:transparent;}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{background-color:#ccab1f;text-shadow:none;} +.btn-danger:active,.btn-danger.active{background-color:#a08618;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +.btn-danger:active,.btn-danger.active{background-color:#a08618 \9;} .btn-inverse{background-color:#27666d;border-color:transparent;}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{background-color:#20545a;text-shadow:none;} .btn-inverse:active,.btn-inverse.active{background-color:#133135;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .btn-inverse:active,.btn-inverse.active{background-color:#133135 \9;} @@ -751,20 +751,20 @@ button{margin-left:12px;} input,textarea,.search-query,.uneditable-input,.input-append input,.input-append .uneditable-input,.input-prepend input,.input-prepend .uneditable-input{border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .form-actions{background-color:transparent;border-top:0px solid transparent;} .control-group.warning>label,.control-group.warning .help-inline{color:#f3c4a3;} -.control-group.error>label,.control-group.error .help-inline{color:#fde671;} -.control-group.success>label,.control-group.success .help-inline{color:#afeb58;} +.control-group.error>label,.control-group.error .help-inline{color:#efde96;} +.control-group.success>label,.control-group.success .help-inline{color:#93e08b;} .input-prepend .add-on,.input-append .add-on{height:25px;padding-top:9px;background-color:#dddddd;border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;color:#555555;text-shadow:none;} .breadcrumb,.pager>li>a{border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;text-shadow:none;} .breadcrumb{background-color:#3CB9C6;background-image:none;}.breadcrumb li{text-shadow:none;} -.breadcrumb .divider{color:#fcdd3f;} +.breadcrumb .divider{color:#e8d069;} .pager>li>a{background-color:#3CB9C6;}.pager>li>a:hover{background-color:#8AD5DC;} .pagination ul{background-color:#3CB9C6;background-image:none;} .pagination li a{border:0px solid transparent;} .pagination .disabled a,.pagination .disabled a:hover{color:rgba(255, 255, 255, 0.9);} -.pagination li a:hover{background-color:rgba(255, 255, 255, 0.4);color:#fcdd3f;} +.pagination li a:hover{background-color:rgba(255, 255, 255, 0.4);color:#e8d069;} .pagination .active a,.pagination .active a:hover{background-color:rgba(255, 255, 255, 0.4);color:rgba(255, 255, 255, 0.9);} .pagination ul,.pagination li:first-child a,.pagination li:last-child a{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.nav-tabs .dropdown.open>.dropdown-toggle,.nav-pills .dropdown.open>.dropdown-toggle{background-color:#8AD5DC;color:#fcdd3f;border-color:transparent;} +.nav-tabs .dropdown.open>.dropdown-toggle,.nav-pills .dropdown.open>.dropdown-toggle{background-color:#8AD5DC;color:#e8d069;border-color:transparent;} .nav-tabs,.nav-pills{border-color:transparent;}.nav-tabs li>a,.nav-pills li>a{border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:0;-moz-box-shadow:0;box-shadow:0;} .nav-tabs li.active>a,.nav-pills li.active>a,.nav-tabs li:active>a,.nav-pills li:active>a,.nav-tabs li.active>a:hover,.nav-pills li.active>a:hover,.nav-tabs li:active>a:hover,.nav-pills li:active>a:hover{color:rgba(255, 255, 255, 0.9);} .nav-tabs li.active>a,.nav-pills li.active>a,.nav-tabs li:active>a,.nav-pills li:active>a,.nav-tabs li>a:hover,.nav-pills li>a:hover,.nav-tabs li.active>a:hover,.nav-pills li.active>a:hover,.nav-tabs li:active>a:hover,.nav-pills li:active>a:hover{background-color:#8AD5DC;border-color:transparent;text-shadow:none;} @@ -784,15 +784,15 @@ code,pre{background-color:rgba(255, 255, 255, 0.3);padding:2px;} .well{background-color:#3CB9C6;background-image:none;} .label,.label:hover{background-color:#dddddd;text-shadow:none;color:#333333;} .label-warning,.label-warning:hover,.alert{background-color:#df6e1e;color:rgba(255, 255, 255, 0.9);} -.label-important,.label-important:hover,.alert-error{background-color:#dbb804;color:rgba(255, 255, 255, 0.9);} -.label-success,.label-success:hover,.alert-success{background-color:#7fc518;color:rgba(255, 255, 255, 0.9);} +.label-important,.label-important:hover,.alert-error{background-color:#d5b321;color:rgba(255, 255, 255, 0.9);} +.label-success,.label-success:hover,.alert-success{background-color:#48ca3b;color:rgba(255, 255, 255, 0.9);} .label-info,.label-info:hover,.alert-info{background-color:#4d3a7d;color:rgba(255, 255, 255, 0.9);} .alert-heading{color:rgba(255, 255, 255, 0.9);} .progress{background-image:none;background-color:#27666D;}.progress .bar{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;background-image:none;background-color:#df6e1e;} .progress-danger .bar{background-image:none;background-color:#AD1D28;} .progress-danger.progress-striped .bar{background-color:#ad1d28;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} -.progress-success .bar{background-image:none;background-color:#7fc518;} -.progress-success.progress-striped .bar{background-color:#7fc518;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} +.progress-success .bar{background-image:none;background-color:#48ca3b;} +.progress-success.progress-striped .bar{background-color:#48ca3b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} .progress-info .bar{background-image:none;background-color:#00bce1;} .progress-info.progress-striped .bar{background-color:#00bce1;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} .thumbnail{border:0px solid transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} diff --git a/amelia/variables.less b/amelia/variables.less index 0e11a7d0..03949982 100755 --- a/amelia/variables.less +++ b/amelia/variables.less @@ -25,9 +25,9 @@ // ------------------------- @blue: #00BCE1; @blueDark: #1269B0; -@green: #7FC518; +@green: #48CA3B; @red: #E51925; -@yellow: #EAC504; +@yellow: #DEBB27; @orange: #DF6E1E; @pink: #FFBCB9; @purple: #4D3A7D; @@ -83,8 +83,8 @@ @btnWarningBackground: @orange; @btnWarningBackgroundHighlight: @orange; -@btnDangerBackground: darken(@yellow, 3%); -@btnDangerBackgroundHighlight: darken(@yellow, 3%); +@btnDangerBackground: @yellow; +@btnDangerBackgroundHighlight: @yellow; @btnInverseBackground: #27666D; @btnInverseBackgroundHighlight: #27666D; |