diff --git a/Makefile b/Makefile index 5ae8740b0..ca99eaa18 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ DATE=$(shell DATE) -BOOTSTRAP = ./bootstrap-1.3.0.css -BOOTSTRAP_MIN = ./bootstrap-1.3.0.min.css +BOOTSTRAP = ./bootstrap.css +BOOTSTRAP_MIN = ./bootstrap.min.css BOOTSTRAP_LESS = ./lib/bootstrap.less LESS_COMPESSOR ?= `which lessc` WATCHR ?= `which watchr` diff --git a/README.md b/README.md index d9a7cb20a..98953a7ad 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Here's what the LESS version looks like: Or if you prefer, the standard css way: - + For more info, refer to the docs! diff --git a/bootstrap-1.3.0.css b/bootstrap.css similarity index 99% rename from bootstrap-1.3.0.css rename to bootstrap.css index 16bfefdb2..bcba5b457 100644 --- a/bootstrap-1.3.0.css +++ b/bootstrap.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 Sep 15 09:29:41 PDT 2011 + * Date: Fri Sep 16 09:47:29 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). @@ -594,6 +594,16 @@ fieldset legend { } form .clearfix { margin-bottom: 18px; + zoom: 1; +} +form .clearfix:before, form .clearfix:after { + display: table; + content: ""; + zoom: 1; + *display: inline; +} +form .clearfix:after { + clear: both; } label, input, @@ -699,7 +709,7 @@ input, textarea { box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); } input:focus, textarea:focus { - outline: none; + outline: 0; 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); @@ -936,21 +946,6 @@ textarea[readonly] { .inline-inputs span { padding: 0 2px 0 1px; } -.input-prepend, .input-append { - zoom: 1; -} -.input-prepend:before, -.input-append:before, -.input-prepend:after, -.input-append:after { - display: table; - content: ""; - zoom: 1; - *display: inline; -} -.input-prepend:after, .input-append:after { - clear: both; -} .input-prepend input, .input-append input { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; @@ -958,6 +953,8 @@ textarea[readonly] { } .input-prepend .add-on, .input-append .add-on { position: relative; + background: #f5f5f5; + border: 1px solid #ccc; z-index: 2; float: left; display: block; @@ -971,8 +968,6 @@ textarea[readonly] { color: #bfbfbf; text-align: center; text-shadow: 0 1px 0 #ffffff; - background-color: #f5f5f5; - border: 1px solid #ccc; -webkit-border-radius: 3px 0 0 3px; -moz-border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px; @@ -1319,7 +1314,7 @@ table .headerSortUp.purple, table .headerSortDown.purple { color: #ffffff; } .topbar input:focus, .topbar input.focused { - outline: none; + outline: 0; background-color: #ffffff; color: #404040; text-shadow: 0 1px 0 #ffffff; diff --git a/bootstrap-1.3.0.min.css b/bootstrap.min.css similarity index 97% rename from bootstrap-1.3.0.min.css rename to bootstrap.min.css index 6d883aa83..0e0c04b12 100644 --- a/bootstrap-1.3.0.min.css +++ b/bootstrap.min.css @@ -106,7 +106,8 @@ code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;} pre{background-color:#f5f5f5;display:block;padding:8.5px;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;padding-left:150px;font-size:19.5px;line-height:1;color:#404040;*padding:0 0 5px 145px;*line-height:1.5;} -form .clearfix{margin-bottom:18px;} +form .clearfix{margin-bottom:18px;zoom:1;}form .clearfix:before,form .clearfix:after{display:table;content:"";zoom:1;*display:inline;} +form .clearfix:after{clear:both;} 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;} form .input{margin-left:150px;} @@ -122,7 +123,7 @@ textarea{height:auto;} :-moz-placeholder{color:#bfbfbf;} ::-webkit-input-placeholder{color:#bfbfbf;} input,textarea{-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-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: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);} +input:focus,textarea:focus{outline:0;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);} input[type=file]:focus,input[type=checkbox]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:1px dotted #666;} form div.clearfix.error{background:#fae5e3;padding:10px 0;margin:-10px 0 10px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}form div.clearfix.error>label,form div.clearfix.error span.help-inline,form div.clearfix.error span.help-block{color:#9d261d;} form div.clearfix.error input,form div.clearfix.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.clearfix.error input:focus,form div.clearfix.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);} @@ -159,10 +160,8 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado .inline-inputs input.mini{width:60px;} .inline-inputs input.small{width:90px;} .inline-inputs span{padding:0 2px 0 1px;} -.input-prepend,.input-append{zoom:1;}.input-prepend:before,.input-append:before,.input-prepend:after,.input-append:after{display:table;content:"";zoom:1;*display:inline;} -.input-prepend:after,.input-append:after{clear:both;} .input-prepend input,.input-append input{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} -.input-prepend .add-on,.input-append .add-on{position:relative;z-index:2;float:left;display:block;width:auto;min-width:16px;height:18px;padding:4px 4px 4px 5px;margin-right:-1px;font-weight:normal;line-height:18px;color:#bfbfbf;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#f5f5f5;border:1px solid #ccc;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} +.input-prepend .add-on,.input-append .add-on{position:relative;background:#f5f5f5;border:1px solid #ccc;z-index:2;float:left;display:block;width:auto;min-width:16px;height:18px;padding:4px 4px 4px 5px;margin-right:-1px;font-weight:normal;line-height:18px;color:#bfbfbf;text-align:center;text-shadow:0 1px 0 #ffffff;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} .input-prepend .active,.input-append .active{background:#a9dba9;border-color:#46a546;} .input-prepend .add-on{*margin-top:1px;} .input-append input{float:left;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} @@ -219,7 +218,7 @@ table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0 .topbar input{background-color:#444;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;padding:4px 9px;color:#ffffff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.topbar input:-moz-placeholder{color:#e6e6e6;} .topbar input::-webkit-input-placeholder{color:#e6e6e6;} .topbar input:hover{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.5);color:#ffffff;} -.topbar input:focus,.topbar input.focused{outline:none;background-color:#ffffff;color:#404040;text-shadow:0 1px 0 #ffffff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);} +.topbar input:focus,.topbar input.focused{outline:0;background-color:#ffffff;color:#404040;text-shadow:0 1px 0 #ffffff;border:0;padding:5px 10px;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);} .topbar-inner,.topbar .fill{background-color:#222;background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} .topbar div>ul,.nav{display:block;float:left;margin:0 10px 0 0;position:relative;left:0;}.topbar div>ul>li,.nav>li{display:block;float:left;} .topbar div>ul a,.nav a{display:block;float:none;padding:10px 10px 11px;line-height:19px;text-decoration:none;}.topbar div>ul a:hover,.nav a:hover{color:#ffffff;text-decoration:none;} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index cb1dbb2f7..f2ccd0060 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -184,8 +184,8 @@ section > .row { margin-bottom: 10px; } .show-grid [class*="span"] { - background-color: #eee; - background-color: rgba(0,0,0,.1); + background: #eee; + background: rgba(0,0,0,.1); text-align: center; -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -194,8 +194,8 @@ section > .row { line-height: 30px; } .show-grid:hover [class*="span"] { - background-color: #ddd; - background-color: rgba(0,0,0,.2); + background: #ddd; + background: rgba(0,0,0,.2); } .show-grid .show-grid { margin-top: 0; diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 00fd56694..7400bc12b 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -36,7 +36,7 @@ $(document).ready(function(){ // POSITION STATIC TWIPSIES // ======================== - $(window).load(function () { + $(window).bind( 'load resize', function () { $(".twipsies a").each(function () { $(this) .twipsy({ diff --git a/docs/index.html b/docs/index.html index 3965da1b7..1d20bc3a2 100644 --- a/docs/index.html +++ b/docs/index.html @@ -12,7 +12,7 @@ - + @@ -37,7 +37,7 @@ -
+
Bootstrap @@ -84,7 +84,7 @@
Hotlink the CSS

For the quickest and easiest start, just copy this snippet into your webpage.

- +
@@ -128,7 +128,7 @@

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
    • @@ -143,7 +143,7 @@ @@ -1303,7 +1303,7 @@

Fixed topbar

-
+

Project Name

@@ -1372,7 +1372,7 @@
  • Messages
  • Settings
  • Contact
    • -
  • +
  • Dropdown
    • - +
    @@ -1896,7 +1896,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita Command line

    If you already have the less command line tool installed, simply run the following command:

    - 
    $ lessc ./lib/bootstrap.less > bootstrap-1.3.0.css
    + 
    $ lessc ./lib/bootstrap.less > bootstrap.css

    Be sure to include --compress in that command if you're trying to save some bytes!

    diff --git a/docs/javascript.html b/docs/javascript.html index 77cb2229f..454251c2b 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -24,7 +24,7 @@ - + @@ -39,7 +39,7 @@ -
    +

    Bootstrap JS

    @@ -221,7 +221,7 @@ $('#my-modal').bind('hidden', function () { 
     <ul class="tabs">
   <li class="active"><a href="#">Home</a></li>
-  <li class="dropdown" data-dropdown="x" >
+  <li class="dropdown" data-dropdown="dropdown" >
     <a href="#" class="dropdown-toggle">Dropdown</a>
     <ul class="dropdown-menu">
       <li><a href="#">Secondary link</a></li>
@@ -239,7 +239,7 @@ $('#my-modal').bind('hidden', function () {
           
    
           
    Demo
    
           
    
-            
    
+            
    
               
    
                 
    
                   
    Project Name
    
@@ -295,7 +295,7 @@ $('#my-modal').bind('hidden', function () {
           
    $('#topbar').dropdown()
    
           
    Markup
    
           
    To easily add scrollspy behavior to your nav, just add the data-scrollspy attribute to the .topbar.
-          
    <div class="topbar" data-scrollspy="x" >...</div>
    
+          
    <div class="topbar" data-scrollspy="scrollspy" >...</div>
    
           
    Methods
    
           
    $().scrollspy()
    
           
    
@@ -330,7 +330,7 @@ $('#my-modal').bind('hidden', function () {
           
    $('.tabs').tabs()
    
           
    Markup
    
           
    You can activate a tab or pill navigation without writing any javascript by simply giving them a data-tabs or data-pills attribute.
    
-          
     <ul class="tabs" data-tabs="x" >...</ul>
    
+          
     <ul class="tabs" data-tabs="tabs" >...</ul>
    
           
    Methods
    
           
    $().tabs or $().pills
    
           
    
@@ -358,7 +358,7 @@ $('#my-modal').bind('hidden', function () {
 </script>

    Demo

    -
      +
      • Home
      • Profile
      • Messages
        • @@ -644,11 +644,11 @@ $('#my-modal').bind('hidden', function () {

        Closes an alert.

        $(".alert-message").alert('close')

        Demo

        -
        +
        ×

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

        -
        +
        ×

        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.

        diff --git a/examples/container-app.html b/examples/container-app.html index 20ab13789..6432ecf0d 100644 --- a/examples/container-app.html +++ b/examples/container-app.html @@ -12,7 +12,7 @@ - +