merging in remote and recompiling

0cb6804b · Mark Otto · 62588327 · f6a4dd95 · 0cb6804b · 0cb6804b
Commit 0cb6804b authored Aug 31, 2011 by Mark Otto
10 changed files
--- a/Makefile
+++ b/Makefile
 DATE=$(shell DATE)
-BOOTSTRAP = ./bootstrap-1.1.1.css
+BOOTSTRAP = ./bootstrap-1.2.0.css
-BOOTSTRAP_MIN = ./bootstrap-1.1.1.min.css
+BOOTSTRAP_MIN = ./bootstrap-1.2.0.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.1.1.css">
+    <link rel="stylesheet" type="text/css" href="bootstrap-1.2.0.css">
 For more info, refer to the docs!
@@ -35,7 +35,7 @@ Releases will be numbered with the follow format:
 And constructed with the following guidelines:
 * Breaking backwards compatibility bumps the major
-* New additions without breaking backwards compatibility bumpbs the minor
+* New additions without breaking backwards compatibility bumps the minor
 * Bug fixes and misc changes bump the patch
 For more information on SemVer, please visit http://semver.org/.

--- a/bootstrap-1.1.1.css
+++ b/bootstrap-1.1.1.css
 /*!
- * Bootstrap v1.1.1
+ * Bootstrap v1.2.0
 *
 * Copyright 2011 Twitter, Inc
 * Licensed under the Apache License v2.0
 * 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 30 08:27:42 PDT 2011
+ * Date: Wed Aug 31 16:27:14 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).
@@ -424,113 +424,6 @@ a:hover {
  color: #0050a3;
  text-decoration: underline;
 }
-.btn {
-  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);
-}
-.btn:hover {
-  background-position: 0 -15px;
-  color: #333;
-  text-decoration: none;
-}
-.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(top, #049cdb, #0064cd);
-  background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
-  background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
-  background-image: -o-linear-gradient(top, #049cdb, #0064cd);
-  background-image: linear-gradient(top, #049cdb, #0064cd);
-  color: #fff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  border: 1px solid #004b9a;
-  border-bottom-color: #003f81;
-}
-.primary:hover {
-  color: #fff;
-}
-.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;
-  -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;
-}
 /* Typography.less
 * Headings, body text, lists, code, and more for a versatile and durable typography system
 * ---------------------------------------------------------------------------------------- */
