diff options
author | Thomas Park <thomas@thomaspark.me> | 2012-03-17 16:40:02 -0400 |
---|---|---|
committer | Thomas Park <thomas@thomaspark.me> | 2012-03-17 16:40:02 -0400 |
commit | 189b113153a0e866f717bf0822c51ae40597d53d (patch) | |
tree | ecb6d550f31e10538e724f7e15dfc6e9489d60c7 /united | |
parent | e4add32f88236caf7e81ccb8ed5a4db464c895a6 (diff) |
all: hero-unit support
Diffstat (limited to 'united')
-rw-r--r-- | united/bootstrap.css | 37 | ||||
-rw-r--r-- | united/bootstrap.min.css | 27 | ||||
-rwxr-xr-x | united/bootswatch.less | 23 | ||||
-rwxr-xr-x | united/variables.less | 4 |
4 files changed, 55 insertions, 36 deletions
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; |