From 7d7156bff9818c8d50affffb750b6019a9f20f26 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 23 Aug 2011 20:16:39 -0700 Subject: [PATCH 01/17] optimized grid system from @necolas --- bootstrap-1.1.0.css | 249 +++++++++++++--------------------------- bootstrap-1.1.0.min.css | 59 +++++----- lib/preboot.less | 14 +-- lib/scaffolding.less | 23 ++++ 4 files changed, 132 insertions(+), 213 deletions(-) diff --git a/bootstrap-1.1.0.css b/bootstrap-1.1.0.css index 7f0248fc45..6fefd30973 100644 --- a/bootstrap-1.1.0.css +++ b/bootstrap-1.1.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Mon Aug 22 23:50:35 PDT 2011 + * Date: Tue Aug 23 20:13:44 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -127,6 +127,7 @@ aside { * ------------------------------------------------------------------------------------------- */ .row { zoom: 1; + margin: 0 -20px; } .row:before, .row:after { display: table; @@ -135,205 +136,109 @@ aside { .row:after { clear: both; } -.row .span1 { - float: left; - width: 40px; - margin-left: 20px; -} -.row .span1:first-child { - margin-left: 0; -} -.row .span2 { - float: left; - width: 100px; - margin-left: 20px; -} -.row .span2:first-child { - margin-left: 0; -} -.row .span3 { - float: left; - width: 160px; - margin-left: 20px; -} -.row .span3:first-child { - margin-left: 0; -} -.row .span4 { - float: left; - width: 220px; - margin-left: 20px; -} -.row .span4:first-child { - margin-left: 0; -} -.row .span5 { - float: left; - width: 280px; - margin-left: 20px; -} -.row .span5:first-child { - margin-left: 0; -} -.row .span6 { - float: left; - width: 340px; - margin-left: 20px; -} -.row .span6:first-child { - margin-left: 0; -} -.row .span7 { - float: left; - width: 400px; - margin-left: 20px; -} -.row .span7:first-child { - margin-left: 0; -} -.row .span8 { - float: left; - width: 460px; - margin-left: 20px; -} -.row .span8:first-child { - margin-left: 0; -} -.row .span9 { - float: left; - width: 520px; - margin-left: 20px; -} -.row .span9:first-child { - margin-left: 0; -} -.row .span10 { - float: left; - width: 580px; - margin-left: 20px; -} -.row .span10:first-child { - margin-left: 0; -} -.row .span11 { - float: left; - width: 640px; - margin-left: 20px; -} -.row .span11:first-child { - margin-left: 0; -} -.row .span12 { - float: left; - width: 700px; - margin-left: 20px; -} -.row .span12:first-child { - margin-left: 0; -} -.row .span13 { - float: left; - width: 760px; - margin-left: 20px; -} -.row .span13:first-child { - margin-left: 0; -} -.row .span14 { - float: left; - width: 820px; - margin-left: 20px; -} -.row .span14:first-child { - margin-left: 0; -} -.row .span15 { - float: left; - width: 880px; - margin-left: 20px; -} -.row .span15:first-child { - margin-left: 0; -} +.row .span1, +.row .span2, +.row .span3, +.row .span4, +.row .span5, +.row .span6, +.row .span7, +.row .span8, +.row .span9, +.row .span10, +.row .span11, +.row .span12, +.row .span13, +.row .span14, +.row .span15, .row .span16 { float: left; - width: 940px; margin-left: 20px; + *display: inline; } -.row .span16:first-child { - margin-left: 0; +.row .span1 { + width: 40px; +} +.row .span2 { + width: 100px; +} +.row .span3 { + width: 160px; +} +.row .span4 { + width: 220px; +} +.row .span5 { + width: 280px; +} +.row .span6 { + width: 340px; +} +.row .span7 { + width: 400px; +} +.row .span8 { + width: 460px; +} +.row .span9 { + width: 520px; +} +.row .span10 { + width: 580px; +} +.row .span11 { + width: 640px; +} +.row .span12 { + width: 700px; +} +.row .span13 { + width: 760px; +} +.row .span14 { + width: 820px; +} +.row .span15 { + width: 880px; +} +.row .span16 { + width: 940px; } .row .offset1 { - margin-left: 80px !important; -} -.row .offset1:first-child { - margin-left: 60px !important; + margin-left: 80px; } .row .offset2 { - margin-left: 140px !important; -} -.row .offset2:first-child { - margin-left: 120px !important; + margin-left: 140px; } .row .offset3 { - margin-left: 200px !important; -} -.row .offset3:first-child { - margin-left: 180px !important; + margin-left: 200px; } .row .offset4 { - margin-left: 260px !important; -} -.row .offset4:first-child { - margin-left: 240px !important; + margin-left: 260px; } .row .offset5 { - margin-left: 320px !important; -} -.row .offset5:first-child { - margin-left: 300px !important; + margin-left: 320px; } .row .offset6 { - margin-left: 380px !important; -} -.row .offset6:first-child { - margin-left: 360px !important; + margin-left: 380px; } .row .offset7 { - margin-left: 440px !important; -} -.row .offset7:first-child { - margin-left: 420px !important; + margin-left: 440px; } .row .offset8 { - margin-left: 500px !important; -} -.row .offset8:first-child { - margin-left: 480px !important; + margin-left: 500px; } .row .offset9 { - margin-left: 500px !important; -} -.row .offset9:first-child { - margin-left: 480px !important; + margin-left: 500px; } .row .offset10 { - margin-left: 620px !important; -} -.row .offset10:first-child { - margin-left: 600px !important; + margin-left: 620px; } .row .offset11 { - margin-left: 680px !important; -} -.row .offset11:first-child { - margin-left: 660px !important; + margin-left: 680px; } .row .offset12 { - margin-left: 740px !important; -} -.row .offset12:first-child { - margin-left: 720px !important; + margin-left: 740px; } html, body { background-color: #fff; diff --git a/bootstrap-1.1.0.min.css b/bootstrap-1.1.0.min.css index 01f020d2e9..c6a5a379f7 100644 --- a/bootstrap-1.1.0.min.css +++ b/bootstrap-1.1.0.min.css @@ -9,36 +9,37 @@ header,section,footer,article,aside{display:block;} .center-block{display:block;margin:0 auto;} .container{width:940px;margin:0 auto;zoom:1;}.container:before,.container:after{display:table;content:"";} .container:after{clear:both;} -.row{zoom:1;}.row:before,.row:after{display:table;content:"";} +.row{zoom:1;margin:0 -20px;}.row:before,.row:after{display:table;content:"";} .row:after{clear:both;} -.row .span1{float:left;width:40px;margin-left:20px;}.row .span1:first-child{margin-left:0;} -.row .span2{float:left;width:100px;margin-left:20px;}.row .span2:first-child{margin-left:0;} -.row .span3{float:left;width:160px;margin-left:20px;}.row .span3:first-child{margin-left:0;} -.row .span4{float:left;width:220px;margin-left:20px;}.row .span4:first-child{margin-left:0;} -.row .span5{float:left;width:280px;margin-left:20px;}.row .span5:first-child{margin-left:0;} -.row .span6{float:left;width:340px;margin-left:20px;}.row .span6:first-child{margin-left:0;} -.row .span7{float:left;width:400px;margin-left:20px;}.row .span7:first-child{margin-left:0;} -.row .span8{float:left;width:460px;margin-left:20px;}.row .span8:first-child{margin-left:0;} -.row .span9{float:left;width:520px;margin-left:20px;}.row .span9:first-child{margin-left:0;} -.row .span10{float:left;width:580px;margin-left:20px;}.row .span10:first-child{margin-left:0;} -.row .span11{float:left;width:640px;margin-left:20px;}.row .span11:first-child{margin-left:0;} -.row .span12{float:left;width:700px;margin-left:20px;}.row .span12:first-child{margin-left:0;} -.row .span13{float:left;width:760px;margin-left:20px;}.row .span13:first-child{margin-left:0;} -.row .span14{float:left;width:820px;margin-left:20px;}.row .span14:first-child{margin-left:0;} -.row .span15{float:left;width:880px;margin-left:20px;}.row .span15:first-child{margin-left:0;} -.row .span16{float:left;width:940px;margin-left:20px;}.row .span16:first-child{margin-left:0;} -.row .offset1{margin-left:80px !important;}.row .offset1:first-child{margin-left:60px !important;} -.row .offset2{margin-left:140px !important;}.row .offset2:first-child{margin-left:120px !important;} -.row .offset3{margin-left:200px !important;}.row .offset3:first-child{margin-left:180px !important;} -.row .offset4{margin-left:260px !important;}.row .offset4:first-child{margin-left:240px !important;} -.row .offset5{margin-left:320px !important;}.row .offset5:first-child{margin-left:300px !important;} -.row .offset6{margin-left:380px !important;}.row .offset6:first-child{margin-left:360px !important;} -.row .offset7{margin-left:440px !important;}.row .offset7:first-child{margin-left:420px !important;} -.row .offset8{margin-left:500px !important;}.row .offset8:first-child{margin-left:480px !important;} -.row .offset9{margin-left:500px !important;}.row .offset9:first-child{margin-left:480px !important;} -.row .offset10{margin-left:620px !important;}.row .offset10:first-child{margin-left:600px !important;} -.row .offset11{margin-left:680px !important;}.row .offset11:first-child{margin-left:660px !important;} -.row .offset12{margin-left:740px !important;}.row .offset12:first-child{margin-left:720px !important;} +.row .span1,.row .span2,.row .span3,.row .span4,.row .span5,.row .span6,.row .span7,.row .span8,.row .span9,.row .span10,.row .span11,.row .span12,.row .span13,.row .span14,.row .span15,.row .span16{float:left;margin-left:20px;*display:inline;} +.row .span1{width:40px;} +.row .span2{width:100px;} +.row .span3{width:160px;} +.row .span4{width:220px;} +.row .span5{width:280px;} +.row .span6{width:340px;} +.row .span7{width:400px;} +.row .span8{width:460px;} +.row .span9{width:520px;} +.row .span10{width:580px;} +.row .span11{width:640px;} +.row .span12{width:700px;} +.row .span13{width:760px;} +.row .span14{width:820px;} +.row .span15{width:880px;} +.row .span16{width:940px;} +.row .offset1{margin-left:80px;} +.row .offset2{margin-left:140px;} +.row .offset3{margin-left:200px;} +.row .offset4{margin-left:260px;} +.row .offset5{margin-left:320px;} +.row .offset6{margin-left:380px;} +.row .offset7{margin-left:440px;} +.row .offset8{margin-left:500px;} +.row .offset9{margin-left:500px;} +.row .offset10{margin-left:620px;} +.row .offset11{margin-left:680px;} +.row .offset12{margin-left:740px;} html,body{background-color:#fff;} body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;text-rendering:optimizeLegibility;} div.container{width:940px;margin:0 auto;} diff --git a/lib/preboot.less b/lib/preboot.less index 370cbcdb81..399d50825f 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -36,6 +36,7 @@ @gridColumns: 16; @gridColumnWidth: 40px; @gridGutterWidth: 20px; +@extraSpace: 40px; @siteWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); // Color Scheme @@ -125,21 +126,10 @@ .clearfix(); } .columns(@columnSpan: 1) { - float: left; width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)); - margin-left: @gridGutterWidth; - &:first-child { - margin-left: 0; - } -} -.offsetMath(@extraSpace: 40px) { - margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @extraSpace !important; } .offset(@columnOffset: 1) { - .offsetMath(40px); - &:first-child { - .offsetMath(20px); - } + margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @extraSpace; } // Border Radius diff --git a/lib/scaffolding.less b/lib/scaffolding.less index b1900f0126..a75a47c5fa 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -9,6 +9,29 @@ .row { .clearfix(); + margin: 0 -20px; + + // Default columns + .span1, + .span2, + .span3, + .span4, + .span5, + .span6, + .span7, + .span8, + .span9, + .span10, + .span11, + .span12, + .span13, + .span14, + .span15, + .span16 { + float: left; + margin-left: 20px; + *display: inline; // IE6 double margin bug fix. + } // Default columns .span1 { .columns(1); } From 0739583a46833b4813524e69726f79fe1b009542 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 24 Aug 2011 15:55:08 -0700 Subject: [PATCH 02/17] optimize btn for outputted code + line-height: normal for firefox with adjusted padding --- bootstrap-1.1.0.css | 42 ++++++++++----------- bootstrap-1.1.0.min.css | 12 +++--- lib/preboot.less | 26 +++---------- lib/scaffolding.less | 83 ++++++++++++++++++++++------------------- 4 files changed, 78 insertions(+), 85 deletions(-) diff --git a/bootstrap-1.1.0.css b/bootstrap-1.1.0.css index 6fefd30973..4e91a519d2 100644 --- a/bootstrap-1.1.0.css +++ b/bootstrap-1.1.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Tue Aug 23 20:13:44 PDT 2011 + * Date: Wed Aug 24 15:54:36 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -297,11 +297,11 @@ a:hover { background-image: -ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6); background-image: -o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6); background-image: linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6); - padding: 4px 14px; + padding: 5px 14px 6px; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); color: #333; font-size: 13px; - line-height: 18px; + line-height: normal; border: 1px solid #ccc; border-bottom-color: #bbb; -webkit-border-radius: 4px; @@ -319,10 +319,10 @@ a:hover { color: #333; text-decoration: none; } -.btn.primary, .btn.danger { - color: #fff; -} -.btn.primary:hover, .btn.danger:hover { +.btn.primary, +.btn.danger, +.btn.danger:hover, +.btn.primary:hover { color: #fff; } .btn.primary { @@ -353,39 +353,39 @@ a:hover { border-color: #9d261d #9d261d #5c1611; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } -.btn.large { - font-size: 16px; - line-height: 28px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} -.btn.small { - padding-right: 9px; - padding-left: 9px; - font-size: 11px; -} .btn.disabled { + cursor: default; background-image: none; filter: alpha(opacity=65); -khtml-opacity: 0.65; -moz-opacity: 0.65; opacity: 0.65; - cursor: default; } .btn:disabled { + cursor: default; background-image: none; filter: alpha(opacity=65); -khtml-opacity: 0.65; -moz-opacity: 0.65; opacity: 0.65; - cursor: default; } .btn:active { -webkit-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); } +.btn.large { + font-size: 16px; + line-height: normal; + padding: 9px 14px 9px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.btn.small { + padding: 7px 9px 7px; + font-size: 11px; +} button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { padding: 0; border: 0; diff --git a/bootstrap-1.1.0.min.css b/bootstrap-1.1.0.min.css index c6a5a379f7..9d7fa25e05 100644 --- a/bootstrap-1.1.0.min.css +++ b/bootstrap-1.1.0.min.css @@ -48,15 +48,15 @@ div.container-fluid:after{clear:both;} div.container-fluid div.sidebar{float:left;width:220px;} div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;} a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#0050a3;text-decoration:underline;} -.btn{cursor:pointer;display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:18px;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;} -.btn.primary,.btn.danger{color:#fff;}.btn.primary:hover,.btn.danger:hover{color:#fff;} +.btn{cursor:pointer;display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);padding:5px 14px 6px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:normal;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;} +.btn.primary,.btn.danger,.btn.danger:hover,.btn.primary:hover{color:#fff;} .btn.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);background-image:linear-gradient(#049cdb, #0064cd);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} .btn.danger{background-color:#9d261d;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#d83a2e), to(#9d261d));background-image:-moz-linear-gradient(#d83a2e, #9d261d);background-image:-ms-linear-gradient(#d83a2e, #9d261d);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #d83a2e), color-stop(100%, #9d261d));background-image:-webkit-linear-gradient(#d83a2e, #9d261d);background-image:-o-linear-gradient(#d83a2e, #9d261d);background-image:linear-gradient(#d83a2e, #9d261d);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#9d261d #9d261d #5c1611;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} -.btn.large{font-size:16px;line-height:28px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} -.btn.small{padding-right:9px;padding-left:9px;font-size:11px;} -.btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;} -.btn:disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;} +.btn.disabled{cursor:default;background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;} +.btn:disabled{cursor:default;background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;} .btn:active{-webkit-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);} +.btn.large{font-size:16px;line-height:normal;padding:9px 14px 9px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} +.btn.small{padding:7px 9px 7px;font-size:11px;} button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;} p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;} h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;} diff --git a/lib/preboot.less b/lib/preboot.less index 399d50825f..964f677a68 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -171,26 +171,12 @@ } // Buttons -// .button(@color: #fff, @padding: 4px 14px, @textColor: #333, @textShadow: 0 1px 1px rgba(255,255,255,.75), @fontSize: 13px, @borderColor: rgba(0,0,0,.1), @borderRadius: 4px) { -// display: inline-block; -// #gradient > .vertical-three-colors(@color, @color, 0.25, darken(@color, 10%)); -// padding: @padding; -// text-shadow: @textShadow; -// color: @textColor; -// font-size: @fontSize; -// line-height: @baseline; -// border: 1px solid; -// border-color: #ccc #ccc #bbb; -// border-color: borderColor borderColor fadein(@borderColor, 15%); -// .border-radius(@borderRadius); -// @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); -// .box-shadow(@shadow); -// &:hover { -// background-position: 0 -15px; -// color: @textColor; -// text-decoration: none; -// } -// } +.btnColoring(@primaryColor, @secondaryColor) { + #gradient > .vertical(@primaryColor, @secondaryColor); + text-shadow: 0 -1px 0 rgba(0,0,0,.25); + border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%); + border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%); +} // Add an alphatransparency value to any background or border color (via Elyse Holladay) #translucent { diff --git a/lib/scaffolding.less b/lib/scaffolding.less index a75a47c5fa..5dc054f93b 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -118,73 +118,80 @@ a { } // Buttons -.btnColor(@primaryColor, @secondaryColor) { - #gradient > .vertical(@primaryColor, @secondaryColor); - text-shadow: 0 -1px 0 rgba(0,0,0,.25); - border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%); - border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%); -} - .btn { - // .button(#1174C6); + // Button Base cursor: pointer; display: inline-block; #gradient > .vertical-three-colors(#fff, #fff, 0.25, darken(#fff, 10%)); - padding: 4px 14px; + padding: 5px 14px 6px; text-shadow: 0 1px 1px rgba(255,255,255,.75); color: #333; font-size: 13px; - line-height: @baseline; + line-height: normal; border: 1px solid #ccc; border-bottom-color: #bbb; .border-radius(4px); @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); .box-shadow(@shadow); + &:hover { background-position: 0 -15px; color: #333; text-decoration: none; } + + // Transitions .transition(.1s linear all); + + // Colored Button Types &.primary, - &.danger { + &.danger, + &.danger:hover, + &.primary:hover { color: #fff; - &:hover { - color: #fff; - } - } - &.primary { - .btnColor(@blue, @blueDark) - } - &.danger { - .btnColor(lighten(@red, 15%), @red) - } - &.large { - font-size: 16px; - line-height: 28px; - .border-radius(6px); - } - &.small { - padding-right: 9px; - padding-left: 9px; - font-size: 11px; - } - &.disabled { - background-image: none; - .opacity(65); - cursor: default; } - // this can't be included with the .disabled def because IE8 and below will drop it ;_; - &:disabled { + &.primary { + .btnColoring(@blue, @blueDark) + } + + &.danger { + .btnColoring(lighten(@red, 15%), @red) + } + + // Active and Disabled states + &.disabled { + cursor: default; background-image: none; .opacity(65); - cursor: default; } + + &:disabled { + // disabled pseudo can't be included with .disabled + // def because IE8 and below will drop it ;_; + cursor: default; + background-image: none; + .opacity(65); + } + &:active { @shadow: inset 0 3px 7px rgba(0,0,0,.1), 0 1px 2px rgba(0,0,0,.05); .box-shadow(@shadow); } + + // Button Sizes + &.large { + font-size: 16px; + line-height: normal; + padding: 9px 14px 9px; + .border-radius(6px); + } + + &.small { + padding: 7px 9px 7px; + font-size: 11px; + } + } // Help Firefox not be a jerk about adding extra padding to buttons From 8368cfd523fab964ebd3132e29332b4680cedba5 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 24 Aug 2011 19:55:11 -0700 Subject: [PATCH 03/17] add opera to browser support --- bootstrap-1.1.0.css | 2 +- docs/assets/img/browsers.png | Bin 18286 -> 21274 bytes docs/index.html | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bootstrap-1.1.0.css b/bootstrap-1.1.0.css index 4e91a519d2..ee0cc3fdfa 100644 --- a/bootstrap-1.1.0.css +++ b/bootstrap-1.1.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Wed Aug 24 15:54:36 PDT 2011 + * Date: Wed Aug 24 19:43:43 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). diff --git a/docs/assets/img/browsers.png b/docs/assets/img/browsers.png index e2e1f700fb0e32964d70e7ef28330a7963188ebb..1598f98962073b4af7a4764ed64450239705d5e1 100644 GIT binary patch delta 20793 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 z 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 delta 17782 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 AU;qFB diff --git a/docs/index.html b/docs/index.html index 1669e6123a..503be111b9 100644 --- a/docs/index.html +++ b/docs/index.html @@ -118,12 +118,13 @@

Browser support

Bootstrap is tested and supported in major modern browsers like Chrome, Safari, Internet Explorer, and Firefox.

- Tested and supported in Chrome, Safari, Internet Explorer, and Firefox + Tested and supported in Chrome, Safari, Internet Explorer, and Firefox
  • Latest Safari
  • Latest Google Chrome
  • Firefox 4+
  • Internet Explorer 7+
    • +
  • Opera 11
From 2d99e3f8a61ef9d4a40cd0cad109d0d89ae3c661 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 25 Aug 2011 00:13:40 -0700 Subject: [PATCH 04/17] base import of normalize into the reset css, tweaks to selector specificity across the board --- bootstrap-1.1.0.css | 238 +++++++++++++++++++++--------- bootstrap-1.1.0.min.css | 97 +++++++----- lib/forms.less | 316 ++++++++++++++++++++-------------------- lib/patterns.less | 1 + lib/reset.less | 132 ++++++++++++++++- lib/scaffolding.less | 8 +- lib/type.less | 5 +- 7 files changed, 520 insertions(+), 277 deletions(-) diff --git a/bootstrap-1.1.0.css b/bootstrap-1.1.0.css index 615e043d4a..d20ff26954 100644 --- a/bootstrap-1.1.0.css +++ b/bootstrap-1.1.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Mon Aug 22 12:48:23 PDT 2011 + * Date: Wed Aug 24 23:48:05 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -85,13 +85,92 @@ blockquote:before, blockquote:after { content: ""; } -header, -section, -footer, +html { + overflow-y: scroll; + font-size: 100%; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; +} +a:focus { + outline: thin dotted; +} article, -aside { +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +nav, +section { display: block; } +audio, canvas, video { + display: inline-block; + *display: inline; + *zoom: 1; +} +audio:not([controls]) { + display: none; +} +sub, sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} +sup { + top: -0.5em; +} +sub { + bottom: -0.25em; +} +img { + border: 0; + -ms-interpolation-mode: bicubic; +} +button, +input, +select, +textarea { + font-size: 100%; + margin: 0; + vertical-align: baseline; + *vertical-align: middle; +} +button, input { + line-height: normal; + *overflow: visible; +} +button::-moz-focus-inner, input::-moz-focus-inner { + border: 0; + padding: 0; +} +button, +input[type="button"], +input[type="reset"], +input[type="submit"] { + cursor: pointer; + -webkit-appearance: button; +} +input[type="search"] { + -webkit-appearance: textfield; + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} +textarea { + overflow: auto; + vertical-align: top; +} +table { + border-collapse: collapse; + border-spacing: 0; +} /* Preboot.less * Variables and mixins to pre-ignite any new web development project * ------------------------------------------------------------------ */ @@ -113,6 +192,7 @@ aside { width: 940px; margin: 0 auto; zoom: 1; + margin-bottom: 18px; } .container:before, .container:after { display: table; @@ -147,6 +227,7 @@ aside { * ------------------------------------------------------------------------------------------- */ .row { zoom: 1; + margin-bottom: 18px; } .row:before, .row:after { display: table; @@ -374,6 +455,7 @@ div.container { div.container-fluid { padding: 0 20px; zoom: 1; + margin-bottom: 18px; } div.container-fluid:before, div.container-fluid:after { display: table; @@ -481,6 +563,9 @@ a:hover { -moz-opacity: 0.65; opacity: 0.65; cursor: default; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } .btn:disabled { background-image: none; @@ -489,12 +574,17 @@ a:hover { -moz-opacity: 0.65; opacity: 0.65; cursor: default; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} +.btn:disabled.primary { color: #fff; } .btn:active { - -webkit-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); } button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { padding: 0; @@ -622,7 +712,7 @@ em { line-height: inherit; } .muted { - color: #e6e6e6; + color: #bfbfbf; } blockquote { margin-bottom: 18px; @@ -675,7 +765,9 @@ pre { -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; + white-space: pre; white-space: pre-wrap; + word-wrap: break-word; } /* Forms.less * Base styles for various input types, form layouts, and states @@ -683,11 +775,11 @@ pre { form { margin-bottom: 18px; } -form fieldset { +fieldset { margin-bottom: 18px; padding-top: 18px; } -form fieldset legend { +fieldset legend { display: block; margin-left: 150px; font-size: 20px; @@ -700,19 +792,19 @@ form fieldset legend { color: #404040; } -form .clearfix { +.clearfix { margin-bottom: 18px; } -form label, -form input, -form select, -form textarea { +label, +input, +select, +textarea { font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: normal; } -form label { +label { padding-top: 6px; font-size: 13px; line-height: 18px; @@ -721,20 +813,19 @@ form label { text-align: right; color: #404040; } -form div.input { +div.input { margin-left: 150px; } -form input[type=checkbox], form input[type=radio] { +input[type=checkbox], input[type=radio] { cursor: pointer; } -form input[type=text], -form input[type=password], -form textarea, -form select, -form .uneditable-input { +input[type=text], +input[type=password], +textarea, +select, +.uneditable-input { display: inline-block; width: 210px; - margin: 0; padding: 4px; font-size: 13px; line-height: 18px; @@ -745,14 +836,14 @@ form .uneditable-input { -moz-border-radius: 3px; border-radius: 3px; } -form select, form input[type=file] { +select, input[type=file] { height: 27px; line-height: 27px; } -form textarea { +textarea { height: auto; } -form .uneditable-input { +.uneditable-input { background-color: #eee; display: block; border-color: #ccc; @@ -760,16 +851,16 @@ form .uneditable-input { -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075); } -form :-moz-placeholder { +:-moz-placeholder { color: #bfbfbf; } -form ::-webkit-input-placeholder { +::-webkit-input-placeholder { color: #bfbfbf; } -form input[type=text], -form input[type=password], -form select, -form textarea { +input[type=text], +input[type=password], +select, +textarea { -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; -moz-transition: border linear 0.2s, box-shadow linear 0.2s; transition: border linear 0.2s, box-shadow linear 0.2s; @@ -777,7 +868,7 @@ form textarea { -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); } -form input[type=text]:focus, form input[type=password]:focus, form textarea:focus { +input[type=text]:focus, input[type=password]:focus, textarea:focus { outline: none; border-color: rgba(82, 168, 236, 0.8); -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); @@ -812,46 +903,46 @@ form div.error .input-prepend span.add-on, form div.error .input-append span.add border-color: #c87872; color: #b9554d; } -form .input-mini, -form input.mini, -form textarea.mini, -form select.mini { +.input-mini, +input.mini, +textarea.mini, +select.mini { width: 60px; } -form .input-small, -form input.small, -form textarea.small, -form select.small { +.input-small, +input.small, +textarea.small, +select.small { width: 90px; } -form .input-medium, -form input.medium, -form textarea.medium, -form select.medium { +.input-medium, +input.medium, +textarea.medium, +select.medium { width: 150px; } -form .input-large, -form input.large, -form textarea.large, -form select.large { +.input-large, +input.large, +textarea.large, +select.large { width: 210px; } -form .input-xlarge, -form input.xlarge, -form textarea.xlarge, -form select.xlarge { +.input-xlarge, +input.xlarge, +textarea.xlarge, +select.xlarge { width: 270px; } -form .input-xxlarge, -form input.xxlarge, -form textarea.xxlarge, -form select.xxlarge { +.input-xxlarge, +input.xxlarge, +textarea.xxlarge, +select.xxlarge { width: 530px; } -form textarea.xxlarge { +textarea.xxlarge { overflow-y: scroll; } -form input[readonly]:focus, form textarea[readonly]:focus, form input.disabled { +input[readonly]:focus, textarea[readonly]:focus, input.disabled { background: #f5f5f5; border-color: #ddd; -webkit-box-shadow: none; @@ -992,16 +1083,16 @@ form input[readonly]:focus, form textarea[readonly]:focus, form input.disabled { .inputs-list input[type=radio], .inputs-list input[type=checkbox] { margin-bottom: 0; } -form.form-stacked { +.form-stacked { padding-left: 20px; } -form.form-stacked fieldset { +.form-stacked fieldset { padding-top: 9px; } -form.form-stacked legend { +.form-stacked legend { margin-left: 0; } -form.form-stacked label { +.form-stacked label { display: block; float: none; width: auto; @@ -1010,30 +1101,30 @@ form.form-stacked label { line-height: 20px; padding-top: 0; } -form.form-stacked .clearfix { +.form-stacked .clearfix { margin-bottom: 9px; } -form.form-stacked .clearfix div.input { +.form-stacked .clearfix div.input { margin-left: 0; } -form.form-stacked .inputs-list { +.form-stacked .inputs-list { margin-bottom: 0; } -form.form-stacked .inputs-list li { +.form-stacked .inputs-list li { padding-top: 0; } -form.form-stacked .inputs-list li label { +.form-stacked .inputs-list li label { font-weight: normal; padding-top: 0; } -form.form-stacked div.error { +.form-stacked div.error { padding-top: 10px; padding-bottom: 10px; padding-left: 10px; margin-top: 0; margin-left: -10px; } -form.form-stacked .actions { +.form-stacked .actions { margin-left: -20px; padding-left: 20px; } @@ -1575,6 +1666,7 @@ footer { margin: 0 0 20px; padding: 0; zoom: 1; + margin-bottom: 18px; } .tabs:before, .pills:before, @@ -1750,6 +1842,8 @@ footer { -moz-box-shadow: inset 0 1px 0 #ffffff; box-shadow: inset 0 1px 0 #ffffff; zoom: 1; + margin-bottom: 18px; + margin-bottom: 0; } .modal .modal-footer:before, .modal .modal-footer:after { display: table; diff --git a/bootstrap-1.1.0.min.css b/bootstrap-1.1.0.min.css index 76178b180c..ae0cd3430f 100644 --- a/bootstrap-1.1.0.min.css +++ b/bootstrap-1.1.0.min.css @@ -3,13 +3,29 @@ h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,cite,code,del,dfn,em,i table{border-collapse:collapse;border-spacing:0;} ol,ul{list-style:none;} q:before,q:after,blockquote:before,blockquote:after{content:"";} -header,section,footer,article,aside{display:block;} +html{overflow-y:scroll;font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;} +a:focus{outline:thin dotted;} +article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;} +audio,canvas,video{display:inline-block;*display:inline;*zoom:1;} +audio:not([controls]){display:none;} +sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline;} +sup{top:-0.5em;} +sub{bottom:-0.25em;} +img{border:0;-ms-interpolation-mode:bicubic;} +button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle;} +button,input{line-height:normal;*overflow:visible;} +button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0;} +button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;} +input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;} +input[type="search"]::-webkit-search-decoration{-webkit-appearance:none;} +textarea{overflow:auto;vertical-align:top;} +table{border-collapse:collapse;border-spacing:0;} .clearfix{zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";} .clearfix:after{clear:both;} .center-block{display:block;margin:0 auto;} -.container{width:940px;margin:0 auto;zoom:1;}.container:before,.container:after{display:table;content:"";} +.container{width:940px;margin:0 auto;zoom:1;margin-bottom:18px;}.container:before,.container:after{display:table;content:"";} .container:after{clear:both;} -.row{zoom:1;}.row:before,.row:after{display:table;content:"";} +.row{zoom:1;margin-bottom:18px;}.row:before,.row:after{display:table;content:"";} .row:after{clear:both;} .row .span1{float:left;width:40px;margin-left:20px;}.row .span1:first-child{margin-left:0;} .row .span2{float:left;width:100px;margin-left:20px;}.row .span2:first-child{margin-left:0;} @@ -42,7 +58,7 @@ header,section,footer,article,aside{display:block;} html,body{background-color:#fff;} body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;text-rendering:optimizeLegibility;} div.container{width:940px;margin:0 auto;} -div.container-fluid{padding:0 20px;zoom:1;}div.container-fluid:before,div.container-fluid:after{display:table;content:"";} +div.container-fluid{padding:0 20px;zoom:1;margin-bottom:18px;}div.container-fluid:before,div.container-fluid:after{display:table;content:"";} div.container-fluid:after{clear:both;} div.container-fluid div.sidebar{float:left;width:220px;} div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;} @@ -52,9 +68,9 @@ a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a: .btn{-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn.primary{color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;} .btn.large{font-size:16px;line-height:28px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} .btn.small{padding-right:9px;padding-left:9px;font-size:11px;} -.btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;} -.btn:disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;color:#fff;} -.btn:active{-webkit-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);} +.btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +.btn:disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.btn:disabled.primary{color:#fff;} +.btn:active{-webkit-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);} button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;} p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;} h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;} @@ -77,38 +93,39 @@ dl dd{margin-left:9px;} hr{margin:0 0 19px;border:0;border-bottom:1px solid #eee;} strong{font-style:inherit;font-weight:bold;line-height:inherit;} em{font-style:italic;font-weight:inherit;line-height:inherit;} -.muted{color:#e6e6e6;} +.muted{color:#bfbfbf;} blockquote{margin-bottom:18px;border-left:5px solid #eee;padding-left:15px;}blockquote p{font-size:14px;font-weight:300;line-height:18px;margin-bottom:0;} blockquote small{display:block;font-size:12px;font-weight:300;line-height:18px;color:#bfbfbf;}blockquote small:before{content:'\2014 \00A0';} address{display:block;line-height:18px;margin-bottom:18px;} code,pre{padding:0 3px 2px;font-family:Monaco, Andale Mono, Courier New, monospace;font-size:12px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;} -pre{background-color:#f5f5f5;display:block;padding:17px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre-wrap;} -form{margin-bottom:18px;}form fieldset{margin-bottom:18px;padding-top:18px;}form fieldset legend{display:block;margin-left:150px;font-size:20px;line-height:1;*margin:0 0 5px 145px;*line-height:1.5;color:#404040;} -form .clearfix{margin-bottom:18px;} -form label,form input,form select,form textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:normal;} -form label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;} -form div.input{margin-left:150px;} -form input[type=checkbox],form input[type=radio]{cursor:pointer;} -form input[type=text],form input[type=password],form textarea,form select,form .uneditable-input{display:inline-block;width:210px;margin:0;padding:4px;font-size:13px;line-height:18px;height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -form select,form input[type=file]{height:27px;line-height:27px;} -form textarea{height:auto;} -form .uneditable-input{background-color:#eee;display:block;border-color:#ccc;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);} -form :-moz-placeholder{color:#bfbfbf;} -form ::-webkit-input-placeholder{color:#bfbfbf;} -form input[type=text],form input[type=password],form select,form textarea{-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);} -form input[type=text]:focus,form input[type=password]:focus,form textarea:focus{outline:none;border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);} +pre{background-color:#f5f5f5;display:block;padding:17px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-wrap:break-word;} +form{margin-bottom:18px;} +fieldset{margin-bottom:18px;padding-top:18px;}fieldset legend{display:block;margin-left:150px;font-size:20px;line-height:1;*margin:0 0 5px 145px;*line-height:1.5;color:#404040;} +.clearfix{margin-bottom:18px;} +label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:normal;} +label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;} +div.input{margin-left:150px;} +input[type=checkbox],input[type=radio]{cursor:pointer;} +input[type=text],input[type=password],textarea,select,.uneditable-input{display:inline-block;width:210px;padding:4px;font-size:13px;line-height:18px;height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +select,input[type=file]{height:27px;line-height:27px;} +textarea{height:auto;} +.uneditable-input{background-color:#eee;display:block;border-color:#ccc;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.075);} +:-moz-placeholder{color:#bfbfbf;} +::-webkit-input-placeholder{color:#bfbfbf;} +input[type=text],input[type=password],select,textarea{-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);} +input[type=text]:focus,input[type=password]:focus,textarea:focus{outline:none;border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);} form div.error{background:#fae5e3;padding:10px 0;margin:-10px 0 10px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}form div.error>label,form div.error span.help-inline,form div.error span.help-block{color:#9d261d;} form div.error input[type=text],form div.error input[type=password],form div.error textarea{border-color:#c87872;-webkit-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);-moz-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);box-shadow:0 0 3px rgba(171, 41, 32, 0.25);}form div.error input[type=text]:focus,form div.error input[type=password]:focus,form div.error textarea:focus{border-color:#b9554d;-webkit-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);-moz-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);box-shadow:0 0 6px rgba(171, 41, 32, 0.5);} form div.error .input-prepend span.add-on,form div.error .input-append span.add-on{background:#f4c8c5;border-color:#c87872;color:#b9554d;} -form .input-mini,form input.mini,form textarea.mini,form select.mini{width:60px;} -form .input-small,form input.small,form textarea.small,form select.small{width:90px;} -form .input-medium,form input.medium,form textarea.medium,form select.medium{width:150px;} -form .input-large,form input.large,form textarea.large,form select.large{width:210px;} -form .input-xlarge,form input.xlarge,form textarea.xlarge,form select.xlarge{width:270px;} -form .input-xxlarge,form input.xxlarge,form textarea.xxlarge,form select.xxlarge{width:530px;} -form textarea.xxlarge{overflow-y:scroll;} -form input[readonly]:focus,form textarea[readonly]:focus,form input.disabled{background:#f5f5f5;border-color:#ddd;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} +.input-mini,input.mini,textarea.mini,select.mini{width:60px;} +.input-small,input.small,textarea.small,select.small{width:90px;} +.input-medium,input.medium,textarea.medium,select.medium{width:150px;} +.input-large,input.large,textarea.large,select.large{width:210px;} +.input-xlarge,input.xlarge,textarea.xlarge,select.xlarge{width:270px;} +.input-xxlarge,input.xxlarge,textarea.xxlarge,select.xxlarge{width:530px;} +textarea.xxlarge{overflow-y:scroll;} +input[readonly]:focus,textarea[readonly]:focus,input.disabled{background:#f5f5f5;border-color:#ddd;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .actions{background:#f5f5f5;margin-top:18px;margin-bottom:18px;padding:17px 20px 18px 150px;border-top:1px solid #ddd;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;}.actions .secondary-action{float:right;}.actions .secondary-action a{line-height:30px;}.actions .secondary-action a:hover{text-decoration:underline;} .help-inline,.help-block{font-size:12px;line-height:18px;color:#bfbfbf;} .help-inline{padding-left:5px;*position:relative;*top:-5px;} @@ -128,13 +145,13 @@ form input[readonly]:focus,form textarea[readonly]:focus,form input.disabled{bac .inputs-list li ul.inputs-list{margin-left:25px;margin-bottom:10px;padding-top:0;} .inputs-list li:first-child{padding-top:5px;} .inputs-list input[type=radio],.inputs-list input[type=checkbox]{margin-bottom:0;} -form.form-stacked{padding-left:20px;}form.form-stacked fieldset{padding-top:9px;} -form.form-stacked legend{margin-left:0;} -form.form-stacked label{display:block;float:none;width:auto;font-weight:bold;text-align:left;line-height:20px;padding-top:0;} -form.form-stacked .clearfix{margin-bottom:9px;}form.form-stacked .clearfix div.input{margin-left:0;} -form.form-stacked .inputs-list{margin-bottom:0;}form.form-stacked .inputs-list li{padding-top:0;}form.form-stacked .inputs-list li label{font-weight:normal;padding-top:0;} -form.form-stacked div.error{padding-top:10px;padding-bottom:10px;padding-left:10px;margin-top:0;margin-left:-10px;} -form.form-stacked .actions{margin-left:-20px;padding-left:20px;} +.form-stacked{padding-left:20px;}.form-stacked fieldset{padding-top:9px;} +.form-stacked legend{margin-left:0;} +.form-stacked label{display:block;float:none;width:auto;font-weight:bold;text-align:left;line-height:20px;padding-top:0;} +.form-stacked .clearfix{margin-bottom:9px;}.form-stacked .clearfix div.input{margin-left:0;} +.form-stacked .inputs-list{margin-bottom:0;}.form-stacked .inputs-list li{padding-top:0;}.form-stacked .inputs-list li label{font-weight:normal;padding-top:0;} +.form-stacked div.error{padding-top:10px;padding-bottom:10px;padding-left:10px;margin-top:0;margin-left:-10px;} +.form-stacked .actions{margin-left:-20px;padding-left:20px;} table{width:100%;margin-bottom:18px;padding:0;border-collapse:separate;font-size:13px;}table th,table td{padding:10px 10px 9px;line-height:13.5px;text-align:left;vertical-align:middle;border-bottom:1px solid #ddd;} table th{padding-top:9px;font-weight:bold;border-bottom-width:2px;} .zebra-striped tbody tr:nth-child(odd) td{background-color:#f9f9f9;} @@ -193,7 +210,7 @@ footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;} .block-message.warning{background:#fff0c0;border:1px solid #ffe38d;} .block-message.success{background:#dff1df;border:1px solid #bbe2bb;} .block-message.info{background:#c7eefe;border:1px solid #ade6fe;} -.tabs,.pills{margin:0 0 20px;padding:0;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";} +.tabs,.pills{margin:0 0 20px;padding:0;zoom:1;margin-bottom:18px;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";} .tabs:after,.pills:after{clear:both;} .tabs li,.pills li{display:inline;}.tabs li a,.pills li a{float:left;width:auto;} .tabs{width:100%;border-bottom:1px solid #bfbfbf;}.tabs li a{margin-bottom:-1px;margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}.tabs li a:hover{background-color:#e6e6e6;border-bottom:1px solid #bfbfbf;} @@ -208,7 +225,7 @@ footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;} .modal-backdrop{background-color:rgba(0, 0, 0, 0.5);position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;} .modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}.modal .modal-header a.close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;} .modal .modal-body{padding:20px;} -.modal .modal-footer{background-color:#f5f5f5;padding:14px 20px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;}.modal .modal-footer:before,.modal .modal-footer:after{display:table;content:"";} +.modal .modal-footer{background-color:#f5f5f5;padding:14px 20px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;margin-bottom:18px;margin-bottom:0;}.modal .modal-footer:before,.modal .modal-footer:after{display:table;content:"";} .modal .modal-footer:after{clear:both;} .modal .modal-footer .btn{float:right;margin-left:10px;} .twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:1000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}.twipsy.above .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} diff --git a/lib/forms.less b/lib/forms.less index 4265f8e590..cfcdb3f17c 100644 --- a/lib/forms.less +++ b/lib/forms.less @@ -8,174 +8,176 @@ form { margin-bottom: @baseline; +} - // Groups of fields with labels on top (legends) - fieldset { - margin-bottom: @baseline; - padding-top: @baseline; - legend { - display: block; - margin-left: 150px; - font-size: 20px; - line-height: 1; - *margin: 0 0 5px 145px; /* IE6-7 */ - *line-height: 1.5; /* IE6-7 */ - color: @grayDark; - } - } - - // Parent element that clears floats and wraps labels and fields together - .clearfix { - margin-bottom: @baseline; - } - - // Set font for forms - label, input, select, textarea { - #font > .sans-serif(normal,13px,normal); - } - - // Float labels left - label { - padding-top: 6px; - font-size: 13px; - line-height: 18px; - float: left; - width: 130px; - text-align: right; +// Groups of fields with labels on top (legends) +fieldset { + margin-bottom: @baseline; + padding-top: @baseline; + legend { + display: block; + margin-left: 150px; + font-size: 20px; + line-height: 1; + *margin: 0 0 5px 145px; /* IE6-7 */ + *line-height: 1.5; /* IE6-7 */ color: @grayDark; } +} - // Shift over the inside div to align all label's relevant content - div.input { - margin-left: 150px; +// Parent element that clears floats and wraps labels and fields together +.clearfix { + margin-bottom: @baseline; +} + +// Set font for forms +label, +input, +select, +textarea { + #font > .sans-serif(normal,13px,normal); +} + +// Float labels left +label { + padding-top: 6px; + font-size: 13px; + line-height: 18px; + float: left; + width: 130px; + text-align: right; + color: @grayDark; +} + +// Shift over the inside div to align all label's relevant content +div.input { + margin-left: 150px; +} + +// Checkboxs and radio buttons +input[type=checkbox], +input[type=radio] { + cursor: pointer; +} + +// Inputs, Textareas, Selects +input[type=text], +input[type=password], +textarea, +select, +.uneditable-input { + display: inline-block; + width: 210px; + padding: 4px; + font-size: 13px; + line-height: @baseline; + height: @baseline; + color: @gray; + border: 1px solid #ccc; + .border-radius(3px); +} +select, +input[type=file] { + height: @baseline * 1.5; + line-height: @baseline * 1.5; +} +textarea { + height: auto; +} +.uneditable-input { + background-color: #eee; + display: block; + border-color: #ccc; + .box-shadow(inset 0 1px 2px rgba(0,0,0,.075)); +} + +// Placeholder text gets special styles; can't be bundled together though for some reason +:-moz-placeholder { + color: @grayLight; +} +::-webkit-input-placeholder { + color: @grayLight; +} + +// Focus states +input[type=text], +input[type=password], +select, textarea { + @transition: border linear .2s, box-shadow linear .2s; + .transition(@transition); + .box-shadow(inset 0 1px 3px rgba(0,0,0,.1)); +} +input[type=text]:focus, +input[type=password]:focus, +textarea:focus { + outline: none; + border-color: rgba(82,168,236,.8); + @shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6); + .box-shadow(@shadow); +} + +// Error styles +form div.error { + background: lighten(@red, 57%); + padding: 10px 0; + margin: -10px 0 10px; + .border-radius(4px); + @error-text: desaturate(lighten(@red, 25%), 25%); + > label, + span.help-inline, + span.help-block { + color: @red; } - - // Checkboxs and radio buttons - input[type=checkbox], - input[type=radio] { - cursor: pointer; - } - - // Inputs, Textareas, Selects input[type=text], input[type=password], - textarea, - select, - .uneditable-input { - display: inline-block; - width: 210px; - margin: 0; - padding: 4px; - font-size: 13px; - line-height: @baseline; - height: @baseline; - color: @gray; - border: 1px solid #ccc; - .border-radius(3px); - } - select, - input[type=file] { - height: @baseline * 1.5; - line-height: @baseline * 1.5; - } textarea { - height: auto; - } - .uneditable-input { - background-color: #eee; - display: block; - border-color: #ccc; - .box-shadow(inset 0 1px 2px rgba(0,0,0,.075)); - } - - // Placeholder text gets special styles; can't be bundled together though for some reason - :-moz-placeholder { - color: @grayLight; - } - ::-webkit-input-placeholder { - color: @grayLight; - } - - // Focus states - input[type=text], - input[type=password], - select, textarea { - @transition: border linear .2s, box-shadow linear .2s; - .transition(@transition); - .box-shadow(inset 0 1px 3px rgba(0,0,0,.1)); - } - input[type=text]:focus, - input[type=password]:focus, - textarea:focus { - outline: none; - border-color: rgba(82,168,236,.8); - @shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6); - .box-shadow(@shadow); - } - - // Error styles - div.error { - background: lighten(@red, 57%); - padding: 10px 0; - margin: -10px 0 10px; - .border-radius(4px); - @error-text: desaturate(lighten(@red, 25%), 25%); - > label, - span.help-inline, - span.help-block { - color: @red; + border-color: @error-text; + .box-shadow(0 0 3px rgba(171,41,32,.25)); + &:focus { + border-color: darken(@error-text, 10%); + .box-shadow(0 0 6px rgba(171,41,32,.5)); } - input[type=text], - input[type=password], - textarea { + } + .input-prepend, + .input-append { + span.add-on { + background: lighten(@red, 50%); border-color: @error-text; - .box-shadow(0 0 3px rgba(171,41,32,.25)); - &:focus { - border-color: darken(@error-text, 10%); - .box-shadow(0 0 6px rgba(171,41,32,.5)); - } - } - .input-prepend, - .input-append { - span.add-on { - background: lighten(@red, 50%); - border-color: @error-text; - color: darken(@error-text, 10%); - } + color: darken(@error-text, 10%); } } +} - // Form element sizes - .input-mini, input.mini, textarea.mini, select.mini { - width: 60px; - } - .input-small, input.small, textarea.small, select.small { - width: 90px; - } - .input-medium, input.medium, textarea.medium, select.medium { - width: 150px; - } - .input-large, input.large, textarea.large, select.large { - width: 210px; - } - .input-xlarge, input.xlarge, textarea.xlarge, select.xlarge { - width: 270px; - } - .input-xxlarge, input.xxlarge, textarea.xxlarge, select.xxlarge { - width: 530px; - } - textarea.xxlarge { - overflow-y: scroll; - } +// Form element sizes +.input-mini, input.mini, textarea.mini, select.mini { + width: 60px; +} +.input-small, input.small, textarea.small, select.small { + width: 90px; +} +.input-medium, input.medium, textarea.medium, select.medium { + width: 150px; +} +.input-large, input.large, textarea.large, select.large { + width: 210px; +} +.input-xlarge, input.xlarge, textarea.xlarge, select.xlarge { + width: 270px; +} +.input-xxlarge, input.xxlarge, textarea.xxlarge, select.xxlarge { + width: 530px; +} +textarea.xxlarge { + overflow-y: scroll; +} - // Turn off focus for disabled (read-only) form elements - input[readonly]:focus, - textarea[readonly]:focus, - input.disabled { - background: #f5f5f5; - border-color: #ddd; - .box-shadow(none); - } +// Turn off focus for disabled (read-only) form elements +input[readonly]:focus, +textarea[readonly]:focus, +input.disabled { + background: #f5f5f5; + border-color: #ddd; + .box-shadow(none); } // Actions (the buttons) @@ -261,13 +263,11 @@ form { border-color: @green; } } - .input-prepend { .add-on { *margin-top: 1px; /* IE6-7 */ } } - .input-append { input[type=text] { float: left; @@ -320,7 +320,7 @@ form { } // Stacked forms -form.form-stacked { +.form-stacked { padding-left: 20px; fieldset { padding-top: @baseline / 2; @@ -364,4 +364,4 @@ form.form-stacked { margin-left: -20px; padding-left: 20px; } -} +} \ No newline at end of file diff --git a/lib/patterns.less b/lib/patterns.less index fd728e6e7b..0fbdc9d865 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -558,6 +558,7 @@ footer { .border-radius(0 0 6px 6px); .box-shadow(inset 0 1px 0 #fff); .clearfix(); + margin-bottom: 0; .btn { float: right; margin-left: 10px; diff --git a/lib/reset.less b/lib/reset.less index db1682202b..28802f559a 100644 --- a/lib/reset.less +++ b/lib/reset.less @@ -4,7 +4,7 @@ // ERIC MEYER RESET -// ---------------- +// -------------------------------------------------- html, body { margin: 0; padding: 0; } h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, cite, code, del, dfn, em, img, q, s, samp, small, strike, strong, sub, sup, tt, var, dd, dl, dt, li, ol, ul, fieldset, form, label, legend, button, table, caption, tbody, tfoot, thead, tr, th, td { margin: 0; padding: 0; border: 0; font-weight: normal; font-style: normal; font-size: 100%; line-height: 1; font-family: inherit; } @@ -13,9 +13,133 @@ ol, ul { list-style: none; } q:before, q:after, blockquote:before, blockquote:after { content: ""; } -// HTML5 -// ----- +// Normalize.css +// Pulling in select resets form the normalize.css project +// -------------------------------------------------- -header, section, footer, article, aside { +// Display in IE6-9 and FF3 +// ------------------------- +// Source: http://github.com/necolas/normalize.css +html { + overflow-y: scroll; + font-size: 100%; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; +} +// Focus states +a:focus { + outline: thin dotted; +} + +// Display in IE6-9 and FF3 +// ------------------------- +// Source: http://github.com/necolas/normalize.css +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +nav, +section { display: block; +} + +// Display block in IE6-9 and FF3 +// ------------------------- +// Source: http://github.com/necolas/normalize.css +audio, +canvas, +video { + display: inline-block; + *display: inline; + *zoom: 1; +} + +// Prevents modern browsers from displaying 'audio' without controls +// ------------------------- +// Source: http://github.com/necolas/normalize.css +audio:not([controls]) { + display: none; +} + +// Prevents sub and sup affecting line-height in all browsers +// ------------------------- +// Source: http://github.com/necolas/normalize.css +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} +sup { + top: -0.5em; +} +sub { + bottom: -0.25em; +} + +// Img border in a's and image quality +// ------------------------- +// Source: http://github.com/necolas/normalize.css +img { + border: 0; + -ms-interpolation-mode: bicubic; +} + +// Forms +// ------------------------- +// Source: http://github.com/necolas/normalize.css + +// Font size in all browsers, margin changes, misc consistency +button, +input, +select, +textarea { + font-size: 100%; + margin: 0; + vertical-align: baseline; + *vertical-align: middle; +} +button, +input { + line-height: normal; // FF3/4 have !important on line-height in UA stylesheet + *overflow: visible; // Inner spacing ie IE6/7 +} +button::-moz-focus-inner, +input::-moz-focus-inner { // Inner padding and border oddities in FF3/4 + border: 0; + padding: 0; +} +button, +input[type="button"], +input[type="reset"], +input[type="submit"] { + cursor: pointer; // Cursors on all buttons applied consistently + -webkit-appearance: button; // Style clicable inputs in iOS +} +input[type="search"] { // Appearance in Safari/Chrome + -webkit-appearance: textfield; + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5 +} +textarea { + overflow: auto; // Remove vertical scrollbar in IE6-9 + vertical-align: top; // Readability and alignment cross-browser +} +// Tables +// ------------------------- +// Source: http://github.com/necolas/normalize.css + +// Remove spacing between table cells +table { + border-collapse: collapse; + border-spacing: 0; } \ No newline at end of file diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 50f6c96cfb..1372306720 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -152,6 +152,7 @@ a { background-image: none; .opacity(65); cursor: default; + .box-shadow(none); } // this can't be included with the .disabled def because IE8 and below will drop it ;_; @@ -159,10 +160,13 @@ a { background-image: none; .opacity(65); cursor: default; - color: #fff; + .box-shadow(none); + &.primary { + color: #fff; + } } &:active { - @shadow: inset 0 3px 7px rgba(0,0,0,.1), 0 1px 2px rgba(0,0,0,.05); + @shadow: inset 0 3px 7px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); .box-shadow(@shadow); } } diff --git a/lib/type.less b/lib/type.less index 1091d149b2..7ee69f2f5b 100644 --- a/lib/type.less +++ b/lib/type.less @@ -130,7 +130,7 @@ em { line-height: inherit; } .muted { - color: @grayLighter; + color: @grayLight; } // Blockquotes @@ -181,5 +181,8 @@ pre { border: 1px solid #ccc; border: 1px solid rgba(0,0,0,.15); .border-radius(3px); + white-space: pre; white-space: pre-wrap; + word-wrap: break-word; + } \ No newline at end of file From 50f484eed6e9161cb7e50531b0fa3f16ada549e0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 25 Aug 2011 02:00:07 -0700 Subject: [PATCH 05/17] big update to change the alerts, normal and block level, to have simpler css and new colors independent of the base color scheme --- bootstrap-1.1.0.css | 205 ++++++++++++++++++++------------------- bootstrap-1.1.0.min.css | 31 +++--- docs/assets/css/docs.css | 3 + docs/index.html | 56 +++++------ lib/patterns.less | 161 +++++++++++++++--------------- lib/scaffolding.less | 4 +- 6 files changed, 234 insertions(+), 226 deletions(-) diff --git a/bootstrap-1.1.0.css b/bootstrap-1.1.0.css index ee0cc3fdfa..246094daf9 100644 --- a/bootstrap-1.1.0.css +++ b/bootstrap-1.1.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Wed Aug 24 19:43:43 PDT 2011 + * Date: Thu Aug 25 01:55:33 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -127,7 +127,7 @@ aside { * ------------------------------------------------------------------------------------------- */ .row { zoom: 1; - margin: 0 -20px; + margin-left: -20px; } .row:before, .row:after { display: table; @@ -152,9 +152,9 @@ aside { .row .span14, .row .span15, .row .span16 { + display: inline; float: left; margin-left: 20px; - *display: inline; } .row .span1 { width: 40px; @@ -1324,86 +1324,103 @@ footer { .page-header h1 { margin-bottom: 8px; } -.alert-message { - background-color: rgba(0, 0, 0, 0.15); +.alert { + background-color: #eedc94; background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15))); - background-image: -moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15)); - background-image: -ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15)); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15))); - background-image: -webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15)); - background-image: -o-linear-gradient(transparent, rgba(0, 0, 0, 0.15)); - background-image: linear-gradient(transparent, rgba(0, 0, 0, 0.15)); - filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')"; - background-color: #e6e6e6; + background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94)); + background-image: -moz-linear-gradient(#fceec1, #eedc94); + background-image: -ms-linear-gradient(#fceec1, #eedc94); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94)); + background-image: -webkit-linear-gradient(#fceec1, #eedc94); + background-image: -o-linear-gradient(#fceec1, #eedc94); + background-image: linear-gradient(#fceec1, #eedc94); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border-color: #e7ce68 #e7ce68 #e4c652; + border-color: rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125); margin-bottom: 18px; - padding: 8px 15px; - color: #fff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3); - border-bottom: 1px solid rgba(0, 0, 0, 0.3); + padding: 7px 14px; + color: #404040; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + border-width: 1px; + border-style: solid; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); } -.alert-message p { - color: #fff; +.alert h5 { + line-height: 18px; +} +.alert p { margin-bottom: 0; } -.alert-message p + p { +.alert div { margin-top: 5px; + margin-bottom: 2px; + line-height: 28px; } -.alert-message.error { - background-color: #d83a2e; +.alert .btn { + -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); + -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); + box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); +} +.alert-error, +.alert-success, +.alert-info, +.alert-error h5, +.alert-success h5, +.alert-info h5 { + color: #fff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3); +} +.alert-error { + background-color: #d6463e; background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#e4776f), to(#d83a2e)); - background-image: -moz-linear-gradient(#e4776f, #d83a2e); - background-image: -ms-linear-gradient(#e4776f, #d83a2e); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #e4776f), color-stop(100%, #d83a2e)); - background-image: -webkit-linear-gradient(#e4776f, #d83a2e); - background-image: -o-linear-gradient(#e4776f, #d83a2e); - background-image: linear-gradient(#e4776f, #d83a2e); - border-bottom-color: #b32b21; + background-image: -khtml-gradient(linear, left top, left bottom, from(#f56a66), to(#d6463e)); + background-image: -moz-linear-gradient(#f56a66, #d6463e); + background-image: -ms-linear-gradient(#f56a66, #d6463e); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f56a66), color-stop(100%, #d6463e)); + background-image: -webkit-linear-gradient(#f56a66, #d6463e); + background-image: -o-linear-gradient(#f56a66, #d6463e); + background-image: linear-gradient(#f56a66, #d6463e); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border-color: #ba2f27 #ba2f27 #a52a23; + border-color: rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125); } -.alert-message.warning { - background-color: #ffd040; +.alert-success { + background-color: #57a957; background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#ffe38d), to(#ffd040)); - background-image: -moz-linear-gradient(#ffe38d, #ffd040); - background-image: -ms-linear-gradient(#ffe38d, #ffd040); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffe38d), color-stop(100%, #ffd040)); - background-image: -webkit-linear-gradient(#ffe38d, #ffd040); - background-image: -o-linear-gradient(#ffe38d, #ffd040); - background-image: linear-gradient(#ffe38d, #ffd040); - border-bottom-color: #ffc40d; + background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); + background-image: -moz-linear-gradient(#62c462, #57a957); + background-image: -ms-linear-gradient(#62c462, #57a957); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957)); + background-image: -webkit-linear-gradient(#62c462, #57a957); + background-image: -o-linear-gradient(#62c462, #57a957); + background-image: linear-gradient(#62c462, #57a957); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border-color: #458845 #458845 #3d773d; + border-color: rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125); } -.alert-message.success { - background-color: #62bc62; +.alert-info { + background-color: #36b3d9; background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#97d397), to(#62bc62)); - background-image: -moz-linear-gradient(#97d397, #62bc62); - background-image: -ms-linear-gradient(#97d397, #62bc62); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #97d397), color-stop(100%, #62bc62)); - background-image: -webkit-linear-gradient(#97d397, #62bc62); - background-image: -o-linear-gradient(#97d397, #62bc62); - background-image: linear-gradient(#97d397, #62bc62); - border-bottom-color: #46a546; + background-image: -khtml-gradient(linear, left top, left bottom, from(#6bd0ee), to(#36b3d9)); + background-image: -moz-linear-gradient(#6bd0ee, #36b3d9); + background-image: -ms-linear-gradient(#6bd0ee, #36b3d9); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #6bd0ee), color-stop(100%, #36b3d9)); + background-image: -webkit-linear-gradient(#6bd0ee, #36b3d9); + background-image: -o-linear-gradient(#6bd0ee, #36b3d9); + background-image: linear-gradient(#6bd0ee, #36b3d9); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border-color: #2396b9 #2396b9 #1f85a4; + border-color: rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125); } -.alert-message.info { - background-color: #04aef4; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#62cffc), to(#04aef4)); - background-image: -moz-linear-gradient(#62cffc, #04aef4); - background-image: -ms-linear-gradient(#62cffc, #04aef4); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62cffc), color-stop(100%, #04aef4)); - background-image: -webkit-linear-gradient(#62cffc, #04aef4); - background-image: -o-linear-gradient(#62cffc, #04aef4); - background-image: linear-gradient(#62cffc, #04aef4); - border-bottom-color: #049cdb; -} -.alert-message .close { +.close { float: right; margin-top: -2px; - color: #000; + color: #000000; font-size: 20px; font-weight: bold; text-shadow: 0 1px 0 #ffffff; @@ -1412,56 +1429,40 @@ footer { -moz-opacity: 0.2; opacity: 0.2; } -.alert-message .close:hover { +.close:hover { + color: #000000; text-decoration: none; filter: alpha(opacity=40); -khtml-opacity: 0.4; -moz-opacity: 0.4; opacity: 0.4; } -.block-message { - margin-bottom: 18px; +.alert-block { + background-image: none; + background-color: #fdf5d9; padding: 14px; - color: #404040; - color: rgba(0, 0, 0, 0.8); - *color: #404040; - /* IE 6-7 */ - - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; + border-color: #fceec1; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; } -.block-message p { - color: #404040; - color: rgba(0, 0, 0, 0.8); - *color: #404040; - /* IE 6-7 */ - +.alert-block p { margin-right: 30px; - margin-bottom: 0; } -.block-message ul { - margin-bottom: 0; +.alert-block .alert-actions { + margin-top: 5px; } -.block-message strong { - display: block; +.alert-block.error { + background-color: #fddfde; + border-color: #fbc7c6; } -.block-message.error { - background: #f8dcda; - border: 1px solid #f4c8c5; +.alert-block.success { + background-color: #d1eed1; + border-color: #bfe7bf; } -.block-message.warning { - background: #fff0c0; - border: 1px solid #ffe38d; -} -.block-message.success { - background: #dff1df; - border: 1px solid #bbe2bb; -} -.block-message.info { - background: #c7eefe; - border: 1px solid #ade6fe; +.alert-block.info { + background-color: #ddf4fb; + border-color: #c6edf9; } .tabs, .pills { margin: 0 0 20px; diff --git a/bootstrap-1.1.0.min.css b/bootstrap-1.1.0.min.css index 9d7fa25e05..5e273bf8e8 100644 --- a/bootstrap-1.1.0.min.css +++ b/bootstrap-1.1.0.min.css @@ -9,9 +9,9 @@ header,section,footer,article,aside{display:block;} .center-block{display:block;margin:0 auto;} .container{width:940px;margin:0 auto;zoom:1;}.container:before,.container:after{display:table;content:"";} .container:after{clear:both;} -.row{zoom:1;margin:0 -20px;}.row:before,.row:after{display:table;content:"";} +.row{zoom:1;margin-left:-20px;}.row:before,.row:after{display:table;content:"";} .row:after{clear:both;} -.row .span1,.row .span2,.row .span3,.row .span4,.row .span5,.row .span6,.row .span7,.row .span8,.row .span9,.row .span10,.row .span11,.row .span12,.row .span13,.row .span14,.row .span15,.row .span16{float:left;margin-left:20px;*display:inline;} +.row .span1,.row .span2,.row .span3,.row .span4,.row .span5,.row .span6,.row .span7,.row .span8,.row .span9,.row .span10,.row .span11,.row .span12,.row .span13,.row .span14,.row .span15,.row .span16{display:inline;float:left;margin-left:20px;} .row .span1{width:40px;} .row .span2{width:100px;} .row .span3{width:160px;} @@ -182,19 +182,20 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .hero-unit p{font-size:18px;font-weight:200;line-height:27px;} footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;} .page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}.page-header h1{margin-bottom:8px;} -.alert-message{background-color:rgba(0, 0, 0, 0.15);background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));background-image:-moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));background-image:-webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')";background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.3);border-bottom:1px solid rgba(0, 0, 0, 0.3);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.alert-message p{color:#fff;margin-bottom:0;}.alert-message p+p{margin-top:5px;} -.alert-message.error{background-color:#d83a2e;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#e4776f), to(#d83a2e));background-image:-moz-linear-gradient(#e4776f, #d83a2e);background-image:-ms-linear-gradient(#e4776f, #d83a2e);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #e4776f), color-stop(100%, #d83a2e));background-image:-webkit-linear-gradient(#e4776f, #d83a2e);background-image:-o-linear-gradient(#e4776f, #d83a2e);background-image:linear-gradient(#e4776f, #d83a2e);border-bottom-color:#b32b21;} -.alert-message.warning{background-color:#ffd040;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffe38d), to(#ffd040));background-image:-moz-linear-gradient(#ffe38d, #ffd040);background-image:-ms-linear-gradient(#ffe38d, #ffd040);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffe38d), color-stop(100%, #ffd040));background-image:-webkit-linear-gradient(#ffe38d, #ffd040);background-image:-o-linear-gradient(#ffe38d, #ffd040);background-image:linear-gradient(#ffe38d, #ffd040);border-bottom-color:#ffc40d;} -.alert-message.success{background-color:#62bc62;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#97d397), to(#62bc62));background-image:-moz-linear-gradient(#97d397, #62bc62);background-image:-ms-linear-gradient(#97d397, #62bc62);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #97d397), color-stop(100%, #62bc62));background-image:-webkit-linear-gradient(#97d397, #62bc62);background-image:-o-linear-gradient(#97d397, #62bc62);background-image:linear-gradient(#97d397, #62bc62);border-bottom-color:#46a546;} -.alert-message.info{background-color:#04aef4;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62cffc), to(#04aef4));background-image:-moz-linear-gradient(#62cffc, #04aef4);background-image:-ms-linear-gradient(#62cffc, #04aef4);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62cffc), color-stop(100%, #04aef4));background-image:-webkit-linear-gradient(#62cffc, #04aef4);background-image:-o-linear-gradient(#62cffc, #04aef4);background-image:linear-gradient(#62cffc, #04aef4);border-bottom-color:#049cdb;} -.alert-message .close{float:right;margin-top:-2px;color:#000;font-size:20px;font-weight:bold;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}.alert-message .close:hover{text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;} -.block-message{margin-bottom:18px;padding:14px;color:#404040;color:rgba(0, 0, 0, 0.8);*color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.block-message p{color:#404040;color:rgba(0, 0, 0, 0.8);*color:#404040;margin-right:30px;margin-bottom:0;} -.block-message ul{margin-bottom:0;} -.block-message strong{display:block;} -.block-message.error{background:#f8dcda;border:1px solid #f4c8c5;} -.block-message.warning{background:#fff0c0;border:1px solid #ffe38d;} -.block-message.success{background:#dff1df;border:1px solid #bbe2bb;} -.block-message.info{background:#c7eefe;border:1px solid #ade6fe;} +.alert{background-color:#eedc94;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(#fceec1, #eedc94);background-image:-ms-linear-gradient(#fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(#fceec1, #eedc94);background-image:-o-linear-gradient(#fceec1, #eedc94);background-image:linear-gradient(#fceec1, #eedc94);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#e7ce68 #e7ce68 #e4c652;border-color:rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125);margin-bottom:18px;padding:7px 14px;color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);}.alert h5{line-height:18px;} +.alert p{margin-bottom:0;} +.alert div{margin-top:5px;margin-bottom:2px;line-height:28px;} +.alert .btn{-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);} +.alert-error,.alert-success,.alert-info,.alert-error h5,.alert-success h5,.alert-info h5{color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.3);} +.alert-error{background-color:#d6463e;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#f56a66), to(#d6463e));background-image:-moz-linear-gradient(#f56a66, #d6463e);background-image:-ms-linear-gradient(#f56a66, #d6463e);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #f56a66), color-stop(100%, #d6463e));background-image:-webkit-linear-gradient(#f56a66, #d6463e);background-image:-o-linear-gradient(#f56a66, #d6463e);background-image:linear-gradient(#f56a66, #d6463e);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#ba2f27 #ba2f27 #a52a23;border-color:rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125);} +.alert-success{background-color:#57a957;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));background-image:-moz-linear-gradient(#62c462, #57a957);background-image:-ms-linear-gradient(#62c462, #57a957);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));background-image:-webkit-linear-gradient(#62c462, #57a957);background-image:-o-linear-gradient(#62c462, #57a957);background-image:linear-gradient(#62c462, #57a957);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#458845 #458845 #3d773d;border-color:rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125);} +.alert-info{background-color:#36b3d9;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#6bd0ee), to(#36b3d9));background-image:-moz-linear-gradient(#6bd0ee, #36b3d9);background-image:-ms-linear-gradient(#6bd0ee, #36b3d9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #6bd0ee), color-stop(100%, #36b3d9));background-image:-webkit-linear-gradient(#6bd0ee, #36b3d9);background-image:-o-linear-gradient(#6bd0ee, #36b3d9);background-image:linear-gradient(#6bd0ee, #36b3d9);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#2396b9 #2396b9 #1f85a4;border-color:rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125);} +.close{float:right;margin-top:-2px;color:#000000;font-size:20px;font-weight:bold;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;} +.alert-block{background-image:none;background-color:#fdf5d9;padding:14px;border-color:#fceec1;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.alert-block p{margin-right:30px;} +.alert-block .alert-actions{margin-top:5px;} +.alert-block.error{background-color:#fddfde;border-color:#fbc7c6;} +.alert-block.success{background-color:#d1eed1;border-color:#bfe7bf;} +.alert-block.info{background-color:#ddf4fb;border-color:#c6edf9;} .tabs,.pills{margin:0 0 20px;padding:0;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";} .tabs:after,.pills:after{clear:both;} .tabs li,.pills li{display:inline;}.tabs li a,.pills li a{float:left;width:auto;} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b7d241994b..8334d3f12f 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -13,6 +13,9 @@ body { section { padding-top: 60px; } +section > .row { + margin-bottom: 10px; +} #masthead, #footer { background-color: #049cd9; background-repeat: no-repeat; diff --git a/docs/index.html b/docs/index.html index 503be111b9..ebaa5a6f3a 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1069,22 +1069,23 @@

Basic alerts

+

div.alert

One-line messages for highlighting the failure, possible failure, or success of an action. Particularly useful for forms.

-
+
×

Oh snap! Change this and that and try again.

-
+
×

Holy gaucamole! Best check yo self, you’re not looking too good.

-
+
×

Well done! You successfully read this alert message.

-
+
×

Heads up! This is an alert that needs your attention, but it’s not a huge priority just yet.

@@ -1094,28 +1095,37 @@

Block messages

+

div.alert.alert-block

For messages that require a bit of explanation, we have paragraph style alerts. These are perfect for bubbling up longer error messages, warning a user of a pending action, or just presenting information for more emphasis on the page.

-
+
×

Oh snap! You got an error! Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.

-

Take this action Or do this

+
+ Take this action Or do this +
-
+
×

Holy gaucamole! This is a warning! Best check yo self, you’re not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

-

Take this action Or do this

+
+ Take this action Or do this +
-
+
×

Well done! You successfully read this alert message. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Maecenas faucibus mollis interdum.

-

Take this action Or do this

+
+ Take this action Or do this +
-
+
×

Heads up! This is an alert that needs your attention, but it’s not a huge priority just yet.

-

Take this action Or do this

+
+ Take this action Or do this +
@@ -1234,7 +1244,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita

What’s included

Here are some of the highlights of what’s included in Twitter Bootstrap as part of Bootstrap. Head over to the Bootstrap website or Github project page to download and learn more.

-

Color variables

+

Variables

Variables in Less are perfect for maintaining and updating your CSS headache free. When you want to change a color value or a frequently used value, update it in one spot and you’re set.

 // Links
@@ -1258,8 +1268,9 @@ Lorem ipsum dolar sit amet illo error ipsum verita
 @pink:              #c3325f;
 @purple:            #7a43b6;
 
-// Baseline
-@baseline:          20px;
+// Baseline grid
+@basefont:          13px;
+@baseline:          18px;

Commenting

@@ -1311,8 +1322,6 @@ Lorem ipsum dolar sit amet illo error ipsum verita background-image: -webkit-gradient(linear, left top, right top, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+ background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+ background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10 - -ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor); // IE8+ - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE6 & IE7 background-image: linear-gradient(left, @startColor, @endColor); // Le standard } .vertical (@startColor: #555, @endColor: #333) { @@ -1324,14 +1333,12 @@ Lorem ipsum dolar sit amet illo error ipsum verita background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+ background-image: -webkit-linear-gradient(@startColor, @endColor); // Safari 5.1+, Chrome 10+ background-image: -o-linear-gradient(@startColor, @endColor); // Opera 11.10 - -ms-filter: %("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor); // IE8+ - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE6 & IE7 background-image: linear-gradient(@startColor, @endColor); // The standard } .directional (@startColor: #555, @endColor: #333, @deg: 45deg) { ... } - .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 0.5, @endColor: #c3325f) { + .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) { ... } } @@ -1344,6 +1351,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita @gridColumns: 16; @gridColumnWidth: 40px; @gridGutterWidth: 20px; +@siteWidth: (@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1)); // Grid System .container { @@ -1352,16 +1360,10 @@ Lorem ipsum dolar sit amet illo error ipsum verita .clearfix(); } .columns(@columnSpan: 1) { - display: inline; - float: left; width: (@gridColumnWidth * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)); - margin-left: @gridGutterWidth; - &:first-child { - margin-left: 0; - } } .offset(@columnOffset: 1) { - margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) !important; + margin-left: (@gridColumnWidth * @columnOffset) + (@gridGutterWidth * (@columnOffset - 1)) + @extraSpace; }
diff --git a/lib/patterns.less b/lib/patterns.less index ec42b033c1..466727cc42 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -292,95 +292,96 @@ footer { // ERROR STYLES // ------------ -// One-liner alert bars -.alert-message { - // TODO: Ask cloudhead how to do this fancy filter elegantly. Less eval is returning strings with quotes ;_; - #gradient > .vertical(transparent, rgba(0,0,0,0.15)); - filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#15000000')"; - background-color: @grayLighter; - margin-bottom: @baseline; - padding: 8px 15px; - color: #fff; - text-shadow: 0 -1px 0 rgba(0,0,0,.3); - border-bottom: 1px solid rgba(0,0,0,.3); - .border-radius(4px); - p { - color: #fff; - margin-bottom: 0; - + p { - margin-top: 5px; - } - } - &.error { - #gradient > .vertical(lighten(@red, 30%), lighten(@red, 15%)); - border-bottom-color: lighten(@red, 5%); - } - &.warning { - #gradient > .vertical(lighten(@yellow, 25%), lighten(@yellow, 10%)); - border-bottom-color: @yellow; - } - &.success { - #gradient > .vertical(lighten(@green, 25%), lighten(@green, 10%)); - border-bottom-color: @green; - } - &.info { - #gradient > .vertical(lighten(@blue, 25%), lighten(@blue, 5%)); - border-bottom-color: @blue; - } - .close { - float: right; - margin-top: -2px; - color: #000; - font-size: 20px; - font-weight: bold; - text-shadow: 0 1px 0 rgba(255,255,255,1); - .opacity(20); - &:hover { - text-decoration: none; - .opacity(40); - } - } +// Setup a mixin to colorize different alerts +.alertTheme(@primaryColor, @secondaryColor) { + #gradient > .vertical(@primaryColor, @secondaryColor); + text-shadow: 0 -1px 0 rgba(0,0,0,.25); + border-color: darken(@secondaryColor, 10%) darken(@secondaryColor, 10%) darken(@secondaryColor, 15%); + border-color: rgba(0,0,0,.05) rgba(0,0,0,.075) rgba(0,0,0,.125); } -// Block-level Alerts -.block-message { +// Base alert styles +.alert { + .alertTheme(#fceec1, #eedc94); margin-bottom: @baseline; - padding: 14px; + padding: 7px 14px; color: @grayDark; - color: rgba(0,0,0,.8); - *color: @grayDark; /* IE 6-7 */ - text-shadow: 0 1px 0 rgba(255,255,255,.25); - .border-radius(6px); + text-shadow: 0 1px 0 rgba(255,255,255,.5); + border-width: 1px; + border-style: solid; + .border-radius(4px); + .box-shadow(inset 0 1px 0 rgba(255,255,255,.25)); + // Remove extra margin from content + h5 { + line-height: @baseline; + } + p { + margin-bottom: 0; + } + div { + margin-top: 5px; + margin-bottom: 2px; + line-height: 28px; + } + // Provide actions with buttons + .btn { + .box-shadow(0 1px 0 rgba(255,255,255,.25)); + } +} +// Alternate alerts +.alert-error, +.alert-success, +.alert-info, +.alert-error h5, +.alert-success h5, +.alert-info h5 { + color: #fff; + text-shadow: 0 -1px 0 rgba(0,0,0,.3); +} +.alert-error { .alertTheme(#f56a66, #d6463e); } +.alert-success { .alertTheme(#62c462, #57a957); } +.alert-info { .alertTheme(#6bd0ee, #36b3d9); } +// Close action +.close { + float: right; + margin-top: -2px; + color: @black; + font-size: 20px; + font-weight: bold; + text-shadow: 0 1px 0 rgba(255,255,255,1); + .opacity(20); + &:hover { + color: @black; + text-decoration: none; + .opacity(40); + } +} +// Block-level alerts +.alert-block { + background-image: none; + background-color: lighten(#fceec1, 5%); + padding: 14px; + border-color: #fceec1; + .box-shadow(none); p { - color: @grayDark; - color: rgba(0,0,0,.8); - *color: @grayDark; /* IE 6-7 */ margin-right: 30px; - margin-bottom: 0; } - ul { - margin-bottom: 0; - } - strong { - display: block; - } - &.error { - background: lighten(@red, 55%); - border: 1px solid lighten(@red, 50%); - } - &.warning { - background: lighten(@yellow, 35%); - border: 1px solid lighten(@yellow, 25%) - } - &.success { - background: lighten(@green, 45%); - border: 1px solid lighten(@green, 35%) - } - &.info { - background: lighten(@blue, 45%); - border: 1px solid lighten(@blue, 40%); + .alert-actions { + margin-top: 5px; } } +.alert-block.error { + background-color: lighten(#f56a66, 25%); + border-color: lighten(#f56a66, 20%); +} +.alert-block.success { + background-color: lighten(#62c462, 30%); + border-color: lighten(#62c462, 25%); +} +.alert-block.info { + background-color: lighten(#6bd0ee, 25%); + border-color: lighten(#6bd0ee, 20%); +} // NAVIGATION diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 5dc054f93b..f5bc68868c 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -9,7 +9,7 @@ .row { .clearfix(); - margin: 0 -20px; + margin-left: -20px; // Default columns .span1, @@ -28,9 +28,9 @@ .span14, .span15, .span16 { + display: inline; float: left; margin-left: 20px; - *display: inline; // IE6 double margin bug fix. } // Default columns From 0e9d7c1c4d9552dda438d6eb5d2f175a99fd4501 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 25 Aug 2011 13:31:46 -0700 Subject: [PATCH 06/17] update alert and button styling aproach --- bootstrap-1.1.0.css | 344 +++++++++++++++++++++------------------- bootstrap-1.1.0.min.css | 41 +++-- docs/index.html | 14 +- lib/patterns.less | 195 +++++++++++++++-------- lib/preboot.less | 51 +++++- lib/scaffolding.less | 88 +--------- 6 files changed, 383 insertions(+), 350 deletions(-) diff --git a/bootstrap-1.1.0.css b/bootstrap-1.1.0.css index 246094daf9..34b9d085f3 100644 --- a/bootstrap-1.1.0.css +++ b/bootstrap-1.1.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Thu Aug 25 01:55:33 PDT 2011 + * Date: Thu Aug 25 13:30:35 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -121,6 +121,79 @@ aside { .container:after { clear: both; } +.btn.danger, +.alert.danger, +.btn.danger:hover, +.alert.danger:hover, +.btn.error, +.alert.error, +.btn.error:hover, +.alert.error:hover, +.btn.success, +.alert.success, +.btn.success:hover, +.alert.success:hover, +.btn.info, +.alert.info, +.btn.info:hover, +.alert.info:hover { + color: #ffffff; +} +.btn.danger, +.alert.danger, +.btn.danger:hover, +.alert.danger:hover, +.btn.error, +.alert.error, +.btn.error:hover, +.alert.error:hover { + background-color: #d6463e; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#f56a66), to(#d6463e)); + background-image: -moz-linear-gradient(#f56a66, #d6463e); + background-image: -ms-linear-gradient(#f56a66, #d6463e); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f56a66), color-stop(100%, #d6463e)); + background-image: -webkit-linear-gradient(#f56a66, #d6463e); + background-image: -o-linear-gradient(#f56a66, #d6463e); + background-image: linear-gradient(#f56a66, #d6463e); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border-color: #d6463e #d6463e #a52a23; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); +} +.btn.success, +.alert.success, +.btn.success:hover, +.alert.success:hover { + background-color: #57a957; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); + background-image: -moz-linear-gradient(#62c462, #57a957); + background-image: -ms-linear-gradient(#62c462, #57a957); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957)); + background-image: -webkit-linear-gradient(#62c462, #57a957); + background-image: -o-linear-gradient(#62c462, #57a957); + background-image: linear-gradient(#62c462, #57a957); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border-color: #57a957 #57a957 #3d773d; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); +} +.btn.info, +.alert.info, +.btn.info:hover, +.alert.info:hover { + background-color: #36b3d9; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#6bd0ee), to(#36b3d9)); + background-image: -moz-linear-gradient(#6bd0ee, #36b3d9); + background-image: -ms-linear-gradient(#6bd0ee, #36b3d9); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #6bd0ee), color-stop(100%, #36b3d9)); + background-image: -webkit-linear-gradient(#6bd0ee, #36b3d9); + background-image: -o-linear-gradient(#6bd0ee, #36b3d9); + background-image: linear-gradient(#6bd0ee, #36b3d9); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border-color: #36b3d9 #36b3d9 #1f85a4; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); +} /* * Scaffolding * Basic and global styles for generating a grid system, structural layout, and page templates @@ -286,110 +359,6 @@ a:hover { color: #0050a3; text-decoration: underline; } -.btn { - cursor: pointer; - display: inline-block; - background-color: #e6e6e6; - background-repeat: no-repeat; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6); - background-image: -moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6); - background-image: -ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6); - background-image: -o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6); - background-image: linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6); - padding: 5px 14px 6px; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - color: #333; - font-size: 13px; - line-height: normal; - border: 1px solid #ccc; - border-bottom-color: #bbb; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -webkit-transition: 0.1s linear all; - -moz-transition: 0.1s linear all; - transition: 0.1s linear all; -} -.btn:hover { - background-position: 0 -15px; - color: #333; - text-decoration: none; -} -.btn.primary, -.btn.danger, -.btn.danger:hover, -.btn.primary:hover { - color: #fff; -} -.btn.primary { - background-color: #0064cd; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd)); - background-image: -moz-linear-gradient(#049cdb, #0064cd); - background-image: -ms-linear-gradient(#049cdb, #0064cd); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd)); - background-image: -webkit-linear-gradient(#049cdb, #0064cd); - background-image: -o-linear-gradient(#049cdb, #0064cd); - background-image: linear-gradient(#049cdb, #0064cd); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - border-color: #0064cd #0064cd #003f81; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} -.btn.danger { - background-color: #9d261d; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#d83a2e), to(#9d261d)); - background-image: -moz-linear-gradient(#d83a2e, #9d261d); - background-image: -ms-linear-gradient(#d83a2e, #9d261d); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #d83a2e), color-stop(100%, #9d261d)); - background-image: -webkit-linear-gradient(#d83a2e, #9d261d); - background-image: -o-linear-gradient(#d83a2e, #9d261d); - background-image: linear-gradient(#d83a2e, #9d261d); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - border-color: #9d261d #9d261d #5c1611; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} -.btn.disabled { - cursor: default; - background-image: none; - filter: alpha(opacity=65); - -khtml-opacity: 0.65; - -moz-opacity: 0.65; - opacity: 0.65; -} -.btn:disabled { - cursor: default; - background-image: none; - filter: alpha(opacity=65); - -khtml-opacity: 0.65; - -moz-opacity: 0.65; - opacity: 0.65; -} -.btn:active { - -webkit-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); -} -.btn.large { - font-size: 16px; - line-height: normal; - padding: 9px 14px 9px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} -.btn.small { - padding: 7px 9px 7px; - font-size: 11px; -} -button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { - padding: 0; - border: 0; -} /* Typography.less * Headings, body text, lists, code, and more for a versatile and durable typography system * ---------------------------------------------------------------------------------------- */ @@ -1324,6 +1293,91 @@ footer { .page-header h1 { margin-bottom: 8px; } +.btn { + cursor: pointer; + display: inline-block; + background-color: #e6e6e6; + background-repeat: no-repeat; + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6)); + background-image: -webkit-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6); + background-image: -moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6); + background-image: -ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6); + background-image: -o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6); + background-image: linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6); + padding: 5px 14px 6px; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); + color: #333; + font-size: 13px; + line-height: normal; + border: 1px solid #ccc; + border-bottom-color: #bbb; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-transition: 0.1s linear all; + -moz-transition: 0.1s linear all; + transition: 0.1s linear all; +} +.btn:hover { + background-position: 0 -15px; + color: #333; + text-decoration: none; +} +.btn.disabled { + cursor: default; + background-image: none; + filter: alpha(opacity=65); + -khtml-opacity: 0.65; + -moz-opacity: 0.65; + opacity: 0.65; +} +.btn:disabled { + cursor: default; + background-image: none; + filter: alpha(opacity=65); + -khtml-opacity: 0.65; + -moz-opacity: 0.65; + opacity: 0.65; +} +.btn:active { + -webkit-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); +} +.btn.primary, .btn.primary:hover { + color: #fff; + background-color: #0064cd; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd)); + background-image: -moz-linear-gradient(#049cdb, #0064cd); + background-image: -ms-linear-gradient(#049cdb, #0064cd); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd)); + background-image: -webkit-linear-gradient(#049cdb, #0064cd); + background-image: -o-linear-gradient(#049cdb, #0064cd); + background-image: linear-gradient(#049cdb, #0064cd); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border-color: #0064cd #0064cd #003f81; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); +} +.btn.large { + font-size: 16px; + line-height: normal; + padding: 9px 14px 9px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.btn.small { + padding: 7px 9px 7px; + font-size: 11px; +} +button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { + padding: 0; + border: 0; +} .alert { background-color: #eedc94; background-repeat: repeat-x; @@ -1335,8 +1389,8 @@ footer { background-image: -o-linear-gradient(#fceec1, #eedc94); background-image: linear-gradient(#fceec1, #eedc94); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - border-color: #e7ce68 #e7ce68 #e4c652; - border-color: rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125); + border-color: #eedc94 #eedc94 #e4c652; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); margin-bottom: 18px; padding: 7px 14px; color: #404040; @@ -1366,58 +1420,7 @@ footer { -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); } -.alert-error, -.alert-success, -.alert-info, -.alert-error h5, -.alert-success h5, -.alert-info h5 { - color: #fff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.3); -} -.alert-error { - background-color: #d6463e; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#f56a66), to(#d6463e)); - background-image: -moz-linear-gradient(#f56a66, #d6463e); - background-image: -ms-linear-gradient(#f56a66, #d6463e); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f56a66), color-stop(100%, #d6463e)); - background-image: -webkit-linear-gradient(#f56a66, #d6463e); - background-image: -o-linear-gradient(#f56a66, #d6463e); - background-image: linear-gradient(#f56a66, #d6463e); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - border-color: #ba2f27 #ba2f27 #a52a23; - border-color: rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125); -} -.alert-success { - background-color: #57a957; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); - background-image: -moz-linear-gradient(#62c462, #57a957); - background-image: -ms-linear-gradient(#62c462, #57a957); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957)); - background-image: -webkit-linear-gradient(#62c462, #57a957); - background-image: -o-linear-gradient(#62c462, #57a957); - background-image: linear-gradient(#62c462, #57a957); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - border-color: #458845 #458845 #3d773d; - border-color: rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125); -} -.alert-info { - background-color: #36b3d9; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#6bd0ee), to(#36b3d9)); - background-image: -moz-linear-gradient(#6bd0ee, #36b3d9); - background-image: -ms-linear-gradient(#6bd0ee, #36b3d9); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #6bd0ee), color-stop(100%, #36b3d9)); - background-image: -webkit-linear-gradient(#6bd0ee, #36b3d9); - background-image: -o-linear-gradient(#6bd0ee, #36b3d9); - background-image: linear-gradient(#6bd0ee, #36b3d9); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - border-color: #2396b9 #2396b9 #1f85a4; - border-color: rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125); -} -.close { +.alert .close { float: right; margin-top: -2px; color: #000000; @@ -1429,7 +1432,7 @@ footer { -moz-opacity: 0.2; opacity: 0.2; } -.close:hover { +.alert .close:hover { color: #000000; text-decoration: none; filter: alpha(opacity=40); @@ -1437,7 +1440,7 @@ footer { -moz-opacity: 0.4; opacity: 0.4; } -.alert-block { +.alert.alert-block, .alert.alert-block:hover { background-image: none; background-color: #fdf5d9; padding: 14px; @@ -1446,21 +1449,30 @@ footer { -moz-box-shadow: none; box-shadow: none; } -.alert-block p { +.alert.alert-block p, .alert.alert-block:hover p { margin-right: 30px; } -.alert-block .alert-actions { +.alert.alert-block .alert-actions, .alert.alert-block:hover .alert-actions { margin-top: 5px; } -.alert-block.error { +.alert.alert-block.error, +.alert.alert-block:hover.error, +.alert.alert-block.success, +.alert.alert-block:hover.success, +.alert.alert-block.info, +.alert.alert-block:hover.info { + color: #404040; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); +} +.alert.alert-block.error, .alert.alert-block:hover.error { background-color: #fddfde; border-color: #fbc7c6; } -.alert-block.success { +.alert.alert-block.success, .alert.alert-block:hover.success { background-color: #d1eed1; border-color: #bfe7bf; } -.alert-block.info { +.alert.alert-block.info, .alert.alert-block:hover.info { background-color: #ddf4fb; border-color: #c6edf9; } diff --git a/bootstrap-1.1.0.min.css b/bootstrap-1.1.0.min.css index 5e273bf8e8..a3aca6ef4a 100644 --- a/bootstrap-1.1.0.min.css +++ b/bootstrap-1.1.0.min.css @@ -9,6 +9,10 @@ header,section,footer,article,aside{display:block;} .center-block{display:block;margin:0 auto;} .container{width:940px;margin:0 auto;zoom:1;}.container:before,.container:after{display:table;content:"";} .container:after{clear:both;} +.btn.danger,.alert.danger,.btn.danger:hover,.alert.danger:hover,.btn.error,.alert.error,.btn.error:hover,.alert.error:hover,.btn.success,.alert.success,.btn.success:hover,.alert.success:hover,.btn.info,.alert.info,.btn.info:hover,.alert.info:hover{color:#ffffff;} +.btn.danger,.alert.danger,.btn.danger:hover,.alert.danger:hover,.btn.error,.alert.error,.btn.error:hover,.alert.error:hover{background-color:#d6463e;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#f56a66), to(#d6463e));background-image:-moz-linear-gradient(#f56a66, #d6463e);background-image:-ms-linear-gradient(#f56a66, #d6463e);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #f56a66), color-stop(100%, #d6463e));background-image:-webkit-linear-gradient(#f56a66, #d6463e);background-image:-o-linear-gradient(#f56a66, #d6463e);background-image:linear-gradient(#f56a66, #d6463e);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#d6463e #d6463e #a52a23;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} +.btn.success,.alert.success,.btn.success:hover,.alert.success:hover{background-color:#57a957;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));background-image:-moz-linear-gradient(#62c462, #57a957);background-image:-ms-linear-gradient(#62c462, #57a957);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));background-image:-webkit-linear-gradient(#62c462, #57a957);background-image:-o-linear-gradient(#62c462, #57a957);background-image:linear-gradient(#62c462, #57a957);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#57a957 #57a957 #3d773d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} +.btn.info,.alert.info,.btn.info:hover,.alert.info:hover{background-color:#36b3d9;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#6bd0ee), to(#36b3d9));background-image:-moz-linear-gradient(#6bd0ee, #36b3d9);background-image:-ms-linear-gradient(#6bd0ee, #36b3d9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #6bd0ee), color-stop(100%, #36b3d9));background-image:-webkit-linear-gradient(#6bd0ee, #36b3d9);background-image:-o-linear-gradient(#6bd0ee, #36b3d9);background-image:linear-gradient(#6bd0ee, #36b3d9);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#36b3d9 #36b3d9 #1f85a4;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} .row{zoom:1;margin-left:-20px;}.row:before,.row:after{display:table;content:"";} .row:after{clear:both;} .row .span1,.row .span2,.row .span3,.row .span4,.row .span5,.row .span6,.row .span7,.row .span8,.row .span9,.row .span10,.row .span11,.row .span12,.row .span13,.row .span14,.row .span15,.row .span16{display:inline;float:left;margin-left:20px;} @@ -48,16 +52,6 @@ div.container-fluid:after{clear:both;} div.container-fluid div.sidebar{float:left;width:220px;} div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;} a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#0050a3;text-decoration:underline;} -.btn{cursor:pointer;display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);padding:5px 14px 6px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:normal;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;} -.btn.primary,.btn.danger,.btn.danger:hover,.btn.primary:hover{color:#fff;} -.btn.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);background-image:linear-gradient(#049cdb, #0064cd);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} -.btn.danger{background-color:#9d261d;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#d83a2e), to(#9d261d));background-image:-moz-linear-gradient(#d83a2e, #9d261d);background-image:-ms-linear-gradient(#d83a2e, #9d261d);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #d83a2e), color-stop(100%, #9d261d));background-image:-webkit-linear-gradient(#d83a2e, #9d261d);background-image:-o-linear-gradient(#d83a2e, #9d261d);background-image:linear-gradient(#d83a2e, #9d261d);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#9d261d #9d261d #5c1611;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} -.btn.disabled{cursor:default;background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;} -.btn:disabled{cursor:default;background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;} -.btn:active{-webkit-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);} -.btn.large{font-size:16px;line-height:normal;padding:9px 14px 9px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} -.btn.small{padding:7px 9px 7px;font-size:11px;} -button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;} p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;} h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;} h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;} @@ -182,20 +176,25 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .hero-unit p{font-size:18px;font-weight:200;line-height:27px;} footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;} .page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}.page-header h1{margin-bottom:8px;} -.alert{background-color:#eedc94;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(#fceec1, #eedc94);background-image:-ms-linear-gradient(#fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(#fceec1, #eedc94);background-image:-o-linear-gradient(#fceec1, #eedc94);background-image:linear-gradient(#fceec1, #eedc94);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#e7ce68 #e7ce68 #e4c652;border-color:rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125);margin-bottom:18px;padding:7px 14px;color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);}.alert h5{line-height:18px;} +.btn{cursor:pointer;display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);padding:5px 14px 6px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:normal;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;} +.btn.disabled{cursor:default;background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;} +.btn:disabled{cursor:default;background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;} +.btn:active{-webkit-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);} +.btn.primary,.btn.primary:hover{color:#fff;background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);background-image:linear-gradient(#049cdb, #0064cd);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} +.btn.large{font-size:16px;line-height:normal;padding:9px 14px 9px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} +.btn.small{padding:7px 9px 7px;font-size:11px;} +button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;} +.alert{background-color:#eedc94;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(#fceec1, #eedc94);background-image:-ms-linear-gradient(#fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(#fceec1, #eedc94);background-image:-o-linear-gradient(#fceec1, #eedc94);background-image:linear-gradient(#fceec1, #eedc94);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#eedc94 #eedc94 #e4c652;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);margin-bottom:18px;padding:7px 14px;color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);}.alert h5{line-height:18px;} .alert p{margin-bottom:0;} .alert div{margin-top:5px;margin-bottom:2px;line-height:28px;} .alert .btn{-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);} -.alert-error,.alert-success,.alert-info,.alert-error h5,.alert-success h5,.alert-info h5{color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.3);} -.alert-error{background-color:#d6463e;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#f56a66), to(#d6463e));background-image:-moz-linear-gradient(#f56a66, #d6463e);background-image:-ms-linear-gradient(#f56a66, #d6463e);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #f56a66), color-stop(100%, #d6463e));background-image:-webkit-linear-gradient(#f56a66, #d6463e);background-image:-o-linear-gradient(#f56a66, #d6463e);background-image:linear-gradient(#f56a66, #d6463e);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#ba2f27 #ba2f27 #a52a23;border-color:rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125);} -.alert-success{background-color:#57a957;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));background-image:-moz-linear-gradient(#62c462, #57a957);background-image:-ms-linear-gradient(#62c462, #57a957);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));background-image:-webkit-linear-gradient(#62c462, #57a957);background-image:-o-linear-gradient(#62c462, #57a957);background-image:linear-gradient(#62c462, #57a957);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#458845 #458845 #3d773d;border-color:rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125);} -.alert-info{background-color:#36b3d9;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#6bd0ee), to(#36b3d9));background-image:-moz-linear-gradient(#6bd0ee, #36b3d9);background-image:-ms-linear-gradient(#6bd0ee, #36b3d9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #6bd0ee), color-stop(100%, #36b3d9));background-image:-webkit-linear-gradient(#6bd0ee, #36b3d9);background-image:-o-linear-gradient(#6bd0ee, #36b3d9);background-image:linear-gradient(#6bd0ee, #36b3d9);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#2396b9 #2396b9 #1f85a4;border-color:rgba(0, 0, 0, 0.05) rgba(0, 0, 0, 0.075) rgba(0, 0, 0, 0.125);} -.close{float:right;margin-top:-2px;color:#000000;font-size:20px;font-weight:bold;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;} -.alert-block{background-image:none;background-color:#fdf5d9;padding:14px;border-color:#fceec1;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.alert-block p{margin-right:30px;} -.alert-block .alert-actions{margin-top:5px;} -.alert-block.error{background-color:#fddfde;border-color:#fbc7c6;} -.alert-block.success{background-color:#d1eed1;border-color:#bfe7bf;} -.alert-block.info{background-color:#ddf4fb;border-color:#c6edf9;} +.alert .close{float:right;margin-top:-2px;color:#000000;font-size:20px;font-weight:bold;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}.alert .close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;} +.alert.alert-block,.alert.alert-block:hover{background-image:none;background-color:#fdf5d9;padding:14px;border-color:#fceec1;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.alert.alert-block p,.alert.alert-block:hover p{margin-right:30px;} +.alert.alert-block .alert-actions,.alert.alert-block:hover .alert-actions{margin-top:5px;} +.alert.alert-block.error,.alert.alert-block:hover.error,.alert.alert-block.success,.alert.alert-block:hover.success,.alert.alert-block.info,.alert.alert-block:hover.info{color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);} +.alert.alert-block.error,.alert.alert-block:hover.error{background-color:#fddfde;border-color:#fbc7c6;} +.alert.alert-block.success,.alert.alert-block:hover.success{background-color:#d1eed1;border-color:#bfe7bf;} +.alert.alert-block.info,.alert.alert-block:hover.info{background-color:#ddf4fb;border-color:#c6edf9;} .tabs,.pills{margin:0 0 20px;padding:0;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";} .tabs:after,.pills:after{clear:both;} .tabs li,.pills li{display:inline;}.tabs li a,.pills li a{float:left;width:auto;} diff --git a/docs/index.html b/docs/index.html index ebaa5a6f3a..02dd26e0c0 100644 --- a/docs/index.html +++ b/docs/index.html @@ -859,13 +859,17 @@

Buttons

As a convention, buttons are used for actions while links are used for objects. For instance, "Download" could be a button and "recent activity" could be a link.

-

All buttons default to a light gray style, but a blue .primary class and a red .danger class is available. Plus, rolling your own styles is easy peasy.

+

All buttons default to a light gray style, but a number of functional classes can be applied for different color styles. These classes include a blue .primary class, a light-blue .info class, a green .success class, and a red .danger class. Plus, rolling your own styles is easy peasy.

Example buttons

Button styles can be applied to anything with the .btn applied. Typically you’ll want to apply these to only <a>, <button>, and select <input> elements. Here’s how it looks:

-    + + + + +

Alternate sizes

Fancy larger or smaller buttons? Have at it!

@@ -1077,15 +1081,15 @@ ×

Oh snap! Change this and that and try again.

-
+
×

Holy gaucamole! Best check yo self, you’re not looking too good.

-
+
×

Well done! You successfully read this alert message.

-
+
×

Heads up! This is an alert that needs your attention, but it’s not a huge priority just yet.

diff --git a/lib/patterns.less b/lib/patterns.less index 466727cc42..2d946e39db 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -288,21 +288,96 @@ footer { } } +// BUTTON STYLES +// ------------- + + +// Base .btn styles +.btn { + // Button Base + cursor: pointer; + display: inline-block; + #gradient > .vertical-three-colors(#fff, #fff, 0.25, darken(#fff, 10%)); + padding: 5px 14px 6px; + text-shadow: 0 1px 1px rgba(255,255,255,.75); + color: #333; + font-size: 13px; + line-height: normal; + border: 1px solid #ccc; + border-bottom-color: #bbb; + .border-radius(4px); + @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); + .box-shadow(@shadow); + + &:hover { + background-position: 0 -15px; + color: #333; + text-decoration: none; + } + + // Transitions + .transition(.1s linear all); + + // Active and Disabled states + &.disabled { + cursor: default; + background-image: none; + .opacity(65); + } + + &:disabled { + // disabled pseudo can't be included with .disabled + // def because IE8 and below will drop it ;_; + cursor: default; + background-image: none; + .opacity(65); + } + + &:active { + @shadow: inset 0 3px 7px rgba(0,0,0,.1), 0 1px 2px rgba(0,0,0,.05); + .box-shadow(@shadow); + } + + // Primary Button Type + &.primary, + &.primary:hover { + color:#fff; + .gradientBar(@blue, @blueDark) + } + + + // Button Sizes + &.large { + font-size: 16px; + line-height: normal; + padding: 9px 14px 9px; + .border-radius(6px); + } + + &.small { + padding: 7px 9px 7px; + font-size: 11px; + } + +} + +// Help Firefox not be a jerk about adding extra padding to buttons +button.btn, +input[type=submit].btn { + &::-moz-focus-inner { + padding: 0; + border: 0; + } +} + + // ERROR STYLES // ------------ -// Setup a mixin to colorize different alerts -.alertTheme(@primaryColor, @secondaryColor) { - #gradient > .vertical(@primaryColor, @secondaryColor); - text-shadow: 0 -1px 0 rgba(0,0,0,.25); - border-color: darken(@secondaryColor, 10%) darken(@secondaryColor, 10%) darken(@secondaryColor, 15%); - border-color: rgba(0,0,0,.05) rgba(0,0,0,.075) rgba(0,0,0,.125); -} - // Base alert styles .alert { - .alertTheme(#fceec1, #eedc94); + .gradientBar(#fceec1, #eedc94); // warning by default margin-bottom: @baseline; padding: 7px 14px; color: @grayDark; @@ -311,6 +386,7 @@ footer { border-style: solid; .border-radius(4px); .box-shadow(inset 0 1px 0 rgba(255,255,255,.25)); + // Remove extra margin from content h5 { line-height: @baseline; @@ -323,66 +399,59 @@ footer { margin-bottom: 2px; line-height: 28px; } - // Provide actions with buttons .btn { + // Provide actions with buttons .box-shadow(0 1px 0 rgba(255,255,255,.25)); } -} -// Alternate alerts -.alert-error, -.alert-success, -.alert-info, -.alert-error h5, -.alert-success h5, -.alert-info h5 { - color: #fff; - text-shadow: 0 -1px 0 rgba(0,0,0,.3); -} -.alert-error { .alertTheme(#f56a66, #d6463e); } -.alert-success { .alertTheme(#62c462, #57a957); } -.alert-info { .alertTheme(#6bd0ee, #36b3d9); } -// Close action -.close { - float: right; - margin-top: -2px; - color: @black; - font-size: 20px; - font-weight: bold; - text-shadow: 0 1px 0 rgba(255,255,255,1); - .opacity(20); - &:hover { + .close { + float: right; + margin-top: -2px; color: @black; - text-decoration: none; - .opacity(40); + font-size: 20px; + font-weight: bold; + text-shadow: 0 1px 0 rgba(255,255,255,1); + .opacity(20); + &:hover { + color: @black; + text-decoration: none; + .opacity(40); + } } -} -// Block-level alerts -.alert-block { - background-image: none; - background-color: lighten(#fceec1, 5%); - padding: 14px; - border-color: #fceec1; - .box-shadow(none); - p { - margin-right: 30px; - } - .alert-actions { - margin-top: 5px; - } -} -.alert-block.error { - background-color: lighten(#f56a66, 25%); - border-color: lighten(#f56a66, 20%); -} -.alert-block.success { - background-color: lighten(#62c462, 30%); - border-color: lighten(#62c462, 25%); -} -.alert-block.info { - background-color: lighten(#6bd0ee, 25%); - border-color: lighten(#6bd0ee, 20%); -} + &.alert-block, + &.alert-block:hover { + background-image: none; + background-color: lighten(#fceec1, 5%); + padding: 14px; + border-color: #fceec1; + .box-shadow(none); + + p { + margin-right: 30px; + } + .alert-actions { + margin-top: 5px; + } + &.error, + &.success, + &.info { + color: @grayDark; + text-shadow: 0 1px 0 rgba(255,255,255,.5); + } + &.error { + background-color: lighten(#f56a66, 25%); + border-color: lighten(#f56a66, 20%); + } + &.success { + background-color: lighten(#62c462, 30%); + border-color: lighten(#62c462, 25%); + } + &.info { + background-color: lighten(#6bd0ee, 25%); + border-color: lighten(#6bd0ee, 20%); + } + } +} // NAVIGATION // ---------- diff --git a/lib/preboot.less b/lib/preboot.less index 964f677a68..cec847852d 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -170,14 +170,6 @@ column-gap: @columnGap; } -// Buttons -.btnColoring(@primaryColor, @secondaryColor) { - #gradient > .vertical(@primaryColor, @secondaryColor); - text-shadow: 0 -1px 0 rgba(0,0,0,.25); - border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%); - border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%); -} - // Add an alphatransparency value to any background or border color (via Elyse Holladay) #translucent { .background(@color: @white, @alpha: 1) { @@ -189,6 +181,49 @@ } } +// Gradient Bar Colors for buttons and allerts +.gradientBar(@primaryColor, @secondaryColor) { + #gradient > .vertical(@primaryColor, @secondaryColor); + text-shadow: 0 -1px 0 rgba(0,0,0,.25); + border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%); + border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%); +} + +// Shared colors for buttons and alerts + +.btn, +.alert { + + &.danger, + &.danger:hover, + &.error, + &.error:hover, + &.success, + &.success:hover, + &.info, + &.info:hover { + color: @white + } + + &.danger, + &.danger:hover, + &.error, + &.error:hover { + .gradientBar(#f56a66, #d6463e); + } + + &.success, + &.success:hover { + .gradientBar(#62c462, #57a957); + } + + &.info, + &.info:hover { + .gradientBar(#6bd0ee, #36b3d9); + } + +} + // Gradients #gradient { .horizontal (@startColor: #555, @endColor: #333) { diff --git a/lib/scaffolding.less b/lib/scaffolding.less index f5bc68868c..ad5cc7644d 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -115,90 +115,4 @@ a { color: @linkColorHover; text-decoration: underline; } -} - -// Buttons -.btn { - // Button Base - cursor: pointer; - display: inline-block; - #gradient > .vertical-three-colors(#fff, #fff, 0.25, darken(#fff, 10%)); - padding: 5px 14px 6px; - text-shadow: 0 1px 1px rgba(255,255,255,.75); - color: #333; - font-size: 13px; - line-height: normal; - border: 1px solid #ccc; - border-bottom-color: #bbb; - .border-radius(4px); - @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); - .box-shadow(@shadow); - - &:hover { - background-position: 0 -15px; - color: #333; - text-decoration: none; - } - - // Transitions - .transition(.1s linear all); - - // Colored Button Types - &.primary, - &.danger, - &.danger:hover, - &.primary:hover { - color: #fff; - } - - &.primary { - .btnColoring(@blue, @blueDark) - } - - &.danger { - .btnColoring(lighten(@red, 15%), @red) - } - - // Active and Disabled states - &.disabled { - cursor: default; - background-image: none; - .opacity(65); - } - - &:disabled { - // disabled pseudo can't be included with .disabled - // def because IE8 and below will drop it ;_; - cursor: default; - background-image: none; - .opacity(65); - } - - &:active { - @shadow: inset 0 3px 7px rgba(0,0,0,.1), 0 1px 2px rgba(0,0,0,.05); - .box-shadow(@shadow); - } - - // Button Sizes - &.large { - font-size: 16px; - line-height: normal; - padding: 9px 14px 9px; - .border-radius(6px); - } - - &.small { - padding: 7px 9px 7px; - font-size: 11px; - } - -} - -// Help Firefox not be a jerk about adding extra padding to buttons -button.btn, -input[type=submit].btn { - &::-moz-focus-inner { - padding: 0; - border: 0; - } -} +} \ No newline at end of file From 04b8e667d0a8caaf241570721bbf7afb7a5e1b2d Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 25 Aug 2011 13:52:04 -0700 Subject: [PATCH 07/17] clean up btn selectors a bit --- bootstrap-1.1.0.css | 48 ++++++++++++++++------------------------- bootstrap-1.1.0.min.css | 8 +++---- lib/patterns.less | 14 ++++++------ lib/preboot.less | 10 +++------ 4 files changed, 32 insertions(+), 48 deletions(-) diff --git a/bootstrap-1.1.0.css b/bootstrap-1.1.0.css index 34b9d085f3..b9b50de4bf 100644 --- a/bootstrap-1.1.0.css +++ b/bootstrap-1.1.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Thu Aug 25 13:30:35 PDT 2011 + * Date: Thu Aug 25 13:52:00 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -141,12 +141,8 @@ aside { } .btn.danger, .alert.danger, -.btn.danger:hover, -.alert.danger:hover, .btn.error, -.alert.error, -.btn.error:hover, -.alert.error:hover { +.alert.error { background-color: #d6463e; background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#f56a66), to(#d6463e)); @@ -160,10 +156,7 @@ aside { border-color: #d6463e #d6463e #a52a23; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } -.btn.success, -.alert.success, -.btn.success:hover, -.alert.success:hover { +.btn.success, .alert.success { background-color: #57a957; background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); @@ -177,10 +170,7 @@ aside { border-color: #57a957 #57a957 #3d773d; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } -.btn.info, -.alert.info, -.btn.info:hover, -.alert.info:hover { +.btn.info, .alert.info { background-color: #36b3d9; background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#6bd0ee), to(#36b3d9)); @@ -1326,6 +1316,21 @@ footer { color: #333; text-decoration: none; } +.btn.primary { + color: #fff; + background-color: #0064cd; + background-repeat: repeat-x; + background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd)); + background-image: -moz-linear-gradient(#049cdb, #0064cd); + background-image: -ms-linear-gradient(#049cdb, #0064cd); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd)); + background-image: -webkit-linear-gradient(#049cdb, #0064cd); + background-image: -o-linear-gradient(#049cdb, #0064cd); + background-image: linear-gradient(#049cdb, #0064cd); + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border-color: #0064cd #0064cd #003f81; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); +} .btn.disabled { cursor: default; background-image: none; @@ -1347,21 +1352,6 @@ footer { -moz-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.05); } -.btn.primary, .btn.primary:hover { - color: #fff; - background-color: #0064cd; - background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd)); - background-image: -moz-linear-gradient(#049cdb, #0064cd); - background-image: -ms-linear-gradient(#049cdb, #0064cd); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd)); - background-image: -webkit-linear-gradient(#049cdb, #0064cd); - background-image: -o-linear-gradient(#049cdb, #0064cd); - background-image: linear-gradient(#049cdb, #0064cd); - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - border-color: #0064cd #0064cd #003f81; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); -} .btn.large { font-size: 16px; line-height: normal; diff --git a/bootstrap-1.1.0.min.css b/bootstrap-1.1.0.min.css index a3aca6ef4a..32e6240acc 100644 --- a/bootstrap-1.1.0.min.css +++ b/bootstrap-1.1.0.min.css @@ -10,9 +10,9 @@ header,section,footer,article,aside{display:block;} .container{width:940px;margin:0 auto;zoom:1;}.container:before,.container:after{display:table;content:"";} .container:after{clear:both;} .btn.danger,.alert.danger,.btn.danger:hover,.alert.danger:hover,.btn.error,.alert.error,.btn.error:hover,.alert.error:hover,.btn.success,.alert.success,.btn.success:hover,.alert.success:hover,.btn.info,.alert.info,.btn.info:hover,.alert.info:hover{color:#ffffff;} -.btn.danger,.alert.danger,.btn.danger:hover,.alert.danger:hover,.btn.error,.alert.error,.btn.error:hover,.alert.error:hover{background-color:#d6463e;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#f56a66), to(#d6463e));background-image:-moz-linear-gradient(#f56a66, #d6463e);background-image:-ms-linear-gradient(#f56a66, #d6463e);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #f56a66), color-stop(100%, #d6463e));background-image:-webkit-linear-gradient(#f56a66, #d6463e);background-image:-o-linear-gradient(#f56a66, #d6463e);background-image:linear-gradient(#f56a66, #d6463e);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#d6463e #d6463e #a52a23;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} -.btn.success,.alert.success,.btn.success:hover,.alert.success:hover{background-color:#57a957;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));background-image:-moz-linear-gradient(#62c462, #57a957);background-image:-ms-linear-gradient(#62c462, #57a957);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));background-image:-webkit-linear-gradient(#62c462, #57a957);background-image:-o-linear-gradient(#62c462, #57a957);background-image:linear-gradient(#62c462, #57a957);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#57a957 #57a957 #3d773d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} -.btn.info,.alert.info,.btn.info:hover,.alert.info:hover{background-color:#36b3d9;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#6bd0ee), to(#36b3d9));background-image:-moz-linear-gradient(#6bd0ee, #36b3d9);background-image:-ms-linear-gradient(#6bd0ee, #36b3d9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #6bd0ee), color-stop(100%, #36b3d9));background-image:-webkit-linear-gradient(#6bd0ee, #36b3d9);background-image:-o-linear-gradient(#6bd0ee, #36b3d9);background-image:linear-gradient(#6bd0ee, #36b3d9);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#36b3d9 #36b3d9 #1f85a4;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} +.btn.danger,.alert.danger,.btn.error,.alert.error{background-color:#d6463e;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#f56a66), to(#d6463e));background-image:-moz-linear-gradient(#f56a66, #d6463e);background-image:-ms-linear-gradient(#f56a66, #d6463e);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #f56a66), color-stop(100%, #d6463e));background-image:-webkit-linear-gradient(#f56a66, #d6463e);background-image:-o-linear-gradient(#f56a66, #d6463e);background-image:linear-gradient(#f56a66, #d6463e);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#d6463e #d6463e #a52a23;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} +.btn.success,.alert.success{background-color:#57a957;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));background-image:-moz-linear-gradient(#62c462, #57a957);background-image:-ms-linear-gradient(#62c462, #57a957);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));background-image:-webkit-linear-gradient(#62c462, #57a957);background-image:-o-linear-gradient(#62c462, #57a957);background-image:linear-gradient(#62c462, #57a957);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#57a957 #57a957 #3d773d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} +.btn.info,.alert.info{background-color:#36b3d9;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#6bd0ee), to(#36b3d9));background-image:-moz-linear-gradient(#6bd0ee, #36b3d9);background-image:-ms-linear-gradient(#6bd0ee, #36b3d9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #6bd0ee), color-stop(100%, #36b3d9));background-image:-webkit-linear-gradient(#6bd0ee, #36b3d9);background-image:-o-linear-gradient(#6bd0ee, #36b3d9);background-image:linear-gradient(#6bd0ee, #36b3d9);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#36b3d9 #36b3d9 #1f85a4;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} .row{zoom:1;margin-left:-20px;}.row:before,.row:after{display:table;content:"";} .row:after{clear:both;} .row .span1,.row .span2,.row .span3,.row .span4,.row .span5,.row .span6,.row .span7,.row .span8,.row .span9,.row .span10,.row .span11,.row .span12,.row .span13,.row .span14,.row .span15,.row .span16{display:inline;float:left;margin-left:20px;} @@ -177,10 +177,10 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;} .page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}.page-header h1{margin-bottom:8px;} .btn{cursor:pointer;display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);padding:5px 14px 6px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:normal;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;} +.btn.primary{color:#fff;background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);background-image:linear-gradient(#049cdb, #0064cd);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} .btn.disabled{cursor:default;background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;} .btn:disabled{cursor:default;background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;} .btn:active{-webkit-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);} -.btn.primary,.btn.primary:hover{color:#fff;background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);background-image:linear-gradient(#049cdb, #0064cd);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} .btn.large{font-size:16px;line-height:normal;padding:9px 14px 9px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} .btn.small{padding:7px 9px 7px;font-size:11px;} button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;} diff --git a/lib/patterns.less b/lib/patterns.less index 2d946e39db..b96a97198c 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -315,6 +315,12 @@ footer { text-decoration: none; } + // Primary Button Type + &.primary { + color:#fff; + .gradientBar(@blue, @blueDark) + } + // Transitions .transition(.1s linear all); @@ -338,14 +344,6 @@ footer { .box-shadow(@shadow); } - // Primary Button Type - &.primary, - &.primary:hover { - color:#fff; - .gradientBar(@blue, @blueDark) - } - - // Button Sizes &.large { font-size: 16px; diff --git a/lib/preboot.less b/lib/preboot.less index cec847852d..344876873b 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -206,19 +206,15 @@ } &.danger, - &.danger:hover, - &.error, - &.error:hover { + &.error { .gradientBar(#f56a66, #d6463e); } - &.success, - &.success:hover { + &.success { .gradientBar(#62c462, #57a957); } - &.info, - &.info:hover { + &.info { .gradientBar(#6bd0ee, #36b3d9); } From ce615d016a8ac380dae871358cfc7e745b5e20c2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 25 Aug 2011 22:41:45 -0700 Subject: [PATCH 08/17] merged in my pending changes from 1.2-wip branch, resolve diffs as best as i could, update docs and alerts to use original classes, updated docs to include smaller section for layouts --- bootstrap-1.1.0.css | 59 ++++++++---------- bootstrap-1.1.0.min.css | 30 ++++----- docs/assets/css/docs.css | 4 +- docs/index.html | 131 ++++++++++++++++++--------------------- lib/patterns.less | 5 +- lib/preboot.less | 4 +- 6 files changed, 108 insertions(+), 125 deletions(-) diff --git a/bootstrap-1.1.0.css b/bootstrap-1.1.0.css index b9b50de4bf..f06827bc5d 100644 --- a/bootstrap-1.1.0.css +++ b/bootstrap-1.1.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Thu Aug 25 13:52:00 PDT 2011 + * Date: Thu Aug 25 22:35:30 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -122,27 +122,27 @@ aside { clear: both; } .btn.danger, -.alert.danger, +.alert-message.danger, .btn.danger:hover, -.alert.danger:hover, +.alert-message.danger:hover, .btn.error, -.alert.error, +.alert-message.error, .btn.error:hover, -.alert.error:hover, +.alert-message.error:hover, .btn.success, -.alert.success, +.alert-message.success, .btn.success:hover, -.alert.success:hover, +.alert-message.success:hover, .btn.info, -.alert.info, +.alert-message.info, .btn.info:hover, -.alert.info:hover { +.alert-message.info:hover { color: #ffffff; } .btn.danger, -.alert.danger, +.alert-message.danger, .btn.error, -.alert.error { +.alert-message.error { background-color: #d6463e; background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#f56a66), to(#d6463e)); @@ -156,7 +156,7 @@ aside { border-color: #d6463e #d6463e #a52a23; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } -.btn.success, .alert.success { +.btn.success, .alert-message.success { background-color: #57a957; background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957)); @@ -170,7 +170,7 @@ aside { border-color: #57a957 #57a957 #3d773d; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } -.btn.info, .alert.info { +.btn.info, .alert-message.info { background-color: #36b3d9; background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#6bd0ee), to(#36b3d9)); @@ -1368,7 +1368,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { padding: 0; border: 0; } -.alert { +.alert-message { background-color: #eedc94; background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94)); @@ -1394,23 +1394,23 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); } -.alert h5 { +.alert-message h5 { line-height: 18px; } -.alert p { +.alert-message p { margin-bottom: 0; } -.alert div { +.alert-message div { margin-top: 5px; margin-bottom: 2px; line-height: 28px; } -.alert .btn { +.alert-message .btn { -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); } -.alert .close { +.alert-message .close { float: right; margin-top: -2px; color: #000000; @@ -1422,7 +1422,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-opacity: 0.2; opacity: 0.2; } -.alert .close:hover { +.alert-message .close:hover { color: #000000; text-decoration: none; filter: alpha(opacity=40); @@ -1430,7 +1430,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-opacity: 0.4; opacity: 0.4; } -.alert.alert-block, .alert.alert-block:hover { +.alert-message.block-message { background-image: none; background-color: #fdf5d9; padding: 14px; @@ -1439,30 +1439,25 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-box-shadow: none; box-shadow: none; } -.alert.alert-block p, .alert.alert-block:hover p { +.alert-message.block-message p { margin-right: 30px; } -.alert.alert-block .alert-actions, .alert.alert-block:hover .alert-actions { +.alert-message.block-message .alert-actions { margin-top: 5px; } -.alert.alert-block.error, -.alert.alert-block:hover.error, -.alert.alert-block.success, -.alert.alert-block:hover.success, -.alert.alert-block.info, -.alert.alert-block:hover.info { +.alert-message.block-message.error, .alert-message.block-message.success, .alert-message.block-message.info { color: #404040; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); } -.alert.alert-block.error, .alert.alert-block:hover.error { +.alert-message.block-message.error { background-color: #fddfde; border-color: #fbc7c6; } -.alert.alert-block.success, .alert.alert-block:hover.success { +.alert-message.block-message.success { background-color: #d1eed1; border-color: #bfe7bf; } -.alert.alert-block.info, .alert.alert-block:hover.info { +.alert-message.block-message.info { background-color: #ddf4fb; border-color: #c6edf9; } diff --git a/bootstrap-1.1.0.min.css b/bootstrap-1.1.0.min.css index 32e6240acc..4cd8bdcbac 100644 --- a/bootstrap-1.1.0.min.css +++ b/bootstrap-1.1.0.min.css @@ -9,10 +9,10 @@ header,section,footer,article,aside{display:block;} .center-block{display:block;margin:0 auto;} .container{width:940px;margin:0 auto;zoom:1;}.container:before,.container:after{display:table;content:"";} .container:after{clear:both;} -.btn.danger,.alert.danger,.btn.danger:hover,.alert.danger:hover,.btn.error,.alert.error,.btn.error:hover,.alert.error:hover,.btn.success,.alert.success,.btn.success:hover,.alert.success:hover,.btn.info,.alert.info,.btn.info:hover,.alert.info:hover{color:#ffffff;} -.btn.danger,.alert.danger,.btn.error,.alert.error{background-color:#d6463e;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#f56a66), to(#d6463e));background-image:-moz-linear-gradient(#f56a66, #d6463e);background-image:-ms-linear-gradient(#f56a66, #d6463e);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #f56a66), color-stop(100%, #d6463e));background-image:-webkit-linear-gradient(#f56a66, #d6463e);background-image:-o-linear-gradient(#f56a66, #d6463e);background-image:linear-gradient(#f56a66, #d6463e);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#d6463e #d6463e #a52a23;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} -.btn.success,.alert.success{background-color:#57a957;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));background-image:-moz-linear-gradient(#62c462, #57a957);background-image:-ms-linear-gradient(#62c462, #57a957);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));background-image:-webkit-linear-gradient(#62c462, #57a957);background-image:-o-linear-gradient(#62c462, #57a957);background-image:linear-gradient(#62c462, #57a957);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#57a957 #57a957 #3d773d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} -.btn.info,.alert.info{background-color:#36b3d9;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#6bd0ee), to(#36b3d9));background-image:-moz-linear-gradient(#6bd0ee, #36b3d9);background-image:-ms-linear-gradient(#6bd0ee, #36b3d9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #6bd0ee), color-stop(100%, #36b3d9));background-image:-webkit-linear-gradient(#6bd0ee, #36b3d9);background-image:-o-linear-gradient(#6bd0ee, #36b3d9);background-image:linear-gradient(#6bd0ee, #36b3d9);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#36b3d9 #36b3d9 #1f85a4;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} +.btn.danger,.alert-message.danger,.btn.danger:hover,.alert-message.danger:hover,.btn.error,.alert-message.error,.btn.error:hover,.alert-message.error:hover,.btn.success,.alert-message.success,.btn.success:hover,.alert-message.success:hover,.btn.info,.alert-message.info,.btn.info:hover,.alert-message.info:hover{color:#ffffff;} +.btn.danger,.alert-message.danger,.btn.error,.alert-message.error{background-color:#d6463e;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#f56a66), to(#d6463e));background-image:-moz-linear-gradient(#f56a66, #d6463e);background-image:-ms-linear-gradient(#f56a66, #d6463e);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #f56a66), color-stop(100%, #d6463e));background-image:-webkit-linear-gradient(#f56a66, #d6463e);background-image:-o-linear-gradient(#f56a66, #d6463e);background-image:linear-gradient(#f56a66, #d6463e);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#d6463e #d6463e #a52a23;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} +.btn.success,.alert-message.success{background-color:#57a957;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));background-image:-moz-linear-gradient(#62c462, #57a957);background-image:-ms-linear-gradient(#62c462, #57a957);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));background-image:-webkit-linear-gradient(#62c462, #57a957);background-image:-o-linear-gradient(#62c462, #57a957);background-image:linear-gradient(#62c462, #57a957);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#57a957 #57a957 #3d773d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} +.btn.info,.alert-message.info{background-color:#36b3d9;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#6bd0ee), to(#36b3d9));background-image:-moz-linear-gradient(#6bd0ee, #36b3d9);background-image:-ms-linear-gradient(#6bd0ee, #36b3d9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #6bd0ee), color-stop(100%, #36b3d9));background-image:-webkit-linear-gradient(#6bd0ee, #36b3d9);background-image:-o-linear-gradient(#6bd0ee, #36b3d9);background-image:linear-gradient(#6bd0ee, #36b3d9);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#36b3d9 #36b3d9 #1f85a4;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} .row{zoom:1;margin-left:-20px;}.row:before,.row:after{display:table;content:"";} .row:after{clear:both;} .row .span1,.row .span2,.row .span3,.row .span4,.row .span5,.row .span6,.row .span7,.row .span8,.row .span9,.row .span10,.row .span11,.row .span12,.row .span13,.row .span14,.row .span15,.row .span16{display:inline;float:left;margin-left:20px;} @@ -184,17 +184,17 @@ footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;} .btn.large{font-size:16px;line-height:normal;padding:9px 14px 9px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} .btn.small{padding:7px 9px 7px;font-size:11px;} button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;} -.alert{background-color:#eedc94;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(#fceec1, #eedc94);background-image:-ms-linear-gradient(#fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(#fceec1, #eedc94);background-image:-o-linear-gradient(#fceec1, #eedc94);background-image:linear-gradient(#fceec1, #eedc94);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#eedc94 #eedc94 #e4c652;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);margin-bottom:18px;padding:7px 14px;color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);}.alert h5{line-height:18px;} -.alert p{margin-bottom:0;} -.alert div{margin-top:5px;margin-bottom:2px;line-height:28px;} -.alert .btn{-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);} -.alert .close{float:right;margin-top:-2px;color:#000000;font-size:20px;font-weight:bold;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}.alert .close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;} -.alert.alert-block,.alert.alert-block:hover{background-image:none;background-color:#fdf5d9;padding:14px;border-color:#fceec1;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.alert.alert-block p,.alert.alert-block:hover p{margin-right:30px;} -.alert.alert-block .alert-actions,.alert.alert-block:hover .alert-actions{margin-top:5px;} -.alert.alert-block.error,.alert.alert-block:hover.error,.alert.alert-block.success,.alert.alert-block:hover.success,.alert.alert-block.info,.alert.alert-block:hover.info{color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);} -.alert.alert-block.error,.alert.alert-block:hover.error{background-color:#fddfde;border-color:#fbc7c6;} -.alert.alert-block.success,.alert.alert-block:hover.success{background-color:#d1eed1;border-color:#bfe7bf;} -.alert.alert-block.info,.alert.alert-block:hover.info{background-color:#ddf4fb;border-color:#c6edf9;} +.alert-message{background-color:#eedc94;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(#fceec1, #eedc94);background-image:-ms-linear-gradient(#fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(#fceec1, #eedc94);background-image:-o-linear-gradient(#fceec1, #eedc94);background-image:linear-gradient(#fceec1, #eedc94);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#eedc94 #eedc94 #e4c652;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);margin-bottom:18px;padding:7px 14px;color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);}.alert-message h5{line-height:18px;} +.alert-message p{margin-bottom:0;} +.alert-message div{margin-top:5px;margin-bottom:2px;line-height:28px;} +.alert-message .btn{-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);} +.alert-message .close{float:right;margin-top:-2px;color:#000000;font-size:20px;font-weight:bold;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}.alert-message .close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;} +.alert-message.block-message{background-image:none;background-color:#fdf5d9;padding:14px;border-color:#fceec1;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.alert-message.block-message p{margin-right:30px;} +.alert-message.block-message .alert-actions{margin-top:5px;} +.alert-message.block-message.error,.alert-message.block-message.success,.alert-message.block-message.info{color:#404040;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);} +.alert-message.block-message.error{background-color:#fddfde;border-color:#fbc7c6;} +.alert-message.block-message.success{background-color:#d1eed1;border-color:#bfe7bf;} +.alert-message.block-message.info{background-color:#ddf4fb;border-color:#c6edf9;} .tabs,.pills{margin:0 0 20px;padding:0;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";} .tabs:after,.pills:after{clear:both;} .tabs li,.pills li{display:inline;}.tabs li a,.pills li a{float:left;width:auto;} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 8334d3f12f..67a34280bf 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -171,7 +171,7 @@ div.mini-layout div { div.mini-layout div.mini-layout-body { background-color: #dceaf4; margin: 0 auto; - width: 450px; + width: 340px; height: 340px; } div.mini-layout.fluid div.mini-layout-sidebar, @@ -185,7 +185,7 @@ div.mini-layout.fluid div.mini-layout-sidebar { height: 340px; } div.mini-layout.fluid div.mini-layout-body { - width: 400px; + width: 300px; margin-left: 10px; } /* Topbar special styles diff --git a/docs/index.html b/docs/index.html index 02dd26e0c0..136a0dbcd2 100644 --- a/docs/index.html +++ b/docs/index.html @@ -94,7 +94,7 @@

Download, fork, pull, file issues, and more with the official Bootstrap repo on Github.

Bootstrap on GitHub »

-
+
@@ -137,7 +137,7 @@
  • Example page template (more to come soon)
    • -
    +
    @@ -167,7 +167,7 @@ </div>
    -
    +
    1
    1
    @@ -185,7 +185,7 @@
    1
    1
    1
    -
    +
    2
    2
    @@ -195,7 +195,7 @@
    2
    2
    2
    -
    +
    3
    3
    @@ -203,45 +203,45 @@
    3
    3
    1
    -
    +
    4
    4
    4
    4
    -
    +
    4
    6
    6
    -
    +
    8
    8
    -
    +
    5
    11
    -
    +
    16
    -
    +

    Offsetting columns

    4
    8 offset 4
    -
    +
    4 offset 4
    4 offset 4
    -
    +
    5 offset 3
    5 offset 3
    -
    +
    10 offset 6
    -
    + @@ -253,13 +253,10 @@

    Layouts Basic templates to create webpages

    -
    -
    +

    Fixed layout

    -

    A basic 940px wide, centered container layout for just about any site or page.

    -
    -
    +

    The default and simple 940px-wide, centered layout for just about any website or page provided by a single <div.container>.

    @@ -270,16 +267,10 @@ </div> </body> -
    -
    - - -
    -
    +
    +

    Fluid layout

    -

    A flexible fluid or liquid page structure with min- and max-widths and a left-hand sidebar. Great for apps.

    -
    -
    +

    An alternative, flexible fluid page structure with min- and max-widths and a left-hand sidebar. Great for apps and docs.

    @@ -296,8 +287,8 @@ </div> </body> -
    -
    +
    +
    @@ -360,7 +351,7 @@

    Abbreviations

    For abbreviations and acronyms, use the <abbr> tag (<acronym> is deprecated in HTML5). Put the shorthand form within the tag and set a title for the complete name.

    - +
    @@ -380,7 +371,7 @@ Dr. Julius Hibbert
    - +

    Lists

    @@ -449,7 +440,7 @@
    Etiam porta sem malesuada magna mollis euismod.
    - + @@ -595,7 +586,7 @@ ... </table> - + @@ -616,15 +607,15 @@
    Example form legend
    - +
    - +
    - @@ -634,9 +625,9 @@
    - +
    - @@ -784,7 +775,7 @@
    - +
    @@ -798,15 +789,15 @@
    Example form legend
    - +
    - +
    - @@ -853,7 +844,7 @@
    - +
    @@ -893,7 +884,7 @@  
    - + @@ -993,7 +984,7 @@ </ul> - +
    @@ -1057,7 +1048,7 @@ </div>
    - + @@ -1077,24 +1068,24 @@

    One-line messages for highlighting the failure, possible failure, or success of an action. Particularly useful for forms.

    -
    - × -

    Oh snap! Change this and that and try again.

    -
    -
    +
    ×

    Holy gaucamole! Best check yo self, you’re not looking too good.

    -
    +
    + × +

    Oh snap! Change this and that and try again.

    +
    +
    ×

    Well done! You successfully read this alert message.

    -
    +
    ×

    Heads up! This is an alert that needs your attention, but it’s not a huge priority just yet.

    -
    +
    @@ -1103,28 +1094,28 @@

    For messages that require a bit of explanation, we have paragraph style alerts. These are perfect for bubbling up longer error messages, warning a user of a pending action, or just presenting information for more emphasis on the page.

    -
    - × -

    Oh snap! You got an error! Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.

    -
    - Take this action Or do this -
    -
    -
    +
    ×

    Holy gaucamole! This is a warning! Best check yo self, you’re not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

    Take this action Or do this
    -
    +
    + × +

    Oh snap! You got an error! Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.

    +
    + Take this action Or do this +
    +
    +
    ×

    Well done! You successfully read this alert message. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Maecenas faucibus mollis interdum.

    Take this action Or do this
    -
    +
    ×

    Heads up! This is an alert that needs your attention, but it’s not a huge priority just yet.

    @@ -1132,7 +1123,7 @@
    -
    +
    @@ -1165,7 +1156,7 @@
    - +
    @@ -1198,7 +1189,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita
    - +
    @@ -1222,7 +1213,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita
    - + diff --git a/lib/patterns.less b/lib/patterns.less index b96a97198c..be5394df50 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -374,7 +374,7 @@ input[type=submit].btn { // ------------ // Base alert styles -.alert { +.alert-message { .gradientBar(#fceec1, #eedc94); // warning by default margin-bottom: @baseline; padding: 7px 14px; @@ -416,8 +416,7 @@ input[type=submit].btn { } } - &.alert-block, - &.alert-block:hover { + &.block-message { background-image: none; background-color: lighten(#fceec1, 5%); padding: 14px; diff --git a/lib/preboot.less b/lib/preboot.less index 344876873b..5191c5cc56 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -192,8 +192,7 @@ // Shared colors for buttons and alerts .btn, -.alert { - +.alert-message { &.danger, &.danger:hover, &.error, @@ -217,7 +216,6 @@ &.info { .gradientBar(#6bd0ee, #36b3d9); } - } // Gradients From 7d821f18acf04cddd1067ee612773ce2f98cb4ac Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 25 Aug 2011 22:44:23 -0700 Subject: [PATCH 09/17] resolve issue #87 in this branch --- bootstrap-1.1.0.css | 14 +++++++------- bootstrap-1.1.0.min.css | 10 +++++----- lib/scaffolding.less | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/bootstrap-1.1.0.css b/bootstrap-1.1.0.css index f06827bc5d..e97f2fc897 100644 --- a/bootstrap-1.1.0.css +++ b/bootstrap-1.1.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Thu Aug 25 22:35:30 PDT 2011 + * Date: Thu Aug 25 22:44:09 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -315,26 +315,26 @@ body { color: #808080; text-rendering: optimizeLegibility; } -div.container { +.container { width: 940px; margin: 0 auto; } -div.container-fluid { +.container-fluid { padding: 0 20px; zoom: 1; } -div.container-fluid:before, div.container-fluid:after { +.container-fluid:before, .container-fluid:after { display: table; content: ""; } -div.container-fluid:after { +.container-fluid:after { clear: both; } -div.container-fluid div.sidebar { +.container-fluid .sidebar { float: left; width: 220px; } -div.container-fluid div.content { +.container-fluid .content { min-width: 700px; max-width: 1180px; margin-left: 240px; diff --git a/bootstrap-1.1.0.min.css b/bootstrap-1.1.0.min.css index 4cd8bdcbac..343a51ec63 100644 --- a/bootstrap-1.1.0.min.css +++ b/bootstrap-1.1.0.min.css @@ -46,11 +46,11 @@ header,section,footer,article,aside{display:block;} .row .offset12{margin-left:740px;} html,body{background-color:#fff;} body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;text-rendering:optimizeLegibility;} -div.container{width:940px;margin:0 auto;} -div.container-fluid{padding:0 20px;zoom:1;}div.container-fluid:before,div.container-fluid:after{display:table;content:"";} -div.container-fluid:after{clear:both;} -div.container-fluid div.sidebar{float:left;width:220px;} -div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;} +.container{width:940px;margin:0 auto;} +.container-fluid{padding:0 20px;zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";} +.container-fluid:after{clear:both;} +.container-fluid .sidebar{float:left;width:220px;} +.container-fluid .content{min-width:700px;max-width:1180px;margin-left:240px;} a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#0050a3;text-decoration:underline;} p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;} h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;} diff --git a/lib/scaffolding.less b/lib/scaffolding.less index ad5cc7644d..6b7fa799fa 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -81,20 +81,20 @@ body { } // Container (centered, fixed-width layouts) -div.container { +.container { width: 940px; margin: 0 auto; } // Fluid layouts (left aligned, with sidebar, min- & max-width content) -div.container-fluid { +.container-fluid { padding: 0 20px; .clearfix(); - div.sidebar { + .sidebar { float: left; width: 220px; } - div.content { + .content { min-width: 700px; max-width: 1180px; margin-left: 240px; From 0758f64045645849b21164149428719a005da1cb Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 25 Aug 2011 22:52:21 -0700 Subject: [PATCH 10/17] updated classnames in the docs for the alerts, updated colors on error and info alerts/buttons --- bootstrap-1.1.0.css | 38 +++++++++++++++++++------------------- bootstrap-1.1.0.min.css | 4 ++-- docs/index.html | 4 ++-- lib/preboot.less | 13 ++++++------- 4 files changed, 29 insertions(+), 30 deletions(-) diff --git a/bootstrap-1.1.0.css b/bootstrap-1.1.0.css index e97f2fc897..1c1db831f0 100644 --- a/bootstrap-1.1.0.css +++ b/bootstrap-1.1.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Thu Aug 25 22:44:09 PDT 2011 + * Date: Thu Aug 25 22:51:24 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -143,17 +143,17 @@ aside { .alert-message.danger, .btn.error, .alert-message.error { - background-color: #d6463e; + background-color: #c43c35; background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#f56a66), to(#d6463e)); - background-image: -moz-linear-gradient(#f56a66, #d6463e); - background-image: -ms-linear-gradient(#f56a66, #d6463e); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f56a66), color-stop(100%, #d6463e)); - background-image: -webkit-linear-gradient(#f56a66, #d6463e); - background-image: -o-linear-gradient(#f56a66, #d6463e); - background-image: linear-gradient(#f56a66, #d6463e); + background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35)); + background-image: -moz-linear-gradient(#ee5f5b, #c43c35); + background-image: -ms-linear-gradient(#ee5f5b, #c43c35); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35)); + background-image: -webkit-linear-gradient(#ee5f5b, #c43c35); + background-image: -o-linear-gradient(#ee5f5b, #c43c35); + background-image: linear-gradient(#ee5f5b, #c43c35); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - border-color: #d6463e #d6463e #a52a23; + border-color: #c43c35 #c43c35 #882a25; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } .btn.success, .alert-message.success { @@ -171,17 +171,17 @@ aside { border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } .btn.info, .alert-message.info { - background-color: #36b3d9; + background-color: #339bb9; background-repeat: repeat-x; - background-image: -khtml-gradient(linear, left top, left bottom, from(#6bd0ee), to(#36b3d9)); - background-image: -moz-linear-gradient(#6bd0ee, #36b3d9); - background-image: -ms-linear-gradient(#6bd0ee, #36b3d9); - background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #6bd0ee), color-stop(100%, #36b3d9)); - background-image: -webkit-linear-gradient(#6bd0ee, #36b3d9); - background-image: -o-linear-gradient(#6bd0ee, #36b3d9); - background-image: linear-gradient(#6bd0ee, #36b3d9); + background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9)); + background-image: -moz-linear-gradient(#5bc0de, #339bb9); + background-image: -ms-linear-gradient(#5bc0de, #339bb9); + background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9)); + background-image: -webkit-linear-gradient(#5bc0de, #339bb9); + background-image: -o-linear-gradient(#5bc0de, #339bb9); + background-image: linear-gradient(#5bc0de, #339bb9); text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - border-color: #36b3d9 #36b3d9 #1f85a4; + border-color: #339bb9 #339bb9 #22697d; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } /* diff --git a/bootstrap-1.1.0.min.css b/bootstrap-1.1.0.min.css index 343a51ec63..937e453754 100644 --- a/bootstrap-1.1.0.min.css +++ b/bootstrap-1.1.0.min.css @@ -10,9 +10,9 @@ header,section,footer,article,aside{display:block;} .container{width:940px;margin:0 auto;zoom:1;}.container:before,.container:after{display:table;content:"";} .container:after{clear:both;} .btn.danger,.alert-message.danger,.btn.danger:hover,.alert-message.danger:hover,.btn.error,.alert-message.error,.btn.error:hover,.alert-message.error:hover,.btn.success,.alert-message.success,.btn.success:hover,.alert-message.success:hover,.btn.info,.alert-message.info,.btn.info:hover,.alert-message.info:hover{color:#ffffff;} -.btn.danger,.alert-message.danger,.btn.error,.alert-message.error{background-color:#d6463e;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#f56a66), to(#d6463e));background-image:-moz-linear-gradient(#f56a66, #d6463e);background-image:-ms-linear-gradient(#f56a66, #d6463e);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #f56a66), color-stop(100%, #d6463e));background-image:-webkit-linear-gradient(#f56a66, #d6463e);background-image:-o-linear-gradient(#f56a66, #d6463e);background-image:linear-gradient(#f56a66, #d6463e);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#d6463e #d6463e #a52a23;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} +.btn.danger,.alert-message.danger,.btn.error,.alert-message.error{background-color:#c43c35;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));background-image:-moz-linear-gradient(#ee5f5b, #c43c35);background-image:-ms-linear-gradient(#ee5f5b, #c43c35);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));background-image:-webkit-linear-gradient(#ee5f5b, #c43c35);background-image:-o-linear-gradient(#ee5f5b, #c43c35);background-image:linear-gradient(#ee5f5b, #c43c35);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#c43c35 #c43c35 #882a25;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} .btn.success,.alert-message.success{background-color:#57a957;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));background-image:-moz-linear-gradient(#62c462, #57a957);background-image:-ms-linear-gradient(#62c462, #57a957);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));background-image:-webkit-linear-gradient(#62c462, #57a957);background-image:-o-linear-gradient(#62c462, #57a957);background-image:linear-gradient(#62c462, #57a957);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#57a957 #57a957 #3d773d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} -.btn.info,.alert-message.info{background-color:#36b3d9;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#6bd0ee), to(#36b3d9));background-image:-moz-linear-gradient(#6bd0ee, #36b3d9);background-image:-ms-linear-gradient(#6bd0ee, #36b3d9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #6bd0ee), color-stop(100%, #36b3d9));background-image:-webkit-linear-gradient(#6bd0ee, #36b3d9);background-image:-o-linear-gradient(#6bd0ee, #36b3d9);background-image:linear-gradient(#6bd0ee, #36b3d9);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#36b3d9 #36b3d9 #1f85a4;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} +.btn.info,.alert-message.info{background-color:#339bb9;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));background-image:-moz-linear-gradient(#5bc0de, #339bb9);background-image:-ms-linear-gradient(#5bc0de, #339bb9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));background-image:-webkit-linear-gradient(#5bc0de, #339bb9);background-image:-o-linear-gradient(#5bc0de, #339bb9);background-image:linear-gradient(#5bc0de, #339bb9);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#339bb9 #339bb9 #22697d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} .row{zoom:1;margin-left:-20px;}.row:before,.row:after{display:table;content:"";} .row:after{clear:both;} .row .span1,.row .span2,.row .span3,.row .span4,.row .span5,.row .span6,.row .span7,.row .span8,.row .span9,.row .span10,.row .span11,.row .span12,.row .span13,.row .span14,.row .span15,.row .span16{display:inline;float:left;margin-left:20px;} diff --git a/docs/index.html b/docs/index.html index 136a0dbcd2..68ae4cf947 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1064,7 +1064,7 @@

    Basic alerts

    -

    div.alert

    +

    div.alert-message

    One-line messages for highlighting the failure, possible failure, or success of an action. Particularly useful for forms.

    @@ -1090,7 +1090,7 @@

    Block messages

    -

    div.alert.alert-block

    +

    div.alert-message.block-message

    For messages that require a bit of explanation, we have paragraph style alerts. These are perfect for bubbling up longer error messages, warning a user of a pending action, or just presenting information for more emphasis on the page.

    diff --git a/lib/preboot.less b/lib/preboot.less index 5191c5cc56..eb43301fa7 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -188,11 +188,10 @@ border-color: @secondaryColor @secondaryColor darken(@secondaryColor, 15%); border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%); } - // Shared colors for buttons and alerts - .btn, .alert-message { + // Set text color &.danger, &.danger:hover, &.error, @@ -203,18 +202,18 @@ &.info:hover { color: @white } - + // Danger and error appear as red &.danger, &.error { - .gradientBar(#f56a66, #d6463e); + .gradientBar(#ee5f5b, #c43c35); } - + // Success appears as green &.success { .gradientBar(#62c462, #57a957); } - + // Info appears as a neutral blue &.info { - .gradientBar(#6bd0ee, #36b3d9); + .gradientBar(#5bc0de, #339bb9); } } From dd4bb95c2db5db9bb6727147002d916cb86756e6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 25 Aug 2011 23:10:18 -0700 Subject: [PATCH 11/17] updated docs for b/i tags based on issue #62 --- docs/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.html b/docs/index.html index 68ae4cf947..e0c980b8ba 100644 --- a/docs/index.html +++ b/docs/index.html @@ -338,7 +338,7 @@

    Emphasis tags (<strong> and <em>) should be used to indicate additional importance or emphasis of a word or phrase relative to its surrounding copy. Use <strong> for importance and <em> for stress emphasis.

    Emphasis in a paragraph

    Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Maecenas faucibus mollis interdum. Nulla vitae elit libero, a pharetra augue.

    -

    Note: It's still okay to use <b> and <i> tags in HTML5, but they don't come with inherent styles anymore. <b> is meant to highlight words or phrases without conveying additional importance, while <i> is mostly for voice, technical terms, etc.

    +

    Note: It's still okay to use <b> and <i> tags in HTML5 and they don't have to be styled bold and italic, respectively (although if there is a more semantic element, use it). <b> is meant to highlight words or phrases without conveying additional importance, while <i> is mostly for voice, technical terms, etc.

    Addresses

    The <address> element is used for contact information for its nearest ancestor, or the entire body of work. Here’s how it looks:

    From c715584428752c885193b8e72d1b3156eb770aa7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 25 Aug 2011 23:18:15 -0700 Subject: [PATCH 12/17] pull table class from docs again --- docs/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/index.html b/docs/index.html index e0c980b8ba..2cf2415c1a 100644 --- a/docs/index.html +++ b/docs/index.html @@ -503,7 +503,7 @@ 
    -<table class="common-table">
+<table>
   ...
 </table>

    Example: Zebra-striped

    @@ -540,7 +540,7 @@

    Note: Zebra-striping is a progressive enhancement not available for older browsers like IE8 and below.

    -<table class="common-table zebra-striped">
+<table class="zebra-striped">
 ...
 </table>

    Example: Zebra-striped w/ TableSorter.js

    @@ -582,7 +582,7 @@ $("table#sortTableExample").tablesorter({ sortList: [[1,0]] }); }); </script> -<table class="common-table zebra-striped"> +<table class="zebra-striped"> ... </table>
    From ab77d7abd39f44cbf281826c8721228e21c05ed3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 25 Aug 2011 23:19:01 -0700 Subject: [PATCH 13/17] spacing --- bootstrap-1.1.0.css | 2 +- lib/reset.less | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bootstrap-1.1.0.css b/bootstrap-1.1.0.css index af511cc656..0ac346f422 100644 --- a/bootstrap-1.1.0.css +++ b/bootstrap-1.1.0.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Thu Aug 25 23:12:07 PDT 2011 + * Date: Thu Aug 25 23:18:55 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). diff --git a/lib/reset.less b/lib/reset.less index 28802f559a..e79b77b401 100644 --- a/lib/reset.less +++ b/lib/reset.less @@ -134,6 +134,7 @@ textarea { overflow: auto; // Remove vertical scrollbar in IE6-9 vertical-align: top; // Readability and alignment cross-browser } + // Tables // ------------------------- // Source: http://github.com/necolas/normalize.css From 74a18b341c8e071437de9e1e8ba5e1e56531b93c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 25 Aug 2011 23:25:21 -0700 Subject: [PATCH 14/17] updated le docs to include note about topbar and padding on box (issue #86) and add snippet about @basefont and @baseline to type section --- docs/index.html | 51 ++++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/docs/index.html b/docs/index.html index 2cf2415c1a..20591cc244 100644 --- a/docs/index.html +++ b/docs/index.html @@ -65,7 +65,7 @@ It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.

    Nerd alert: Bootstrap is built with Less and was designed to work out of the gate with modern browsers in mind.

    -
    +
    @@ -303,8 +303,10 @@
    -

    Headings and copy

    +

    Headings & copy

    A standard typographic hierarchy for structuring your webpages.

    +

    The entire typographic grid is based on two Less variables in our preboot.less file: @basefont and @baseline. The first is the base font-size used throughout and the second is the base line-height.

    +

    We use those variables, and some math, to create the margins, paddings, and line-heights of all our type and more.

    h1. Heading 1

    @@ -611,7 +613,7 @@
    -
    +
    @@ -623,7 +625,7 @@
    -
    +
    @@ -635,26 +637,26 @@
    -
    +
    Some Value Here
    -
    +
    -
    +
    Small snippet of help text
    -
    +
    Example form legend @@ -666,7 +668,7 @@ - +
    @@ -675,7 +677,7 @@
    - +
    @@ -684,13 +686,13 @@
    - +
    -
    +
    Example form legend @@ -727,7 +729,7 @@ Note: Labels surround all the options for much larger click areas and a more usable form. - +
    @@ -740,7 +742,7 @@ All times are shown as Pacific Standard Time (GMT -08:00).
    - +
    @@ -749,7 +751,7 @@ Block of help text to describe the field above if need be.
    -
    +
    @@ -768,7 +770,7 @@
    -
    +
     
    @@ -793,7 +795,7 @@
    - +
    @@ -805,7 +807,7 @@
    -
    +
    Example form legend @@ -815,7 +817,7 @@ Small snippet of help text - +
    @@ -837,7 +839,7 @@ Note: Labels surround all the options for much larger click areas and a more usable form.
    -
    +
      @@ -923,9 +925,9 @@
    - - - + + +
    @@ -941,6 +943,7 @@

    As part of the main navigation, we’ve included the ability for you to add dropdowns to your nav. Check out the secondary nav above (right aligned) to see how it’s done.

    +

    Note: When using the topbar on any page, be sure to account for the overlap it causes by adding padding-top: 40px; to your body.


    @@ -1366,7 +1369,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita - +