fixing conflict and recompiling

8ff18a9f · Mark Otto · b188c0da · d1b594db · 8ff18a9f · 8ff18a9f
Commit 8ff18a9f authored 13 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 61 additions and 67 deletions
+61 -67
--- a/Makefile
+++ b/Makefile
 DATE=$(shell DATE)
-BOOTSTRAP = ./bootstrap-1.3.0.css
+BOOTSTRAP = ./bootstrap.css
-BOOTSTRAP_MIN = ./bootstrap-1.3.0.min.css
+BOOTSTRAP_MIN = ./bootstrap.min.css
 BOOTSTRAP_LESS = ./lib/bootstrap.less
 LESS_COMPESSOR ?= `which lessc`
 WATCHR ?= `which watchr`

--- 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:
-    <link rel="stylesheet" type="text/css" href="bootstrap-1.3.0.css">
+    <link rel="stylesheet" type="text/css" href="bootstrap.css">
 For more info, refer to the docs!

--- a/bootstrap-1.3.0.css
+++ b/bootstrap-1.3.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 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;

--- a/bootstrap-1.3.0.min.css
+++ b/bootstrap-1.3.0.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;}

--- 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: #eee;
-  background-color: rgba(0,0,0,.1);
+  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: #ddd;
-  background-color: rgba(0,0,0,.2);
+  background: rgba(0,0,0,.2);
 }
 .show-grid .show-grid {
  margin-top: 0;

--- 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({

--- a/docs/index.html
+++ b/docs/index.html
@@ -12,7 +12,7 @@
    <![endif]-->
    <!-- Le styles -->
-    <link href="../bootstrap-1.3.0.css" rel="stylesheet">
+    <link href="../bootstrap.css" rel="stylesheet">
    <link href="assets/css/docs.css" rel="stylesheet">
    <link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
@@ -37,7 +37,7 @@
    <!-- Topbar
    ================================================== -->
-    <div class="topbar" data-scrollspy="x" >
+    <div class="topbar" data-scrollspy="scrollspy" >
      <div class="topbar-inner">
        <div class="container">
          <a class="brand" href="#">Bootstrap</a>
@@ -84,7 +84,7 @@
            <h6>Hotlink the CSS</h6>
            <p>For the quickest and easiest start, just copy this snippet into your webpage.</p>
            <form>
-              <textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.3.0.min.css"></textarea>
+              <textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.min.css"></textarea>
            </form>
          </div>
          <div class="span5">
@@ -128,7 +128,7 @@
    <div class="span-one-third">
      <h3>Browser support</h3>
      <p>Bootstrap is tested and supported in major modern browsers like Chrome, Safari, Internet Explorer, and Firefox.</p>
-      <img src="assets/img/browsers.png" width="258px" height="48px" alt="Tested and supported in Chrome, Safari, Internet Explorer, and Firefox">
+      <img src="assets/img/browsers.png" alt="Tested and supported in Chrome, Safari, Internet Explorer, and Firefox">
      <ul>
        <li>Latest Safari</li>
        <li>Latest Google Chrome</li>
@@ -143,7 +143,7 @@
      <ul>
        <li><span class="label">New in 1.3</span> <a href="./javascript.html">Javascript plugins</a></li>
        <li>All original .less files</li>
-        <li>Fully <a href="../bootstrap-1.3.0.css">compiled</a> and <a href="../bootstrap-1.3.0.min.css">minified</a> CSS</li>
+        <li>Fully <a href="../bootstrap.css">compiled</a> and <a href="../bootstrap.min.css">minified</a> CSS</li>
        <li>Complete styleguide documentation</li>
        <li>Three example pages with different layouts</li>
      </ul>
@@ -1303,7 +1303,7 @@
  </div>
  <h2>Fixed topbar</h2>
  <div class="topbar-wrapper" style="z-index: 5;">
-    <div class="topbar" data-dropdown="x" >
+    <div class="topbar" data-dropdown="dropdown" >
      <div class="topbar-inner">
        <div class="container">
          <h3><a href="#">Project Name</a></h3>
@@ -1372,7 +1372,7 @@
        <li><a href="#">Messages</a></li>
        <li><a href="#">Settings</a></li>
        <li><a href="#">Contact</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>
@@ -1682,7 +1682,7 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
              </div>
            </div>
          </div>
-          <img class="large-bird" src="assets/img/bird.png" width="220px" height="145px">
+          <img class="large-bird" src="assets/img/bird.png" >
        </div>
      </div>
    </div>
@@ -1896,7 +1896,7 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
          <td>Command line</td>
          <td>
            <p>If you already have the less command line tool installed, simply run the following command:</p>
-              <pre>$ lessc ./lib/bootstrap.less > bootstrap-1.3.0.css</pre>
+              <pre>$ lessc ./lib/bootstrap.less > bootstrap.css</pre>
            <p>Be sure to include <code>--compress</code> in that command if you're trying to save some bytes!</p>
          </td>
        </tr>

--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -24,7 +24,7 @@
    <script src="../js/bootstrap-tabs.js"></script>
    <!-- Le styles -->
-    <link href="../bootstrap-1.3.0.css" rel="stylesheet">
+    <link href="../bootstrap.css" rel="stylesheet">
    <link href="assets/css/docs.css" rel="stylesheet">
    <link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
@@ -39,7 +39,7 @@
    <!-- Topbar
    ================================================== -->
-    <div class="topbar" data-scrollspy="x" >
+    <div class="topbar" data-scrollspy="scrollspy" >
      <div class="fill">
        <div class="container">
          <h3><a href="#">Bootstrap JS</a></h3>
@@ -221,7 +221,7 @@ $('#my-modal').bind('hidden', function () {
 <pre class="prettyprint linenums">
 &lt;ul class="tabs"&gt;
  &lt;li class="active"&gt;&lt;a href="#"&gt;Home&lt;/a&gt;&lt;/li&gt;
-  &lt;li class="dropdown" data-dropdown="x" &gt;
+  &lt;li class="dropdown" data-dropdown="dropdown" &gt;
    &lt;a href="#" class="dropdown-toggle"&gt;Dropdown&lt;/a&gt;
    &lt;ul class="dropdown-menu"&gt;
      &lt;li&gt;&lt;a href="#"&gt;Secondary link&lt;/a&gt;&lt;/li&gt;
@@ -239,7 +239,7 @@ $('#my-modal').bind('hidden', function () {
          </p>
          <h3>Demo</h3>
          <div class="topbar-wrapper">
-            <div id="topbar-example" class="topbar" data-dropdown="x">
+            <div id="topbar-example" class="topbar" data-dropdown="dropdown">
              <div class="topbar-inner">
                <div class="container">
                  <h3><a href="#">Project Name</a></h3>
@@ -295,7 +295,7 @@ $('#my-modal').bind('hidden', function () {
          <pre class="prettyprint linenums">$('#topbar').dropdown()</pre>
          <h3>Markup</h3>
          <p>To easily add scrollspy behavior to your nav, just add the <code>data-scrollspy</code> attribute to the <code>.topbar</code>.
-          <pre class="prettyprint linenums">&lt;div class="topbar" data-scrollspy="x" &gt;...&lt;/div&gt;</pre>
+          <pre class="prettyprint linenums">&lt;div class="topbar" data-scrollspy="scrollspy" &gt;...&lt;/div&gt;</pre>
          <h3>Methods</h3>
          <h4>$().scrollspy()</h4>
          <p>
@@ -330,7 +330,7 @@ $('#my-modal').bind('hidden', function () {
          <pre class="prettyprint linenums">$('.tabs').tabs()</pre>
          <h3>Markup</h3>
          <p>You can activate a tab or pill navigation without writing any javascript by simply giving them a <code>data-tabs</code> or <code>data-pills</code> attribute.</p>
-          <pre class="prettyprint linenums"> &lt;ul class="tabs" data-tabs="x" &gt;...&lt;/ul&gt;</pre>
+          <pre class="prettyprint linenums"> &lt;ul class="tabs" data-tabs="tabs" &gt;...&lt;/ul&gt;</pre>
          <h3>Methods</h3>
          <h4>$().tabs or $().pills</h4>
          <p>
@@ -358,7 +358,7 @@ $('#my-modal').bind('hidden', function () {
 &lt;/script&gt;</pre>
          </p>
          <h3>Demo</h3>
-          <ul class="tabs" data-tabs="x" >
+          <ul class="tabs" data-tabs="tabs" >
            <li class="active"><a href="#home">Home</a></li>
            <li><a href="#profile">Profile</a></li>
            <li><a href="#messages">Messages</a></li>
@@ -644,11 +644,11 @@ $('#my-modal').bind('hidden', function () {
          <p>Closes an alert.</p>
          <pre class="prettyprint linenums">$(".alert-message").alert('close')</pre>
          <h3>Demo</h3>
-          <div class="alert-message warning fade in" data-alert="x" >
+          <div class="alert-message warning fade in" data-alert="alert" >
            <a class="close" href="#">&times;</a>
            <p><strong>Holy guacamole!</strong> Best check yo self, you’re not looking too good.</p>
          </div>
-          <div class="alert-message block-message error fade in" data-alert="x" >
+          <div class="alert-message block-message error fade in" data-alert="alert" >
            <a class="close" href="#">&times;</a>
            <p><strong>Oh snap! You got an error!</strong> 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.</p>
            <div class="alert-actions">

--- a/examples/container-app.html
+++ b/examples/container-app.html
@@ -12,7 +12,7 @@
    <![endif]-->
    <!-- Le styles -->
-    <link href="../bootstrap-1.3.0.css" rel="stylesheet">
+    <link href="../bootstrap.css" rel="stylesheet">
    <style type="text/css">
      /* Override some defaults */
      html, body {

--- a/examples/fluid.html
+++ b/examples/fluid.html
@@ -12,7 +12,7 @@
    <![endif]-->
    <!-- Le styles -->
-    <link href="../bootstrap-1.3.0.css" rel="stylesheet">
+    <link href="../bootstrap.css" rel="stylesheet">
    <style type="text/css">
      body {
        padding-top: 60px;

--- a/examples/hero.html
+++ b/examples/hero.html
@@ -12,7 +12,7 @@
    <![endif]-->
    <!-- Le styles -->
-    <link href="../bootstrap-1.3.0.css" rel="stylesheet">
+    <link href="../bootstrap.css" rel="stylesheet">
    <style type="text/css">
      body {
        padding-top: 60px;

--- a/js/bootstrap-alerts.js
+++ b/js/bootstrap-alerts.js
@@ -25,7 +25,7 @@
   var transitionEnd
-   $(function () {
+   $(document).ready(function () {
     $.support.transition = (function () {
       var thisBody = document.body || document.documentElement
@@ -97,7 +97,7 @@
    })
  }
-  $(function () {
+  $(document).ready(function () {
    new Alert($('body'), '.alert-message[data-alert] .close')
  })

--- a/js/bootstrap-modal.js
+++ b/js/bootstrap-modal.js
@@ -25,7 +25,7 @@
  var transitionEnd
-  $(function () {
+  $(document).ready(function () {
    $.support.transition = (function () {
      var thisBody = document.body || document.documentElement
@@ -216,7 +216,7 @@
 /* MODAL DATA- IMPLEMENTATION
  * ========================== */
-  $(function () {
+  $(document).ready(function () {
    $('body').delegate('[data-controls-modal]', 'click', function (e) {
      e.preventDefault()
      var $this = $(this).data('show', true)

--- a/js/bootstrap-scrollspy.js
+++ b/js/bootstrap-scrollspy.js
@@ -98,7 +98,7 @@
    return this
  }
-  $(function () {
+  $(document).ready(function () {
    $('body').scrollSpy('[data-scrollspy] li > a')
  })

--- a/js/bootstrap-tabs.js
+++ b/js/bootstrap-tabs.js
@@ -55,7 +55,7 @@
    })
  }
-  $(function () {
+  $(document).ready(function () {
    $('body').tabs('ul[data-tabs] li > a, ul[data-pills] > li > a')
  })

--- a/js/bootstrap-twipsy.js
+++ b/js/bootstrap-twipsy.js
@@ -26,7 +26,7 @@
  var transitionEnd
-  $(function () {
+  $(document).ready(function () {
    $.support.transition = (function () {
      var thisBody = document.body || document.documentElement

--- a/lib/forms.less
+++ b/lib/forms.less
@@ -28,6 +28,7 @@ fieldset {
 // Parent element that clears floats and wraps labels and fields together
 form .clearfix {
  margin-bottom: @baseline;
+  .clearfix()
 }
 // Set font for forms
@@ -145,7 +146,7 @@ textarea {
 }
 input:focus,
 textarea:focus {
-  outline: none;
+  outline: 0;
  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);
@@ -330,12 +331,13 @@ textarea[readonly] {
 // Allow us to put symbols and text within the input field for a cleaner look
 .input-prepend,
 .input-append {
-  .clearfix();
  input {
    .border-radius(0 3px 3px 0);
  }
  .add-on {
    position: relative;
+    background: #f5f5f5;
+    border: 1px solid #ccc;
    z-index: 2;
    float: left;
    display: block;
@@ -349,8 +351,6 @@ textarea[readonly] {
    color: @grayLight;
    text-align: center;
    text-shadow: 0 1px 0 @white;
-    background-color: #f5f5f5;
-    border: 1px solid #ccc;
    .border-radius(3px 0 0 3px);
  }
  .active {

--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -100,7 +100,7 @@
    // Focus states (we use .focused since IE8 and down doesn't support :focus)
    &:focus,
    &.focused {
-      outline: none;
+      outline: 0;
      background-color: @white;
      color: @grayDark;
      text-shadow: 0 1px 0 @white;