diff options
34 files changed, 196 insertions, 126 deletions
diff --git a/cerulean/bootstrap.css b/cerulean/bootstrap.css index 93b2e00a..5a627ffc 100644 --- a/cerulean/bootstrap.css +++ b/cerulean/bootstrap.css @@ -401,7 +401,7 @@ h6 { .page-header { padding-bottom: 17px; margin: 18px 0; - border-bottom: 1px solid #eeeeee; + border-bottom: 1px solid #f5f5f5; } .page-header h1 { line-height: 1; @@ -457,7 +457,7 @@ dd { hr { margin: 18px 0; border: 0; - border-top: 1px solid #eeeeee; + border-top: 1px solid #f5f5f5; border-bottom: 1px solid #ffffff; } strong { @@ -480,7 +480,7 @@ abbr.initialism { blockquote { padding: 0 0 0 15px; margin: 0 0 18px; - border-left: 5px solid #eeeeee; + border-left: 5px solid #f5f5f5; } blockquote p { margin-bottom: 0; @@ -501,7 +501,7 @@ blockquote.pull-right { padding-left: 0; padding-right: 15px; border-left: 0; - border-right: 5px solid #eeeeee; + border-right: 5px solid #f5f5f5; } blockquote.pull-right p, blockquote.pull-right small { @@ -840,7 +840,7 @@ textarea[disabled], input[readonly], select[readonly], textarea[readonly] { - background-color: #eeeeee; + background-color: #f5f5f5; border-color: #ddd; cursor: not-allowed; } @@ -937,7 +937,7 @@ select:focus:required:invalid:focus { padding: 17px 20px 18px; margin-top: 18px; margin-bottom: 18px; - background-color: #eeeeee; + background-color: #f5f5f5; border-top: 1px solid #ddd; *zoom: 1; } @@ -1021,7 +1021,7 @@ select:focus:required:invalid:focus { text-align: center; text-shadow: 0 1px 0 #ffffff; vertical-align: middle; - background-color: #eeeeee; + background-color: #f5f5f5; border: 1px solid #ccc; } .input-prepend .add-on, @@ -2482,7 +2482,7 @@ input[type="submit"].btn.btn-mini { } .nav > li > a:hover { text-decoration: none; - background-color: #eeeeee; + background-color: #f5f5f5; } .nav .nav-header { display: block; @@ -2571,7 +2571,7 @@ input[type="submit"].btn.btn-mini { border-radius: 4px 4px 0 0; } .nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #dddddd; + border-color: #f5f5f5 #f5f5f5 #dddddd; } .nav-tabs > .active > a, .nav-tabs > .active > a:hover { @@ -2748,7 +2748,7 @@ input[type="submit"].btn.btn-mini { border-radius: 4px 0 0 4px; } .tabs-left .nav-tabs > li > a:hover { - border-color: #eeeeee #dddddd #eeeeee #eeeeee; + border-color: #f5f5f5 #dddddd #f5f5f5 #f5f5f5; } .tabs-left .nav-tabs .active > a, .tabs-left .nav-tabs .active > a:hover { @@ -2767,7 +2767,7 @@ input[type="submit"].btn.btn-mini { border-radius: 0 4px 4px 0; } .tabs-right .nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #eeeeee #dddddd; + border-color: #f5f5f5 #f5f5f5 #f5f5f5 #dddddd; } .tabs-right .nav-tabs .active > a, .tabs-right .nav-tabs .active > a:hover { @@ -2854,7 +2854,7 @@ input[type="submit"].btn.btn-mini { height: auto; } .navbar { - color: #eeeeee; + color: #f5f5f5; } .navbar .brand:hover { text-decoration: none; @@ -3003,7 +3003,7 @@ input[type="submit"].btn.btn-mini { float: none; padding: 10px 10px 11px; line-height: 19px; - color: #eeeeee; + color: #f5f5f5; text-decoration: none; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } @@ -3956,7 +3956,7 @@ a.thumbnail:hover { .hero-unit { padding: 60px; margin-bottom: 30px; - background-color: #eeeeee; + background-color: #f5f5f5; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; diff --git a/cerulean/bootstrap.min.css b/cerulean/bootstrap.min.css index ff2f8ba6..affc5e6a 100644 --- a/cerulean/bootstrap.min.css +++ b/cerulean/bootstrap.min.css @@ -81,7 +81,7 @@ h4,h5,h6{line-height:18px;} h4{font-size:14px;}h4 small{font-size:12px;} h5{font-size:12px;} h6{font-size:11px;color:#999999;text-transform:uppercase;} -.page-header{padding-bottom:17px;margin:18px 0;border-bottom:1px solid #eeeeee;} +.page-header{padding-bottom:17px;margin:18px 0;border-bottom:1px solid #f5f5f5;} .page-header h1{line-height:1;} ul,ol{padding:0;margin:0 0 9px 25px;} ul ul,ul ol,ol ol,ol ul{margin-bottom:0;} @@ -95,15 +95,15 @@ dt{font-weight:bold;line-height:17px;} dd{margin-left:9px;} .dl-horizontal dt{float:left;clear:left;width:120px;text-align:right;} .dl-horizontal dd{margin-left:130px;} -hr{margin:18px 0;border:0;border-top:1px solid #eeeeee;border-bottom:1px solid #ffffff;} +hr{margin:18px 0;border:0;border-top:1px solid #f5f5f5;border-bottom:1px solid #ffffff;} strong{font-weight:bold;} em{font-style:italic;} .muted{color:#999999;} abbr[title]{border-bottom:1px dotted #ddd;cursor:help;} abbr.initialism{font-size:90%;text-transform:uppercase;} -blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;} +blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #f5f5f5;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;} blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:before{content:'\2014 \00A0';} -blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eeeeee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} +blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #f5f5f5;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} q:before,q:after,blockquote:before,blockquote:after{content:"";} address{display:block;margin-bottom:18px;line-height:18px;font-style:normal;} small{font-size:100%;} @@ -161,7 +161,7 @@ input.span4, textarea.span4, .uneditable-input.span4{width:290px;} input.span3, textarea.span3, .uneditable-input.span3{width:210px;} input.span2, textarea.span2, .uneditable-input.span2{width:130px;} input.span1, textarea.span1, .uneditable-input.span1{width:50px;} -input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#eeeeee;border-color:#ddd;cursor:not-allowed;} +input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;} .control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#1c628b;} .control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#1c628b;border-color:#1c628b;}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#134461;-webkit-box-shadow:0 0 6px #369bd7;-moz-box-shadow:0 0 6px #369bd7;box-shadow:0 0 6px #369bd7;} .control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#1c628b;background-color:#8bc5e8;border-color:#1c628b;} @@ -172,7 +172,7 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado .control-group.success input,.control-group.success select,.control-group.success textarea{color:#669533;border-color:#669533;}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#4c6f26;-webkit-box-shadow:0 0 6px #99ca63;-moz-box-shadow:0 0 6px #99ca63;box-shadow: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;} input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;} -.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#eeeeee;border-top:1px solid #ddd;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";} +.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";} .form-actions:after{clear:both;} .uneditable-input{display:block;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;} :-moz-placeholder{color:#999999;} @@ -182,7 +182,7 @@ input:focus:required:invalid,textarea:focus:required:invalid,select:focus:requir .help-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;padding-left:5px;} .input-prepend,.input-append{margin-bottom:5px;}.input-prepend input,.input-append input,.input-prepend select,.input-append select,.input-prepend .uneditable-input,.input-append .uneditable-input{*margin-left:0;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}.input-prepend input:focus,.input-append input:focus,.input-prepend select:focus,.input-append select:focus,.input-prepend .uneditable-input:focus,.input-append .uneditable-input:focus{position:relative;z-index:2;} .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:18px;padding:4px 5px;font-weight:normal;line-height:18px;text-align:center;text-shadow:0 1px 0 #ffffff;vertical-align:middle;background-color:#eeeeee;border:1px solid #ccc;} +.input-prepend .add-on,.input-append .add-on{display:inline-block;width:auto;min-width:16px;height:18px;padding:4px 5px;font-weight:normal;line-height:18px;text-align:center;text-shadow:0 1px 0 #ffffff;vertical-align:middle;background-color:#f5f5f5;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:#bede9c;border-color:#73a839;} .input-prepend .add-on,.input-prepend .btn{margin-right:-1px;} @@ -455,7 +455,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .alert-block p+p{margin-top:5px;} .nav{margin-left:0;margin-bottom:18px;list-style:none;} .nav>li>a{display:block;} -.nav>li>a:hover{text-decoration:none;background-color:#eeeeee;} +.nav>li>a:hover{text-decoration:none;background-color:#f5f5f5;} .nav .nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:18px;color:#999999;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);text-transform:uppercase;} .nav li+.nav-header{margin-top:9px;} .nav-list{padding-left:15px;padding-right:15px;margin-bottom:0;} @@ -470,7 +470,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;} .nav-tabs{border-bottom:1px solid #ddd;} .nav-tabs>li{margin-bottom:-1px;} -.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:18px;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:#eeeeee #eeeeee #dddddd;} +.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:18px;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:#f5f5f5 #f5f5f5 #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:#369bd7;} @@ -506,11 +506,11 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .tabs-left .nav-tabs>li>a,.tabs-right .nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px;} .tabs-left .nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd;} .tabs-left .nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;} -.tabs-left .nav-tabs>li>a:hover{border-color:#eeeeee #dddddd #eeeeee #eeeeee;} +.tabs-left .nav-tabs>li>a:hover{border-color:#f5f5f5 #dddddd #f5f5f5 #f5f5f5;} .tabs-left .nav-tabs .active>a,.tabs-left .nav-tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;*border-right-color:#ffffff;} .tabs-right .nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd;} .tabs-right .nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;} -.tabs-right .nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #eeeeee #dddddd;} +.tabs-right .nav-tabs>li>a:hover{border-color:#f5f5f5 #f5f5f5 #f5f5f5 #dddddd;} .tabs-right .nav-tabs .active>a,.tabs-right .nav-tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#ffffff;} .navbar{*position:relative;*z-index:2;overflow:visible;margin-bottom:18px;} .navbar-inner{padding-left:20px;padding-right:20px;background-color:#50a8dc;background-image:-moz-linear-gradient(top, #61b0df, #369bd7);background-image:-ms-linear-gradient(top, #61b0df, #369bd7);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#61b0df), to(#369bd7));background-image:-webkit-linear-gradient(top, #61b0df, #369bd7);background-image:-o-linear-gradient(top, #61b0df, #369bd7);background-image:linear-gradient(top, #61b0df, #369bd7);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#61b0df', endColorstr='#369bd7', GradientType=0);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} @@ -520,7 +520,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);} .btn-navbar .icon-bar+.icon-bar{margin-top:3px;} .nav-collapse.collapse{height:auto;} -.navbar{color:#eeeeee;}.navbar .brand:hover{text-decoration:none;} +.navbar{color:#f5f5f5;}.navbar .brand:hover{text-decoration:none;} .navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;} .navbar .navbar-text{margin-bottom:0;line-height:40px;} .navbar .btn,.navbar .btn-group{margin-top:5px;} @@ -542,7 +542,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;} .navbar .nav.pull-right{float:right;} .navbar .nav>li{display:block;float:left;} -.navbar .nav>li>a{float:none;padding:10px 10px 11px;line-height:19px;color:#eeeeee;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} +.navbar .nav>li>a{float:none;padding:10px 10px 11px;line-height:19px;color:#f5f5f5;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} .navbar .nav>li>a:hover{background-color:transparent;color:#ffffff;text-decoration:none;} .navbar .nav .active>a,.navbar .nav .active>a:hover{color:#ffffff;text-decoration:none;background-color:#369bd7;} .navbar .divider-vertical{height:40px;width:1px;margin:0 9px;overflow:hidden;background-color:#369bd7;border-right:1px solid #61b0df;} @@ -681,7 +681,7 @@ a.thumbnail:hover{border-color:#369bd7;-webkit-box-shadow:0 1px 4px rgba(0, 105, .carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);} .carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);} .carousel-caption h4,.carousel-caption p{color:#ffffff;} -.hero-unit{padding:60px;margin-bottom:30px;background-color:#eeeeee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;} +.hero-unit{padding:60px;margin-bottom:30px;background-color:#f5f5f5;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;} .hero-unit p{font-size:18px;font-weight:200;line-height:27px;color:inherit;} .pull-right{float:right;} .pull-left{float:left;} diff --git a/cerulean/variables.less b/cerulean/variables.less index 0506df12..19ba6554 100755 --- a/cerulean/variables.less +++ b/cerulean/variables.less @@ -17,7 +17,7 @@ @grayDark: #333; @gray: #555; @grayLight: #999; -@grayLighter: #eee; +@grayLighter: #F5F5F5; @white: #fff; diff --git a/cyborg/bootstrap.css b/cyborg/bootstrap.css index 81d9dae5..b15779a6 100644 --- a/cyborg/bootstrap.css +++ b/cyborg/bootstrap.css @@ -3956,7 +3956,7 @@ a.thumbnail:hover { .hero-unit { padding: 60px; margin-bottom: 30px; - background-color: rgba(40, 40, 40, 0.5); + background-color: #131517; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -4506,8 +4506,8 @@ pre, pre.prettyprint { background-color: #eeeeee; } -.well { - background-color: rgba(40, 40, 40, 0.5); +.well, +.hero-unit { background-color: #131517; border-top: solid 1px rgba(256, 256, 256, 0.1); -webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.8); diff --git a/cyborg/bootstrap.min.css b/cyborg/bootstrap.min.css index dc44443a..4dc31590 100644 --- a/cyborg/bootstrap.min.css +++ b/cyborg/bootstrap.min.css @@ -681,7 +681,7 @@ a.thumbnail:hover{border-color:#33b5e5;-webkit-box-shadow:0 1px 4px rgba(0, 105, .carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);} .carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#282828;background:rgba(0, 0, 0, 0.75);} .carousel-caption h4,.carousel-caption p{color:#ffffff;} -.hero-unit{padding:60px;margin-bottom:30px;background-color:rgba(40, 40, 40, 0.5);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;} +.hero-unit{padding:60px;margin-bottom:30px;background-color:#131517;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;} .hero-unit p{font-size:18px;font-weight:200;line-height:27px;color:inherit;} .pull-right{float:right;} .pull-left{float:left;} @@ -757,7 +757,7 @@ input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus, .form-actions,footer.footer{border-top:1px solid #222;} .table,.well,.prettyprint,input,textarea,select{-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;} code,pre,pre.prettyprint{background-color:#eeeeee;} -.well{background-color:rgba(40, 40, 40, 0.5);background-color:#131517;border-top:solid 1px rgba(256, 256, 256, 0.1);-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);} +.well,.hero-unit{background-color:#131517;border-top:solid 1px rgba(256, 256, 256, 0.1);-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);box-shadow:0 2px 4px rgba(0, 0, 0, 0.8);} .progress{background-color:#060606;background-image:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} .label{color:#eeeeee;} .label,.alert{background-color:#666666;} diff --git a/cyborg/bootswatch.less b/cyborg/bootswatch.less index c96101ef..8a986400 100755 --- a/cyborg/bootswatch.less +++ b/cyborg/bootswatch.less @@ -394,8 +394,7 @@ code, pre, pre.prettyprint { background-color: @grayLighter; } -.well { - background-color: rgba(40, 40, 40, 0.5); +.well, .hero-unit { background-color: #131517; border-top: solid 1px rgba(256,256,256,.1); .box-shadow(0 2px 4px rgba(0,0,0,.8)); diff --git a/cyborg/variables.less b/cyborg/variables.less index 9cd92aef..15d28f2d 100755 --- a/cyborg/variables.less +++ b/cyborg/variables.less @@ -160,7 +160,7 @@ // Hero unit // ------------------------- -@heroUnitBackground: rgba(40, 40, 40, 0.5); +@heroUnitBackground: #131517; @heroUnitHeadingColor: inherit; @heroUnitLeadColor: inherit; diff --git a/journal/bootstrap.css b/journal/bootstrap.css index 45bb9dfd..45c8192d 100644 --- a/journal/bootstrap.css +++ b/journal/bootstrap.css @@ -3989,15 +3989,6 @@ a.thumbnail:hover { .invisible { visibility: hidden; } -a { - text-decoration: underline; -} -.nav a, -.navbar .brand, -.subnav a, -a.btn { - text-decoration: none; -} h1, h2, h3, @@ -4020,6 +4011,15 @@ h6, .brand { font-weight: 700; } +a { + text-decoration: underline; +} +.nav a, +.navbar .brand, +.subnav a, +a.btn { + text-decoration: none; +} .navbar .brand { color: #222222; text-shadow: none; @@ -4129,6 +4129,15 @@ pre.prettyprint, .form-actions { background-color: #eeeeee; } +.hero-unit { + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + border: 1px solid rgba(0, 0, 0, 0.05); + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; +} .table-bordered, .well, .prettyprint { diff --git a/journal/bootstrap.min.css b/journal/bootstrap.min.css index a459d089..d2d8c0d6 100644 --- a/journal/bootstrap.min.css +++ b/journal/bootstrap.min.css @@ -688,10 +688,10 @@ a.thumbnail:hover{border-color:#222222;-webkit-box-shadow:0 1px 4px rgba(0, 105, .hide{display:none;} .show{display:block;} .invisible{visibility:hidden;} -a{text-decoration:underline;} -.nav a,.navbar .brand,.subnav a,a.btn{text-decoration:none;} h1,h2,h3,h4,h5,h6,.brand,.navbar,.subnav a,blockquote>p{font-family:'Open Sans',sans-serif;color:#222222;} h1,h2,h3,h4,h5,h6,.brand{font-weight:700;} +a{text-decoration:underline;} +.nav a,.navbar .brand,.subnav a,a.btn{text-decoration:none;} .navbar .brand{color:#222222;text-shadow:none;font-weight:bold;}.navbar .brand:hover{background-color:#EEEEEE;} .navbar-inner{border-top:1px solid #E5E5E5;-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 2px 4px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} .navbar-inner,.navbar .dropdown-menu,div.subnav,div.subnav .nav>li:first-child>a,div.subnav .nav>li:first-child>a:hover{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} @@ -708,4 +708,5 @@ div.subnav{background-color:#fcfbfd;background-image:none;-webkit-box-shadow:0 1 .btn-primary{background-color:#2a2a2a;background-image:-moz-linear-gradient(top, #2f2f2f, #222222);background-image:-ms-linear-gradient(top, #2f2f2f, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#2f2f2f), to(#222222));background-image:-webkit-linear-gradient(top, #2f2f2f, #222222);background-image:-o-linear-gradient(top, #2f2f2f, #222222);background-image:linear-gradient(top, #2f2f2f, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#2f2f2f', endColorstr='#222222', GradientType=0);border-color:#222222 #222222 #000000;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-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#222222;} .btn-primary:active,.btn-primary.active{background-color:#080808 \9;} code,pre,pre.prettyprint,.well,.form-actions{background-color:#eeeeee;} +.hero-unit{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} .table-bordered,.well,.prettyprint{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} diff --git a/journal/bootswatch.less b/journal/bootswatch.less index fa6f25de..7fe5983f 100755 --- a/journal/bootswatch.less +++ b/journal/bootswatch.less @@ -121,6 +121,12 @@ code, pre, pre.prettyprint, .well, .form-actions { background-color: @grayLighter; } +.hero-unit { + .box-shadow(inset 0 1px 1px rgba(0,0,0,.05)); + border: 1px solid rgba(0,0,0,.05); + .border-radius(0); +} + .table-bordered, .well, .prettyprint { .border-radius(0); } diff --git a/readable/bootstrap.css b/readable/bootstrap.css index 6693a040..8db39bc1 100644 --- a/readable/bootstrap.css +++ b/readable/bootstrap.css @@ -4355,7 +4355,8 @@ input[type="file"] { .label-info:hover { background-color: #d9edf7; } -.well { +.well, +.hero-unit { -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; diff --git a/readable/bootstrap.min.css b/readable/bootstrap.min.css index 475f249f..66875c16 100644 --- a/readable/bootstrap.min.css +++ b/readable/bootstrap.min.css @@ -749,7 +749,7 @@ select,input[type="file"]{height:auto;line-height:normal;} .label-warning,.label-warning:hover{background-color:#fcf8e3;} .label-success,.label-success:hover{background-color:#dff0d8;} .label-info,.label-info:hover{background-color:#d9edf7;} -.well{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border:1px solid #D4D4D4;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;background-color:#ffffff;} +.well,.hero-unit{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border:1px solid #D4D4D4;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;background-color:#ffffff;} blockquote{border-left:6px solid #cdcdcd;}blockquote.pull-right{border-right:6px solid #cdcdcd;} blockquote p{font-size:1em;line-height:1.2em;} .thumbnail{background-color:#ffffff;} diff --git a/readable/bootswatch.less b/readable/bootswatch.less index 01388c9e..56a734a2 100755 --- a/readable/bootswatch.less +++ b/readable/bootswatch.less @@ -390,7 +390,7 @@ select, input[type="file"] { .label-info, .label-info:hover { background-color: @infoBackground; } -.well { +.well, .hero-unit { .box-shadow(none); border: 1px solid #D4D4D4; .border-radius(0); diff --git a/simplex/bootstrap.css b/simplex/bootstrap.css index ffb04f99..f109aad7 100644 --- a/simplex/bootstrap.css +++ b/simplex/bootstrap.css @@ -4189,3 +4189,9 @@ h6 { i[class^="icon-"] { opacity: 0.6; } +.hero-unit { + border: 1px solid rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); +} diff --git a/simplex/bootstrap.min.css b/simplex/bootstrap.min.css index 49130e0d..640c5543 100644 --- a/simplex/bootstrap.min.css +++ b/simplex/bootstrap.min.css @@ -708,3 +708,4 @@ h6{color:#000000;} .btn-inverse{background-color:#a54ca9;background-image:-moz-linear-gradient(top, #ac4fb0, #9b479f);background-image:-ms-linear-gradient(top, #ac4fb0, #9b479f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ac4fb0), to(#9b479f));background-image:-webkit-linear-gradient(top, #ac4fb0, #9b479f);background-image:-o-linear-gradient(top, #ac4fb0, #9b479f);background-image:linear-gradient(top, #ac4fb0, #9b479f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ac4fb0', endColorstr='#9b479f', GradientType=0);border-color:#9b479f #9b479f #672f6a;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:#9b479f;} .btn-inverse:active,.btn-inverse.active{background-color:#79377c \9;} i[class^="icon-"]{opacity:0.6;} +.hero-unit{border:1px solid rgba(0, 0, 0, 0.05);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);} diff --git a/simplex/bootswatch.less b/simplex/bootswatch.less index 8a07703e..866835ed 100755 --- a/simplex/bootswatch.less +++ b/simplex/bootswatch.less @@ -85,7 +85,11 @@ h6 { // MISCELLANEOUS // ----------------------------------------------------- -// Make icons gray i[class^="icon-"]{ opacity: 0.6; } + +.hero-unit { + border: 1px solid rgba(0,0,0,.05); + .box-shadow(inset 0 1px 1px rgba(0,0,0,.05)); +}
\ No newline at end of file diff --git a/slate/bootstrap.css b/slate/bootstrap.css index 03bb3d81..6f1fbb67 100644 --- a/slate/bootstrap.css +++ b/slate/bootstrap.css @@ -4570,7 +4570,8 @@ footer.footer p { color: #757c82; } .well, -.progress { +.progress, +.hero-unit { background-color: #202328; -webkit-box-shadow: inset 1px 1px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: inset 1px 1px 1px rgba(0, 0, 0, 0.5); diff --git a/slate/bootstrap.min.css b/slate/bootstrap.min.css index 25b2e723..efbe1467 100644 --- a/slate/bootstrap.min.css +++ b/slate/bootstrap.min.css @@ -760,6 +760,6 @@ label,input,button,select,textarea,legend{color:#757c82;} code,pre{background-color:#F7F7F7;border:1px solid #1c1e22;text-shadow:none;} hr,legend,.page-header,.dropdown-menu .divider{border-top:none;border-bottom:1px solid #1c1e22;background-color:transparent;} footer.footer{border-top:1px solid #1c1e22;}footer.footer p{color:#757c82;} -.well,.progress{background-color:#202328;-webkit-box-shadow:inset 1px 1px 1px rgba(0, 0, 0, 0.5);-moz-box-shadow:inset 1px 1px 1px rgba(0, 0, 0, 0.5);box-shadow:inset 1px 1px 1px rgba(0, 0, 0, 0.5);} +.well,.progress,.hero-unit{background-color:#202328;-webkit-box-shadow:inset 1px 1px 1px rgba(0, 0, 0, 0.5);-moz-box-shadow:inset 1px 1px 1px rgba(0, 0, 0, 0.5);box-shadow:inset 1px 1px 1px rgba(0, 0, 0, 0.5);} .progress{background-color:#202328;background-image:-moz-linear-gradient(top, #202328, #202328);background-image:-ms-linear-gradient(top, #202328, #202328);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#202328), to(#202328));background-image:-webkit-linear-gradient(top, #202328, #202328);background-image:-o-linear-gradient(top, #202328, #202328);background-image:linear-gradient(top, #202328, #202328);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#202328', endColorstr='#202328', GradientType=0);} .thumbnail,a.thumbnail:hover{border:1px solid #1c1e22;} diff --git a/slate/bootswatch.less b/slate/bootswatch.less index 4663b336..cfa8f5bf 100755 --- a/slate/bootswatch.less +++ b/slate/bootswatch.less @@ -416,7 +416,7 @@ footer.footer { } } -.well, .progress { +.well, .progress, .hero-unit { background-color: darken(@grayDarker, 3%); .box-shadow(inset 1px 1px 1px rgba(0, 0, 0, 0.5); } diff --git a/spacelab/bootstrap.css b/spacelab/bootstrap.css index 4c93bc68..d2f17046 100644 --- a/spacelab/bootstrap.css +++ b/spacelab/bootstrap.css @@ -400,7 +400,7 @@ h6 { .page-header { padding-bottom: 17px; margin: 18px 0; - border-bottom: 1px solid #eeeeee; + border-bottom: 1px solid #f5f5f5; } .page-header h1 { line-height: 1; @@ -456,7 +456,7 @@ dd { hr { margin: 18px 0; border: 0; - border-top: 1px solid #eeeeee; + border-top: 1px solid #f5f5f5; border-bottom: 1px solid #ffffff; } strong { @@ -479,7 +479,7 @@ abbr.initialism { blockquote { padding: 0 0 0 15px; margin: 0 0 18px; - border-left: 5px solid #eeeeee; + border-left: 5px solid #f5f5f5; } blockquote p { margin-bottom: 0; @@ -500,7 +500,7 @@ blockquote.pull-right { padding-left: 0; padding-right: 15px; border-left: 0; - border-right: 5px solid #eeeeee; + border-right: 5px solid #f5f5f5; } blockquote.pull-right p, blockquote.pull-right small { @@ -839,7 +839,7 @@ textarea[disabled], input[readonly], select[readonly], textarea[readonly] { - background-color: #eeeeee; + background-color: #f5f5f5; border-color: #ddd; cursor: not-allowed; } @@ -936,7 +936,7 @@ select:focus:required:invalid:focus { padding: 17px 20px 18px; margin-top: 18px; margin-bottom: 18px; - background-color: #eeeeee; + background-color: #f5f5f5; border-top: 1px solid #ddd; *zoom: 1; } @@ -1020,7 +1020,7 @@ select:focus:required:invalid:focus { text-align: center; text-shadow: 0 1px 0 #ffffff; vertical-align: middle; - background-color: #eeeeee; + background-color: #f5f5f5; border: 1px solid #ccc; } .input-prepend .add-on, @@ -2481,7 +2481,7 @@ input[type="submit"].btn.btn-mini { } .nav > li > a:hover { text-decoration: none; - background-color: #eeeeee; + background-color: #f5f5f5; } .nav .nav-header { display: block; @@ -2570,7 +2570,7 @@ input[type="submit"].btn.btn-mini { border-radius: 4px 4px 0 0; } .nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #dddddd; + border-color: #f5f5f5 #f5f5f5 #dddddd; } .nav-tabs > .active > a, .nav-tabs > .active > a:hover { @@ -2747,7 +2747,7 @@ input[type="submit"].btn.btn-mini { border-radius: 4px 0 0 4px; } .tabs-left .nav-tabs > li > a:hover { - border-color: #eeeeee #dddddd #eeeeee #eeeeee; + border-color: #f5f5f5 #dddddd #f5f5f5 #f5f5f5; } .tabs-left .nav-tabs .active > a, .tabs-left .nav-tabs .active > a:hover { @@ -2766,7 +2766,7 @@ input[type="submit"].btn.btn-mini { border-radius: 0 4px 4px 0; } .tabs-right .nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #eeeeee #dddddd; + border-color: #f5f5f5 #f5f5f5 #f5f5f5 #dddddd; } .tabs-right .nav-tabs .active > a, .tabs-right .nav-tabs .active > a:hover { @@ -3955,7 +3955,7 @@ a.thumbnail:hover { .hero-unit { padding: 60px; margin-bottom: 30px; - background-color: #eeeeee; + background-color: #f5f5f5; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -4349,3 +4349,9 @@ div.subnav .nav > li > .dropdown-toggle { .label-info { background-color: #4183C4; } +.hero-unit { + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + border: 1px solid rgba(0, 0, 0, 0.05); +} diff --git a/spacelab/bootstrap.min.css b/spacelab/bootstrap.min.css index cb50c012..fa7792ae 100644 --- a/spacelab/bootstrap.min.css +++ b/spacelab/bootstrap.min.css @@ -80,7 +80,7 @@ h4,h5,h6{line-height:18px;} h4{font-size:14px;}h4 small{font-size:12px;} h5{font-size:12px;} h6{font-size:11px;color:#999999;text-transform:uppercase;} -.page-header{padding-bottom:17px;margin:18px 0;border-bottom:1px solid #eeeeee;} +.page-header{padding-bottom:17px;margin:18px 0;border-bottom:1px solid #f5f5f5;} .page-header h1{line-height:1;} ul,ol{padding:0;margin:0 0 9px 25px;} ul ul,ul ol,ol ol,ol ul{margin-bottom:0;} @@ -94,15 +94,15 @@ dt{font-weight:bold;line-height:17px;} dd{margin-left:9px;} .dl-horizontal dt{float:left;clear:left;width:120px;text-align:right;} .dl-horizontal dd{margin-left:130px;} -hr{margin:18px 0;border:0;border-top:1px solid #eeeeee;border-bottom:1px solid #ffffff;} +hr{margin:18px 0;border:0;border-top:1px solid #f5f5f5;border-bottom:1px solid #ffffff;} strong{font-weight:bold;} em{font-style:italic;} .muted{color:#999999;} abbr[title]{border-bottom:1px dotted #ddd;cursor:help;} abbr.initialism{font-size:90%;text-transform:uppercase;} -blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;} +blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #f5f5f5;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;} blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:before{content:'\2014 \00A0';} -blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eeeeee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} +blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #f5f5f5;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} q:before,q:after,blockquote:before,blockquote:after{content:"";} address{display:block;margin-bottom:18px;line-height:18px;font-style:normal;} small{font-size:100%;} @@ -160,7 +160,7 @@ input.span4, textarea.span4, .uneditable-input.span4{width:290px;} input.span3, textarea.span3, .uneditable-input.span3{width:210px;} input.span2, textarea.span2, .uneditable-input.span2{width:130px;} input.span1, textarea.span1, .uneditable-input.span1{width:50px;} -input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#eeeeee;border-color:#ddd;cursor:not-allowed;} +input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;} .control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#393939;} .control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#393939;border-color:#393939;}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#202020;-webkit-box-shadow:0 0 6px #6c6c6c;-moz-box-shadow:0 0 6px #6c6c6c;box-shadow:0 0 6px #6c6c6c;} .control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#393939;background-color:#f5f3b4;border-color:#393939;} @@ -171,7 +171,7 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado .control-group.success input,.control-group.success select,.control-group.success textarea{color:#333333;border-color:#333333;}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#1a1a1a;-webkit-box-shadow:0 0 6px #666666;-moz-box-shadow:0 0 6px #666666;box-shadow:0 0 6px #666666;} .control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#333333;background-color:#bedebe;border-color:#333333;} input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;} -.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#eeeeee;border-top:1px solid #ddd;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";} +.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";} .form-actions:after{clear:both;} .uneditable-input{display:block;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;} :-moz-placeholder{color:#999999;} @@ -181,7 +181,7 @@ input:focus:required:invalid,textarea:focus:required:invalid,select:focus:requir .help-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;padding-left:5px;} .input-prepend,.input-append{margin-bottom:5px;}.input-prepend input,.input-append input,.input-prepend select,.input-append select,.input-prepend .uneditable-input,.input-append .uneditable-input{*margin-left:0;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}.input-prepend input:focus,.input-append input:focus,.input-prepend select:focus,.input-append select:focus,.input-prepend .uneditable-input:focus,.input-append .uneditable-input:focus{position:relative;z-index:2;} .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:18px;padding:4px 5px;font-weight:normal;line-height:18px;text-align:center;text-shadow:0 1px 0 #ffffff;vertical-align:middle;background-color:#eeeeee;border:1px solid #ccc;} +.input-prepend .add-on,.input-append .add-on{display:inline-block;width:auto;min-width:16px;height:18px;padding:4px 5px;font-weight:normal;line-height:18px;text-align:center;text-shadow:0 1px 0 #ffffff;vertical-align:middle;background-color:#f5f5f5;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:#fafefa;border-color:#84de81;} .input-prepend .add-on,.input-prepend .btn{margin-right:-1px;} @@ -454,7 +454,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .alert-block p+p{margin-top:5px;} .nav{margin-left:0;margin-bottom:18px;list-style:none;} .nav>li>a{display:block;} -.nav>li>a:hover{text-decoration:none;background-color:#eeeeee;} +.nav>li>a:hover{text-decoration:none;background-color:#f5f5f5;} .nav .nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:18px;color:#999999;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);text-transform:uppercase;} .nav li+.nav-header{margin-top:9px;} .nav-list{padding-left:15px;padding-right:15px;margin-bottom:0;} @@ -469,7 +469,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;} .nav-tabs{border-bottom:1px solid #ddd;} .nav-tabs>li{margin-bottom:-1px;} -.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:18px;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:#eeeeee #eeeeee #dddddd;} +.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:18px;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:#f5f5f5 #f5f5f5 #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:#4183c4;} @@ -505,11 +505,11 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .tabs-left .nav-tabs>li>a,.tabs-right .nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px;} .tabs-left .nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd;} .tabs-left .nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;} -.tabs-left .nav-tabs>li>a:hover{border-color:#eeeeee #dddddd #eeeeee #eeeeee;} +.tabs-left .nav-tabs>li>a:hover{border-color:#f5f5f5 #dddddd #f5f5f5 #f5f5f5;} .tabs-left .nav-tabs .active>a,.tabs-left .nav-tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;*border-right-color:#ffffff;} .tabs-right .nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd;} .tabs-right .nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;} -.tabs-right .nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #eeeeee #dddddd;} +.tabs-right .nav-tabs>li>a:hover{border-color:#f5f5f5 #f5f5f5 #f5f5f5 #dddddd;} .tabs-right .nav-tabs .active>a,.tabs-right .nav-tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#ffffff;} .navbar{*position:relative;*z-index:2;overflow:visible;margin-bottom:18px;} .navbar-inner{padding-left:20px;padding-right:20px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #ffffff, #eaeaea);background-image:-ms-linear-gradient(top, #ffffff, #eaeaea);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#eaeaea));background-image:-webkit-linear-gradient(top, #ffffff, #eaeaea);background-image:-o-linear-gradient(top, #ffffff, #eaeaea);background-image:linear-gradient(top, #ffffff, #eaeaea);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#eaeaea', GradientType=0);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} @@ -680,7 +680,7 @@ a.thumbnail:hover{border-color:#4183c4;-webkit-box-shadow:0 1px 4px rgba(0, 105, .carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);} .carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);} .carousel-caption h4,.carousel-caption p{color:#ffffff;} -.hero-unit{padding:60px;margin-bottom:30px;background-color:#eeeeee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;} +.hero-unit{padding:60px;margin-bottom:30px;background-color:#f5f5f5;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;} .hero-unit p{font-size:18px;font-weight:200;line-height:27px;color:inherit;} .pull-right{float:right;} .pull-left{float:left;} @@ -729,3 +729,4 @@ div.subnav .nav>li>.dropdown-toggle{background-color:transparent;color:#4183c4;} .label-warning{background-color:#E3E84D;} .label-success{background-color:#6CC644;} .label-info{background-color:#4183C4;} +.hero-unit{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);border:1px solid rgba(0, 0, 0, 0.05);} diff --git a/spacelab/bootswatch.less b/spacelab/bootswatch.less index 5741ebf7..c4fbbe78 100755 --- a/spacelab/bootswatch.less +++ b/spacelab/bootswatch.less @@ -161,10 +161,15 @@ div.subnav .nav > li > .dropdown-toggle { } -// LABELS +// MISC // ----------------------------------------------------- .label-important { background-color: #BD2C00; } .label-warning { background-color: #E3E84D; } .label-success { background-color: #6CC644; } .label-info { background-color: #4183C4; } + +.hero-unit { + .box-shadow(inset 0 1px 1px rgba(0,0,0,.05)); + border: 1px solid rgba(0,0,0,.05); +}
\ No newline at end of file diff --git a/spacelab/variables.less b/spacelab/variables.less index 13e9e908..9468ec81 100755 --- a/spacelab/variables.less +++ b/spacelab/variables.less @@ -17,7 +17,7 @@ @grayDark: #333; @gray: #555; @grayLight: #999; -@grayLighter: #eee; +@grayLighter: #F5F5F5; @white: #fff; diff --git a/spruce/bootstrap.css b/spruce/bootstrap.css index 3709382f..917fcb9f 100644 --- a/spruce/bootstrap.css +++ b/spruce/bootstrap.css @@ -3956,7 +3956,7 @@ a.thumbnail:hover { .hero-unit { padding: 60px; margin-bottom: 30px; - background-color: #eeeeee; + background-color: #748c73; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; diff --git a/spruce/bootstrap.min.css b/spruce/bootstrap.min.css index 7d1ac4cf..50ed9d0f 100644 --- a/spruce/bootstrap.min.css +++ b/spruce/bootstrap.min.css @@ -681,7 +681,7 @@ a.thumbnail:hover{border-color:#f5f3dc;-webkit-box-shadow:0 1px 4px rgba(0, 105, .carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);} .carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);} .carousel-caption h4,.carousel-caption p{color:#ffffff;} -.hero-unit{padding:60px;margin-bottom:30px;background-color:#eeeeee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;} +.hero-unit{padding:60px;margin-bottom:30px;background-color:#748c73;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;} .hero-unit p{font-size:18px;font-weight:200;line-height:31.5px;color:inherit;} .pull-right{float:right;} .pull-left{float:left;} diff --git a/spruce/variables.less b/spruce/variables.less index c15fb972..8da70a26 100755 --- a/spruce/variables.less +++ b/spruce/variables.less @@ -160,7 +160,7 @@ // Hero unit // ------------------------- -@heroUnitBackground: @grayLighter; +@heroUnitBackground: darken(#90A38F, 10%); @heroUnitHeadingColor: inherit; @heroUnitLeadColor: inherit; diff --git a/superhero/bootstrap.css b/superhero/bootstrap.css index 1667629f..00bf5087 100644 --- a/superhero/bootstrap.css +++ b/superhero/bootstrap.css @@ -3958,7 +3958,7 @@ a.thumbnail:hover { .hero-unit { padding: 60px; margin-bottom: 30px; - background-color: #eeeeee; + background-color: #45515f; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -4542,13 +4542,18 @@ label { footer.footer { border-top: 1px solid #20262d; } -.well { +.well, +.hero-unit { background-color: #45515f; border: none; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; } +.hero-unit h1 { + color: #e36b23; + line-height: 2em; +} .progress { background-color: #20262d; background-image: none; diff --git a/superhero/bootstrap.min.css b/superhero/bootstrap.min.css index cb052423..91ff2b0f 100644 --- a/superhero/bootstrap.min.css +++ b/superhero/bootstrap.min.css @@ -682,7 +682,7 @@ a.thumbnail:hover{border-color:#e36b23;-webkit-box-shadow:0 1px 4px rgba(0, 105, .carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);} .carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);} .carousel-caption h4,.carousel-caption p{color:#ffffff;} -.hero-unit{padding:60px;margin-bottom:30px;background-color:#eeeeee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;} +.hero-unit{padding:60px;margin-bottom:30px;background-color:#45515f;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;} .hero-unit p{font-size:18px;font-weight:200;line-height:30px;color:inherit;} .pull-right{float:right;} .pull-left{float:left;} @@ -778,7 +778,8 @@ label{color:#ece9d7;line-height:15px;} .control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#58a959;background-color:#dff0d8;border-color:#58a959;} .page-header{border-bottom:none;} footer.footer{border-top:1px solid #20262d;} -.well{background-color:#45515f;border:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +.well,.hero-unit{background-color:#45515f;border:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +.hero-unit h1{color:#e36b23;line-height:2em;} .progress{background-color:#20262d;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.progress .bar{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .thumbnail{border:none;background:#45515f;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .label{background-color:#45515f;color:#ece9d7;} diff --git a/superhero/bootswatch.less b/superhero/bootswatch.less index bd84c0c6..e6784f59 100755 --- a/superhero/bootswatch.less +++ b/superhero/bootswatch.less @@ -524,12 +524,17 @@ footer.footer { border-top: 1px solid darken(@blueDark, 5%); } -.well { +.well, .hero-unit { background-color: @blue; border: none; .box-shadow(none); } +.hero-unit h1 { + color: @orange; + line-height: 2em; +} + .progress { background-color: darken(@blueDark, 5%); background-image: none; diff --git a/superhero/variables.less b/superhero/variables.less index 7660f560..0a1901d0 100755 --- a/superhero/variables.less +++ b/superhero/variables.less @@ -160,7 +160,7 @@ // Hero unit // ------------------------- -@heroUnitBackground: @grayLighter; +@heroUnitBackground: @blue; @heroUnitHeadingColor: inherit; @heroUnitLeadColor: inherit; diff --git a/united/bootstrap.css b/united/bootstrap.css index 7d1a0f61..c00eb77c 100644 --- a/united/bootstrap.css +++ b/united/bootstrap.css @@ -401,7 +401,7 @@ h6 { .page-header { padding-bottom: 17px; margin: 18px 0; - border-bottom: 1px solid #eeeeee; + border-bottom: 1px solid #f5f5f5; } .page-header h1 { line-height: 1; @@ -457,7 +457,7 @@ dd { hr { margin: 18px 0; border: 0; - border-top: 1px solid #eeeeee; + border-top: 1px solid #f5f5f5; border-bottom: 1px solid #ffffff; } strong { @@ -480,7 +480,7 @@ abbr.initialism { blockquote { padding: 0 0 0 15px; margin: 0 0 18px; - border-left: 5px solid #eeeeee; + border-left: 5px solid #f5f5f5; } blockquote p { margin-bottom: 0; @@ -501,7 +501,7 @@ blockquote.pull-right { padding-left: 0; padding-right: 15px; border-left: 0; - border-right: 5px solid #eeeeee; + border-right: 5px solid #f5f5f5; } blockquote.pull-right p, blockquote.pull-right small { @@ -840,7 +840,7 @@ textarea[disabled], input[readonly], select[readonly], textarea[readonly] { - background-color: #eeeeee; + background-color: #f5f5f5; border-color: #ddd; cursor: not-allowed; } @@ -937,7 +937,7 @@ select:focus:required:invalid:focus { padding: 17px 20px 18px; margin-top: 18px; margin-bottom: 18px; - background-color: #eeeeee; + background-color: #f5f5f5; border-top: 1px solid #ddd; *zoom: 1; } @@ -1021,7 +1021,7 @@ select:focus:required:invalid:focus { text-align: center; text-shadow: 0 1px 0 #ffffff; vertical-align: middle; - background-color: #eeeeee; + background-color: #f5f5f5; border: 1px solid #ccc; } .input-prepend .add-on, @@ -2482,7 +2482,7 @@ input[type="submit"].btn.btn-mini { } .nav > li > a:hover { text-decoration: none; - background-color: #eeeeee; + background-color: #f5f5f5; } .nav .nav-header { display: block; @@ -2571,7 +2571,7 @@ input[type="submit"].btn.btn-mini { border-radius: 4px 4px 0 0; } .nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #dddddd; + border-color: #f5f5f5 #f5f5f5 #dddddd; } .nav-tabs > .active > a, .nav-tabs > .active > a:hover { @@ -2748,7 +2748,7 @@ input[type="submit"].btn.btn-mini { border-radius: 4px 0 0 4px; } .tabs-left .nav-tabs > li > a:hover { - border-color: #eeeeee #dddddd #eeeeee #eeeeee; + border-color: #f5f5f5 #dddddd #f5f5f5 #f5f5f5; } .tabs-left .nav-tabs .active > a, .tabs-left .nav-tabs .active > a:hover { @@ -2767,7 +2767,7 @@ input[type="submit"].btn.btn-mini { border-radius: 0 4px 4px 0; } .tabs-right .nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #eeeeee #dddddd; + border-color: #f5f5f5 #f5f5f5 #f5f5f5 #dddddd; } .tabs-right .nav-tabs .active > a, .tabs-right .nav-tabs .active > a:hover { @@ -3956,7 +3956,7 @@ a.thumbnail:hover { .hero-unit { padding: 60px; margin-bottom: 30px; - background-color: #bf4788; + background-color: #f5f5f5; -webkit-border-radius: 6px; -moz-border-radius: 6px; border-radius: 6px; @@ -4080,9 +4080,18 @@ a.thumbnail:hover { .btn-warning.active { background-color: #e7a413 \9; } +.form-actions { + background-color: transparent; +} .alert { text-shadow: none; } -.form-actions { - background-color: transparent; +.hero-unit { + border: 1px solid rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); +} +.hero-unit h1 { + line-height: 1.6em; } diff --git a/united/bootstrap.min.css b/united/bootstrap.min.css index c5f47b8b..3946c5c4 100644 --- a/united/bootstrap.min.css +++ b/united/bootstrap.min.css @@ -81,7 +81,7 @@ h4,h5,h6{line-height:18px;} h4{font-size:14px;}h4 small{font-size:12px;} h5{font-size:12px;} h6{font-size:11px;color:#999999;text-transform:uppercase;} -.page-header{padding-bottom:17px;margin:18px 0;border-bottom:1px solid #eeeeee;} +.page-header{padding-bottom:17px;margin:18px 0;border-bottom:1px solid #f5f5f5;} .page-header h1{line-height:1;} ul,ol{padding:0;margin:0 0 9px 25px;} ul ul,ul ol,ol ol,ol ul{margin-bottom:0;} @@ -95,15 +95,15 @@ dt{font-weight:bold;line-height:17px;} dd{margin-left:9px;} .dl-horizontal dt{float:left;clear:left;width:120px;text-align:right;} .dl-horizontal dd{margin-left:130px;} -hr{margin:18px 0;border:0;border-top:1px solid #eeeeee;border-bottom:1px solid #ffffff;} +hr{margin:18px 0;border:0;border-top:1px solid #f5f5f5;border-bottom:1px solid #ffffff;} strong{font-weight:bold;} em{font-style:italic;} .muted{color:#999999;} abbr[title]{border-bottom:1px dotted #ddd;cursor:help;} abbr.initialism{font-size:90%;text-transform:uppercase;} -blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;} +blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #f5f5f5;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;} blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:before{content:'\2014 \00A0';} -blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eeeeee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} +blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #f5f5f5;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} q:before,q:after,blockquote:before,blockquote:after{content:"";} address{display:block;margin-bottom:18px;line-height:18px;font-style:normal;} small{font-size:100%;} @@ -161,7 +161,7 @@ input.span4, textarea.span4, .uneditable-input.span4{width:290px;} input.span3, textarea.span3, .uneditable-input.span3{width:210px;} input.span2, textarea.span2, .uneditable-input.span2{width:130px;} input.span1, textarea.span1, .uneditable-input.span1{width:50px;} -input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#eeeeee;border-color:#ddd;cursor:not-allowed;} +input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;} .control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#eca918;} .control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#eca918;border-color:#eca918;}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#c18910;-webkit-box-shadow:0 0 6px #f4cc76;-moz-box-shadow:0 0 6px #f4cc76;box-shadow:0 0 6px #f4cc76;} .control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#eca918;background-color:#fcefd4;border-color:#eca918;} @@ -172,7 +172,7 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado .control-group.success input,.control-group.success select,.control-group.success textarea{color:#38b44a;border-color:#38b44a;}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#2c8d3a;-webkit-box-shadow:0 0 6px #7cd689;-moz-box-shadow:0 0 6px #7cd689;box-shadow:0 0 6px #7cd689;} .control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#38b44a;background-color:#caeecf;border-color:#38b44a;} input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;} -.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#eeeeee;border-top:1px solid #ddd;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";} +.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";} .form-actions:after{clear:both;} .uneditable-input{display:block;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;} :-moz-placeholder{color:#999999;} @@ -182,7 +182,7 @@ input:focus:required:invalid,textarea:focus:required:invalid,select:focus:requir .help-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;padding-left:5px;} .input-prepend,.input-append{margin-bottom:5px;}.input-prepend input,.input-append input,.input-prepend select,.input-append select,.input-prepend .uneditable-input,.input-append .uneditable-input{*margin-left:0;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}.input-prepend input:focus,.input-append input:focus,.input-prepend select:focus,.input-append select:focus,.input-prepend .uneditable-input:focus,.input-append .uneditable-input:focus{position:relative;z-index:2;} .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:18px;padding:4px 5px;font-weight:normal;line-height:18px;text-align:center;text-shadow:0 1px 0 #ffffff;vertical-align:middle;background-color:#eeeeee;border:1px solid #ccc;} +.input-prepend .add-on,.input-append .add-on{display:inline-block;width:auto;min-width:16px;height:18px;padding:4px 5px;font-weight:normal;line-height:18px;text-align:center;text-shadow:0 1px 0 #ffffff;vertical-align:middle;background-color:#f5f5f5;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:#a3e2ac;border-color:#38b44a;} .input-prepend .add-on,.input-prepend .btn{margin-right:-1px;} @@ -455,7 +455,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .alert-block p+p{margin-top:5px;} .nav{margin-left:0;margin-bottom:18px;list-style:none;} .nav>li>a{display:block;} -.nav>li>a:hover{text-decoration:none;background-color:#eeeeee;} +.nav>li>a:hover{text-decoration:none;background-color:#f5f5f5;} .nav .nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:18px;color:#999999;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);text-transform:uppercase;} .nav li+.nav-header{margin-top:9px;} .nav-list{padding-left:15px;padding-right:15px;margin-bottom:0;} @@ -470,7 +470,7 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;} .nav-tabs{border-bottom:1px solid #ddd;} .nav-tabs>li{margin-bottom:-1px;} -.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:18px;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:#eeeeee #eeeeee #dddddd;} +.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:18px;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:#f5f5f5 #f5f5f5 #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:#dd4814;} @@ -506,11 +506,11 @@ button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding- .tabs-left .nav-tabs>li>a,.tabs-right .nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px;} .tabs-left .nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd;} .tabs-left .nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;} -.tabs-left .nav-tabs>li>a:hover{border-color:#eeeeee #dddddd #eeeeee #eeeeee;} +.tabs-left .nav-tabs>li>a:hover{border-color:#f5f5f5 #dddddd #f5f5f5 #f5f5f5;} .tabs-left .nav-tabs .active>a,.tabs-left .nav-tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;*border-right-color:#ffffff;} .tabs-right .nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd;} .tabs-right .nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;} -.tabs-right .nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #eeeeee #dddddd;} +.tabs-right .nav-tabs>li>a:hover{border-color:#f5f5f5 #f5f5f5 #f5f5f5 #dddddd;} .tabs-right .nav-tabs .active>a,.tabs-right .nav-tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#ffffff;} .navbar{*position:relative;*z-index:2;overflow:visible;margin-bottom:18px;} .navbar-inner{padding-left:20px;padding-right:20px;background-color:#d44413;background-image:-moz-linear-gradient(top, #ce4213, #dd4814);background-image:-ms-linear-gradient(top, #ce4213, #dd4814);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ce4213), to(#dd4814));background-image:-webkit-linear-gradient(top, #ce4213, #dd4814);background-image:-o-linear-gradient(top, #ce4213, #dd4814);background-image:linear-gradient(top, #ce4213, #dd4814);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ce4213', endColorstr='#dd4814', GradientType=0);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} @@ -681,7 +681,7 @@ a.thumbnail:hover{border-color:#dd4814;-webkit-box-shadow:0 1px 4px rgba(0, 105, .carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);} .carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);} .carousel-caption h4,.carousel-caption p{color:#ffffff;} -.hero-unit{padding:60px;margin-bottom:30px;background-color:#bf4788;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;} +.hero-unit{padding:60px;margin-bottom:30px;background-color:#f5f5f5;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;} .hero-unit p{font-size:18px;font-weight:200;line-height:27px;color:inherit;} .pull-right{float:right;} .pull-left{float:left;} @@ -699,5 +699,6 @@ a.thumbnail:hover{border-color:#dd4814;-webkit-box-shadow:0 1px 4px rgba(0, 105, .btn-primary:active,.btn-primary.active{background-color:#ae3910 \9;} .btn-warning{background-color:#f3c768;background-image:-moz-linear-gradient(top, #f5d185, #efb73e);background-image:-ms-linear-gradient(top, #f5d185, #efb73e);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5d185), to(#efb73e));background-image:-webkit-linear-gradient(top, #f5d185, #efb73e);background-image:-o-linear-gradient(top, #f5d185, #efb73e);background-image:linear-gradient(top, #f5d185, #efb73e);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5d185', endColorstr='#efb73e', GradientType=0);border-color:#efb73e #efb73e #cf9311;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:#efb73e;} .btn-warning:active,.btn-warning.active{background-color:#e7a413 \9;} -.alert{text-shadow:none;} .form-actions{background-color:transparent;} +.alert{text-shadow:none;} +.hero-unit{border:1px solid rgba(0, 0, 0, 0.05);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.hero-unit h1{line-height:1.6em;} diff --git a/united/bootswatch.less b/united/bootswatch.less index a2d6b7c1..b23e0150 100755 --- a/united/bootswatch.less +++ b/united/bootswatch.less @@ -73,16 +73,25 @@ .buttonBackground(lighten(@yellow, 15%), @yellow); } -// ALERTS +// FORMS // ----------------------------------------------------- -.alert { - text-shadow: none; +.form-actions { + background-color: transparent; } -// FORMS +// MISC // ----------------------------------------------------- -.form-actions { - background-color: transparent; -}
\ No newline at end of file +.alert { + text-shadow: none; +} + +.hero-unit { + border: 1px solid rgba(0,0,0,.05); + .box-shadow(inset 0 1px 1px rgba(0,0,0,.05)); + + h1 { + line-height: 1.6em; + } +} diff --git a/united/variables.less b/united/variables.less index b2ea7c71..4e669e6f 100755 --- a/united/variables.less +++ b/united/variables.less @@ -17,7 +17,7 @@ @grayDark: #333; @gray: #555; @grayLight: #999; -@grayLighter: #eee; +@grayLighter: #F5F5F5; @white: #fff; @@ -160,7 +160,7 @@ // Hero unit // ------------------------- -@heroUnitBackground: lighten(@purple, 20%); +@heroUnitBackground: @grayLighter; @heroUnitHeadingColor: inherit; @heroUnitLeadColor: inherit; |