@@ -1325,9 +1218,8 @@ table .headerSortUp.purple, table .headerSortDown.purple {
  right: 0;
 }
 .nav .dropdown-toggle:hover, .nav .dropdown.open .dropdown-toggle {
-  background-color: #444;
+  background: #444;
-  background-color: rgba(255, 255, 255, 0.05);
+  background: rgba(255, 255, 255, 0.05);
-  *background-color: #444;
 }
 .nav .dropdown-menu {
  background-color: #333;
@@ -1336,7 +1228,8 @@ table .headerSortUp.purple, table .headerSortDown.purple {
  color: #fff;
 }
 .nav .dropdown-menu .dropdown-toggle.open {
-  background-color: rgba(255, 255, 255, 0.05);
+  background: #444;
+  background: rgba(255, 255, 255, 0.05);
 }
 .nav .dropdown-menu li a {
  color: #999;
@@ -1444,8 +1337,8 @@ table .headerSortUp.purple, table .headerSortDown.purple {
 }
 .dropdown.open .dropdown-toggle {
  color: #fff;
-  background-color: #ccc;
+  background: #ccc;
-  background-color: rgba(0, 0, 0, 0.3);
+  background: rgba(0, 0, 0, 0.3);
 }
 .dropdown.open .dropdown-menu {
  display: block;
@@ -1479,9 +1372,9 @@ table .headerSortUp.purple, table .headerSortDown.purple {
 }
 .tabs > li {
  position: relative;
+  top: 1px;
 }
 .tabs > li > a {
-  margin-bottom: -1px;
  margin-right: 2px;
  padding: 0 15px;
  line-height: 35px;
@@ -1982,9 +1875,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
  height: 0;
 }
 .popover .inner {
-  background-color: #333;
+  background: #333;
-  background-color: rgba(0, 0, 0, 0.8);
+  background: rgba(0, 0, 0, 0.8);
-  *background-color: #333;
  padding: 3px;
  overflow: hidden;
  width: 280px;

--- a/bootstrap-1.1.1.min.css
+++ b/bootstrap-1.1.1.min.css
--- a/docs/index.html
+++ b/docs/index.html
@@ -12,7 +12,7 @@
    <![endif]-->
    <!-- Le styles -->
-    <link href="../bootstrap-1.1.1.css" rel="stylesheet">
+    <link href="../bootstrap-1.2.0.css" rel="stylesheet">
    <link href="assets/css/docs.css" rel="stylesheet">
    <link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
@@ -78,7 +78,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.1.1.min.css"></textarea>
+              <textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.2.0.min.css"></textarea>
            </form>
          </div>
          <div class="span5 columns">
@@ -663,9 +663,9 @@
            </div>
          </div><!-- /clearfix -->
          <div class="clearfix error">
-            <label for="xlInput">X-Large Input</label>
+            <label for="xlInput2">X-Large Input</label>
            <div class="input">
-              <input class="xlarge error" id="xlInput" name="xlInput" size="30" type="text" />
+              <input class="xlarge error" id="xlInput2" name="xlInput2" size="30" type="text" />
              <span class="help-inline">Small snippet of help text</span>
            </div>
          </div><!-- /clearfix -->
@@ -700,7 +700,7 @@
            </div>
          </div><!-- /clearfix -->
          <div class="clearfix">
-            <label for="xlInput">File Input</label>
+            <label for="fileInput">File Input</label>
            <div class="input">
              <input class="input-file" id="fileInput" name="fileInput" type="file" />
            </div>
@@ -803,9 +803,9 @@
        <fieldset>
          <legend>Example form legend</legend>
          <div class="clearfix">
-            <label for="xlInput">X-Large Input</label>
+            <label for="xlInput3">X-Large Input</label>
            <div class="input">
-              <input class="xlarge" id="xlInput" name="xlInput" size="30" type="text" />
+              <input class="xlarge" id="xlInput3" name="xlInput3" size="30" type="text" />
            </div>
          </div><!-- /clearfix -->
          <div class="clearfix">
@@ -824,9 +824,9 @@
        <fieldset>
          <legend>Example form legend</legend>
          <div class="clearfix error">
-            <label for="xlInput">X-Large Input</label>
+            <label for="xlInput4">X-Large Input</label>
            <div class="input">
-              <input class="xlarge error" id="xlInput" name="xlInput" size="30" type="text" />
+              <input class="xlarge error" id="xlInput4" name="xlInput4" size="30" type="text" />
              <span class="help-inline">Small snippet of help text</span>
            </div>
          </div><!-- /clearfix -->
@@ -870,11 +870,7 @@
      <h3>Example buttons</h3>
      <p>Button styles can be applied to anything with the <code>.btn</code> applied. Typically you’ll want to apply these to only <code>&lt;a&gt;</code>, <code>&lt;button&gt;</code>, and select <code>&lt;input&gt;</code> elements. Here’s how it looks:</p>
      <div class="well" style="padding: 14px 19px;">
-        <button class="btn primary">Primary</button>
+        <button class="btn primary">Primary</button>&nbsp;<button class="btn">Default</button>&nbsp;<button class="btn info">Info</button>&nbsp;<button class="btn success">Success</button>&nbsp;<button class="btn danger">Danger</button>
-        <button class="btn">Default</button>
-        <button class="btn info">Info</button>
-        <button class="btn success">Success</button>
-        <button class="btn danger">Danger</button>
      </div>
      <h3>Alternate sizes</h3>
      <p>Fancy larger or smaller buttons? Have at it!</p>

--- a/examples/hero.html
+++ b/examples/hero.html
@@ -12,7 +12,7 @@
    <![endif]-->
    <!-- Le styles -->
-    <link href="../bootstrap-1.1.1.css" rel="stylesheet">
+    <link href="../bootstrap-1.2.0.css" rel="stylesheet">
    <!-- Le fav and touch icons -->
    <link rel="shortcut icon" href="images/favicon.ico">
@@ -27,7 +27,7 @@
      <div class="fill">
        <div class="container">
          <h3><a href="#">Project name</a></h3>
-          <ul>
+          <ul class="nav">
            <li class="active"><a href="#">Home</a></li>
            <li><a href="#about">About</a></li>
            <li><a href="#contact">Contact</a></li>

--- a/lib/bootstrap.less
+++ b/lib/bootstrap.less
 /*!
- * Bootstrap v1.1.1
+ * Bootstrap v1.2.0
 *
 * Copyright 2011 Twitter, Inc
 * Licensed under the Apache License v2.0

--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -147,16 +147,16 @@
  // Dropdowns within the .nav
  .dropdown-toggle:hover,
  .dropdown.open .dropdown-toggle {
-    background-color: #444;
+    background: #444;
-    background-color: rgba(255,255,255,.05);
+    background: rgba(255,255,255,.05);
-    *background-color: #444; // IE6-7
  }
  .dropdown-menu {
    background-color: #333;
    .dropdown-toggle {
      color: #fff;
      &.open {
-        background-color: rgba(255,255,255,.05);
+        background: #444;
+        background: rgba(255,255,255,.05);
      }
    }
    li a {
@@ -253,8 +253,8 @@
 .dropdown.open {
  .dropdown-toggle {
    color: #fff;
-    background-color: #ccc;
+    background: #ccc;
-    background-color: rgba(0,0,0,.3);
+    background: rgba(0,0,0,.3);
  }
  .dropdown-menu {
    display: block;
@@ -283,8 +283,8 @@
  border-bottom: 1px solid #ddd;
  > li {
    position: relative; // For the dropdowns mostly
+    top: 1px;
    > a {
-      margin-bottom: -1px;
      margin-right: 2px;
      padding: 0 15px;
      line-height: (@baseline * 2) - 1;
@@ -743,9 +743,8 @@ input[type=submit].btn {
    height: 0;
  }
  .inner {
-    background-color: #333;
+    background: #333;
-    background-color: rgba(0,0,0,.8);
+    background: rgba(0,0,0,.8);
-    *background-color: #333; /* IE 6-7 */
    padding: 3px;
    overflow: hidden;
    width: 280px;

--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -108,89 +108,3 @@ a {
    text-decoration: underline;
  }
 }
-// Buttons
-.btn {
-  display: inline-block;
-  #gradient > .vertical-three-colors(#fff, #fff, 0.25, darken(#fff, 10%));
-  padding: 4px 14px;
-  text-shadow: 0 1px 1px rgba(255,255,255,.75);
-  color: #333;
-  font-size: 13px;
-  line-height: @baseline;
-  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;
-  }
-}
-.primary {
-  #gradient > .vertical(#049CDB, #0064CD);
-  color: #fff;
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-  border: 1px solid darken(#0064CD, 10%);
-  border-bottom-color: darken(#0064CD, 15%);
-  &:hover {
-    color: #fff;
-  }
-}
-.btn {
-  //.button(#1174C6);
-  .transition(.1s linear all);
-  &.primary {
-    //#gradient > .vertical(@blue, @blueDark);
-    color: #fff;
-    text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-    border-color: @blueDark @blueDark darken(@blueDark, 15%);
-    border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
-    &:hover {
-      color: #fff;
-    }
-  }
-  &.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;
-    .box-shadow(none);
-  }
-  // this can't be included with the .disabled def because IE8 and below will drop it ;_;
-  &:disabled {
-    background-image: none;
-    .opacity(65);
-    cursor: default;
-    .box-shadow(none);
-    &.primary {
-      color: #fff;
-    }
-  }
-  &:active {
-    @shadow: inset 0 3px 7px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
-    .box-shadow(@shadow);
-  }
-}
-// 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;
-  }
-}
--- a/templates/fluid.html
+++ b/templates/fluid.html
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <title>Bootstrap, from Twitter</title>
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
-    <!--[if lt IE 9]>
-      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-    <!-- Le styles -->
-    <link href="../bootstrap-1.0.0.css" rel="stylesheet">
-    <link href="assets/css/docs.css" rel="stylesheet">
-    <!-- Le javascript -->
-    <script src="http://code.jquery.com/jquery-1.5.2.min.js"></script>
-    <script src="http://autobahn.tablesorter.com/jquery.tablesorter.min.js"></script>
-    <link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
-    <script src="assets/js/google-code-prettify/prettify.js"></script>
-    <script src="assets/js/application.js"></script>
-    <!-- Le fav and touch icons -->
-    <link rel="shortcut icon" href="images/favicon.ico">
-    <link rel="apple-touch-icon" href="images/apple-touch-icon.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
-  </head>
-  <body>
-    <div class="topbar">
-      <div class="container-fluid">
-        <h3><a href="#">Project name</a></h3>
-        <ul>
-          <li class="active"><a href="#">Home</a></li>
-          <li><a href="#grid-system">About</a></li>
-          <li><a href="#layouts">Contact</a></li>
-        </ul>
-      </div>
-    </div>
-    <div class="container-fluid">
-      <!-- Sidebar for navigation and secondary content -->
-      <div class="sidebar">
-        <nav class="well">
-          <ul>
-            <li><a href="#">Home</a></li>
-            <li><a href="#">About</a></li>
-            <li><a href="#">Contact</a></li>
-          </ul>
-        </nav>
-      </div> <!-- /sidebar -->
-      <div class="content">
-        <!-- Main hero unit for a primary marketing message or call to action -->
-        <div class="hero-unit">
-          <h1>Fluid page template</h1>
-          <p>Vestibulum id ligula porta felis euismod semper. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>
-          <p><a class="btn btn-large">Learn more &raquo;</a></p>
-        </div>
-        <!-- Example row of columns -->
-        <div class="row">
-          <div class="span6">
-            <h2>Heading</h2>
-          </div>
-          <div class="span5">
-            <h2>Heading</h2>
-          </div>
-          <div class="span5">
-            <h2>Heading</h2>
-          </div>
-        </div>
-      </div> <!-- /content -->
-    </div> <!-- /container -->
-  </body>
-</html>
\ No newline at end of file