Merge branch 'master' of github.com:twitter/bootstrap

Conflicts:
	bootstrap-1.0.0.css
	bootstrap-1.0.0.min.css
	docs/index.html

bootstrap-1.0.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: Sun Aug 21 21:42:07 PDT 2011
+ * Date: Sun Aug 21 21:42:52 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,26 @@ aside {
 .container:after {
   clear: both;
 }
+/*.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;
+  }
+}*/
 /*
  * Scaffolding
  * Basic and global styles for generating a grid system, structural layout, and page templates
@@ -339,7 +359,7 @@ html, body {
   background-color: #fff;
 }
 body {
-  margin: 60px 0 0;
+  margin: 0;
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 13px;
   font-weight: normal;
@@ -375,6 +395,7 @@ a {
   color: #0069d6;
   text-decoration: none;
   line-height: inherit;
+  font-weight: inherit;
 }
 a:hover {
   color: #0050a3;
@@ -392,28 +413,24 @@ a:hover {
   background-image: linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);
   padding: 4px 14px;
   text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
-  color: #333333;
+  color: #333;
   font-size: 13px;
   line-height: 18px;
-  border: 1px solid;
+  border: 1px solid #ccc;
-  border-color: #ccc #ccc #bbb;
+  border-bottom-color: #bbb;
-  border-color: borderColor borderColor rgba(0, 0, 0, 0.25);
   -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: #333333;
+  color: #333;
   text-decoration: none;
 }
-.btn.primary {
+.primary {
   background-color: #0064cd;
   background-repeat: repeat-x;
   background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
@@ -423,6 +440,20 @@ a:hover {
   background-image: -webkit-linear-gradient(#049cdb, #0064cd);
   background-image: -o-linear-gradient(#049cdb, #0064cd);
   background-image: linear-gradient(#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;
@@ -752,7 +783,7 @@ form input[type=text]:focus, form input[type=password]:focus, form textarea:focu
   -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 .error {
+form div.error {
   background: #fae5e3;
   padding: 10px 0;
   margin: -10px 0 10px;
@@ -760,22 +791,22 @@ form .error {
   -moz-border-radius: 4px;
   border-radius: 4px;
 }
-form .error > label, form .error span.help-inline, form .error span.help-block {
+form div.error > label, form div.error span.help-inline, form div.error span.help-block {
   color: #9d261d;
 }
-form .error input[type=text], form .error input[type=password], form .error textarea {
+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 .error input[type=text]:focus, form .error input[type=password]:focus, form .error textarea:focus {
+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 .error .input-prepend span.add-on, form .error .input-append span.add-on {
+form div.error .input-prepend span.add-on, form div.error .input-append span.add-on {
   background: #f4c8c5;
   border-color: #c87872;
   color: #b9554d;
@@ -994,6 +1025,13 @@ 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;

bootstrap-1.0.0.min.css

@@ -40,15 +40,16 @@ header,section,footer,article,aside{display:block;}
 .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;}
 html,body{background-color:#fff;}
-body{margin:60px 0 0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;text-rendering:optimizeLegibility;}
+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;}
-a{color:#0069d6;text-decoration:none;line-height:inherit;}a:hover{color:#0050a3;text-decoration:underline;}
+a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}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, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:18px;border:1px solid;border-color:#ccc #ccc #bbb;border-color:borderColor borderColor rgba(0, 0, 0, 0.25);-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:#333333;text-decoration:none;}
+.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, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:linear-gradient(#ffffff, color-stop(#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;}
-.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);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;}
+.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);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;}
@@ -97,9 +98,9 @@ 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);}
-form .error{background:#fae5e3;padding:10px 0;margin:-10px 0 10px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}form .error>label,form .error span.help-inline,form .error span.help-block{color:#9d261d;}
+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 .error input[type=text],form .error input[type=password],form .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 .error input[type=text]:focus,form .error input[type=password]:focus,form .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[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 .error .input-prepend span.add-on,form .error .input-append span.add-on{background:#f4c8c5;border-color:#c87872;color:#b9554d;}
+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;}
@@ -132,6 +133,7 @@ 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;}
 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;}

docs/assets/css/docs.css

@@ -44,7 +44,7 @@ section {
   font-weight: bold;
 }
 #masthead {
-  margin-top: -20px;
+  margin-top: 40px;
 }
 #masthead h1,
 #masthead p {
@@ -146,34 +146,6 @@ div.quickstart form textarea {
 .show-grid:hover .column, .show-grid:hover .columns {
   background: rgba(0, 0, 0, 0.25);
 }
-/* Hashgrid.js grid (press G & H to view)
--------------------------------------------------- */
-#grid {
-  width: 980px;
-  position: absolute;
-  top: 0;
-  left: 50%;
-  margin-left: -490px;
-}
-#grid div.vert {
-  background-color: rgba(0, 206, 209, 0.075);
-  width: 39px;
-  border: solid darkturquoise;
-  border-width: 0 1px;
-  margin-right: 19px;
-}
-#grid div.vert.first-line {
-  margin-left: 19px;
-}
-#grid div.horiz {
-  height: 19px;
-  border-bottom: 1px solid rgba(255, 0, 0, 0.1);
-  margin: 0;
-  padding: 0;
-}
-#grid div.horiz:nth-child(5n) {
-  border-color: rgba(255, 0, 0, 0.25);
-}
 /* Render mini layout previews
 -------------------------------------------------- */
 div.mini-layout {
@@ -199,7 +171,9 @@ div.mini-layout div.mini-layout-body {
   width: 450px;
   height: 340px;
 }
-div.mini-layout.fluid div.mini-layout-sidebar, div.mini-layout.fluid div.mini-layout-header, div.mini-layout.fluid div.mini-layout-body {
+div.mini-layout.fluid div.mini-layout-sidebar,
+div.mini-layout.fluid div.mini-layout-header,
+div.mini-layout.fluid div.mini-layout-body {
   float: left;
 }
 div.mini-layout.fluid div.mini-layout-sidebar {

docs/index.html

@@ -31,6 +31,8 @@
 
   <body onload="prettyPrint();">
 
+    <!-- Topbar
+    ================================================== -->
     <div class="topbar">
       <div class="fill">
         <div class="container">
@@ -52,6 +54,8 @@
       </div>
     </div>
 
+    <!-- Masthead (blueprinty thing)
+    ================================================== -->
     <div id="masthead">
       <div class="inner">
         <div class="container">
@@ -65,6 +69,8 @@
       </div>
     </div>
 
+    <!-- Quickstart options
+    ================================================== -->
     <div class="quickstart">
       <div class="container">
         <div class="row">
@@ -94,6 +100,10 @@
 
     <div class="container">
 
+
+
+<!-- About Bootstrap
+================================================== -->
 <section id="about">
   <div class="page-header">
     <h1>About Bootstrap <small>Brief history, browser support, and more</small></h1>
@@ -128,6 +138,10 @@
   </div> <!-- /row -->
 </section>
 
+
+
+<!-- Grid system
+================================================== -->
 <section id="grid-system">
   <div class="page-header">
     <h1>Grid system <small>Rock the standard 940px or roll your own</small></h1>
@@ -230,11 +244,14 @@
 
 
 
-
+<!-- Layouts (Default and fluid)
+================================================== -->
 <section id="layouts">
   <div class="page-header">
     <h1>Layouts <small>Basic templates to create webpages</small></h1>
   </div>
+
+  <!-- Fixed layout -->
   <div class="row">
     <div class="span4 columns">
       <h2>Fixed layout</h2>
@@ -252,7 +269,9 @@
 &lt;/body&gt;
 </pre>
     </div>
-  </div>
+  </div> <!-- /row -->
+
+  <!-- Fluid layout -->
   <div class="row">
     <div class="span4 columns">
       <h2>Fluid layout</h2>
@@ -276,17 +295,20 @@
 &lt;/body&gt;
 </pre>
     </div>
-  </div>
+  </div> <!-- /row -->
 </section>
 
 
 
+<!-- Typography
+================================================== -->
 <section id="typography">
-<div class="page-header">
+  <div class="page-header">
     <h1>Typography <small>Headings, paragraphs, lists, and other inline type elements</small></h1>
-</div>
+  </div>
 
-<div class="row">
+  <!-- Headings & Paragraph Copy -->
+  <div class="row">
     <div class="span4 columns">
       <h2>Headings and copy</h2>
       <p>A standard typographic hierarchy for structuring your webpages.</p>
@@ -304,9 +326,10 @@
       <p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
       <h1>Example heading <small>Has sub-heading&hellip;</small></h1>
     </div>
-</div>
+  </div>
 
-<div class="row">
+  <!-- Misc Elements -->
+  <div class="row">
     <div class="span4 columns">
       <h2>Misc. elements</h2>
       <p>Using emphasis, addresses, &amp; abbreviations</p>
@@ -335,9 +358,10 @@
       <h3>Abbreviations</h3>
       <p>For abbreviations and acronyms, use the <code>&lt;abbr&gt;</code> tag (<code>&lt;acronym&gt;</code> is deprecated in <abbr title="HyperText Markup Langugage 5">HTML5</abbr>). Put the shorthand form within the tag and set a title for the complete name.</p>
     </div>
-</div>
+  </div> <!-- /row -->
 
-<div class="row">
+  <!-- Blockquotes -->
+  <div class="row">
     <div class="span4 columns">
       <h2>Blockquotes</h2>
       <p>
@@ -353,11 +377,10 @@
         <small>Dr. Julius Hibbert</small>
       </blockquote>
     </div>
-</div>
+  </div> <!-- /row -->
 
-
+  <h2>Lists</h2>
-<h2>Lists</h2>
+  <div class="row">
-<div class="row">
     <div class="span4 columns">
       <h4>Unordered <code>&lt;ul&gt;</code></h4>
       <ul>
@@ -423,16 +446,19 @@
         <dd>Etiam porta sem malesuada magna mollis euismod.</dd>
       </dl>
     </div>
-</div>
+  </div> <!-- /row -->
 </section>
 
 
-<section id="tables">
-<div class="page-header">
-  <h1>Tables <small>For, you guessed it, tabular data</small></h1>
-</div>
 
-<div class="row">
+<!-- Tables
+================================================== -->
+<section id="tables">
+  <div class="page-header">
+    <h1>Tables <small>For, you guessed it, tabular data</small></h1>
+  </div>
+  <!-- Table structure -->
+  <div class="row">
     <div class="span4 columns">
       <h2>Building tables</h2>
       <p>
@@ -450,9 +476,9 @@
       <p>Similar to the column headers, all your table’s body content should be wrapped in a <code>&lt;tbody&gt;</code> so your hierarchy is <code>&lt;tbody&gt;</code> > <code>&lt;tr&gt;</code> > <code>&lt;td&gt;</code>.</p>
     </div>
     <div class="span12 columns">
-<h3>Example: Default table styles</h3>
+      <h3>Example: Default table styles</h3>
-<p>All tables will be automatically styled with only the essential borders to ensure readability and maintain structure. No need to add extra classes or attributes.</p>
+      <p>All tables will be automatically styled with only the essential borders to ensure readability and maintain structure. No need to add extra classes or attributes.</p>
-<table>
+      <table>
         <thead>
           <tr>
             <th>#</th>
@@ -481,15 +507,14 @@
             <td>Code</td>
           </tr>
         </tbody>
-</table>
+      </table>
 <pre class="prettyprint linenums">
 &lt;table class="common-table"&gt;
   ...
 &lt;/table&gt;</pre>
-
+      <h3>Example: Zebra-striped</h3>
-<h3>Example: Zebra-striped</h3>
+      <p>Get a little fancy with your tables by adding zebra-striping&mdash;just add the <code>.zebra-striped</code> class.</p>
-<p>Get a little fancy with your tables by adding zebra-striping&mdash;just add the <code>.zebra-striped</code> class.</p>
+      <table class="zebra-striped">
-<table class="zebra-striped">
         <thead>
           <tr>
             <th>#</th>
@@ -518,15 +543,14 @@
             <td>Code</td>
           </tr>
         </tbody>
-</table>
+      </table>
 <pre class="prettyprint linenums">
 &lt;table class="common-table zebra-striped"&gt;
 ...
 &lt;/table&gt;</pre>
-
+      <h3>Example: Zebra-striped w/ TableSorter.js</h3>
-<h3>Example: Zebra-striped w/ TableSorter.js</h3>
+      <p>Taking the previous example, we improve the usefulness of our tables by providing sorting functionality via <a href="http://jquery.com">jQuery</a> and the <a href="http://tablesorter.com/docs/">Tablesorter</a> plugin. <strong>Click any column’s header to change the sort.</strong></p>
-<p>Taking the previous example, we improve the usefulness of our tables by providing sorting functionality via <a href="http://jquery.com">jQuery</a> and the <a href="http://tablesorter.com/docs/">Tablesorter</a> plugin. <strong>Click any column’s header to change the sort.</strong></p>
+      <table class="zebra-striped" id="sortTableExample">
-<table class="zebra-striped" id="sortTableExample">
         <thead>
           <tr>
             <th>#</th>
@@ -555,7 +579,7 @@
             <td>Code</td>
           </tr>
         </tbody>
-</table>
+      </table>
 <pre class="prettyprint linenums">
 &lt;script src="js/jquery/jquery.tablesorter.min.js"&gt;&lt;/script&gt;
 &lt;script &gt;
@@ -567,12 +591,15 @@
   ...
 &lt;/table&gt;</pre>
     </div>
-</div>
+  </div> <!-- /row -->
 </section>
 
 
 
+<!-- Forms
+================================================== -->
 <section id="forms">
+<<<<<<< HEAD
 
 <div class="page-header">
   <h1>Forms</h1>
@@ -825,14 +852,285 @@
     <h2>Buttons</h2>
     <p>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.</p>
     <p>All buttons default to a light gray style, but a blue <code>.primary</code> class is available. Plus, rolling your own styles is easy peasy.</p>
+=======
+  <div class="page-header">
+    <h1>Forms</h1>
+>>>>>>> f169c99f726c250f0bb2f68ea4eedaaf3fbe15c0
   </div>
+  <div class="row">
+    <div class="span4 columns">
+      <h2>Default styles</h2>
+      <p>All forms are given default styles to present them in a readable and scalable way. Styles are provided for text inputs, select lists, textareas, radio buttons and checkboxes, and buttons.</p>
+    </div>
+    <div class="span12 columns">
+      <form>
+<<<<<<< HEAD
+        <button type="submit" class="btn primary">Submit</button>&nbsp;<button type="submit" class="btn">Cancel</button>
+=======
+        <fieldset>
+          <legend>Example form legend</legend>
+          <div class="clearfix">
+            <label for="">X-Large Input</label>
+            <div class="input">
+              <input class="xlarge" id="xlInput" name="xlInput" size="30" type="text" />
+            </div>
+          </div> <!-- /clearfix -->
+          <div class="clearfix">
+            <label for="">Select</label>
+            <div class="input">
+              <select>
+                <option>1</option>
+                <option>2</option>
+                <option>3</option>
+                <option>4</option>
+                <option>5</option>
+              </select>
+            </div>
+          </div> <!-- /clearfix -->
+          <div class="clearfix">
+            <label for="">Select</label>
+            <div class="input">
+              <select class="medium">
+                <option>1</option>
+                <option>2</option>
+                <option>3</option>
+                <option>4</option>
+                <option>5</option>
+              </select>
+            </div>
+          </div> <!-- /clearfix -->
+          <div class="clearfix">
+            <label>Uneditable Input</label>
+            <div class="input">
+              <span class="uneditable-input">Some Value Here</span>
+            </div>
+          </div> <!-- /clearfix -->
+          <div class="clearfix">
+            <label for="disabledInput">Disabled Input</label>
+            <div class="input">
+              <input class="xlarge disabled" id="disabledInput" name="disabledInput" size="30" type="text" placeholder="Disabled input here… carry on." disabled />
+            </div>
+          </div> <!-- /clearfix -->
+          <div class="clearfix error">
+            <label for="xlInput">X-Large Input</label>
+            <div class="input">
+              <input class="xlarge error" id="xlInput" name="xlInput" size="30" type="text" />
+              <span class="help-inline">Small snippet of help text</span>
+            </div>
+          </div> <!-- /clearfix -->
+        </fieldset>
+        <fieldset>
+          <legend>Example form legend</legend>
+          <div class="clearfix">
+            <label for="prependedInput">Prepended Text</label>
+            <div class="input">
+              <div class="input-prepend">
+                <span class="add-on">@</span>
+                <input class="medium" id="prependedInput" name="prependedInput" size="16" type="text" />
+              </div>
+            </div>
+          </div> <!-- /clearfix -->
+          <div class="clearfix">
+            <label for="prependedInput2">Prepended Checkbox</label>
+            <div class="input">
+              <div class="input-prepend">
+                <label class="add-on"><input type="checkbox" name="" id="" value="" /></label>
+                <input class="mini" id="prependedInput2" name="prependedInput2" size="16" type="text" />
+              </div>
+            </div>
+          </div> <!-- /clearfix -->
+          <div class="clearfix">
+            <label for="appendedInput">Appended Checkbox</label>
+            <div class="input">
+              <div class="input-append">
+                <input class="mini" id="appendedInput" name="appendedInput" size="16" type="text" />
+                <label class="add-on active"><input type="checkbox" name="" id="" value="" checked="checked" /></label>
+              </div>
+            </div>
+          </div> <!-- /clearfix -->
+          <div class="clearfix">
+            <label for="xlInput">File Input</label>
+            <div class="input">
+              <input class="input-file" id="fileInput" name="fileInput" type="file" />
+            </div>
+          </div> <!-- /clearfix -->
+        </fieldset>
+        <fieldset>
+          <legend>Example form legend</legend>
+          <div class="clearfix">
+            <label id="optionsCheckboxes">List of Options</label>
+            <div class="input">
+              <ul class="inputs-list">
+                <li>
+                  <label>
+                    <input type="checkbox" name="optionsCheckboxes" value="option1" />
+                    <span>Option one is this and that&mdash;be sure to include why it’s great</span>
+                  </label>
+                </li>
+                <li>
+                  <label>
+                    <input type="checkbox" name="optionsCheckboxes" value="option2" />
+                    <span>Option two can also be checked and included in form results</span>
+                  </label>
+                </li>
+                <li>
+                  <label>
+                    <input type="checkbox" name="optionsCheckboxes" value="option2" />
+                    <span>Option three can&mdash;yes, you guessed it&mdash;also be checked and included in form results</span>
+                  </label>
+                </li>
+                <li>
+                  <label class="disabled">
+                    <input type="checkbox" name="optionsCheckboxes" value="option2" disabled />
+                    <span>Option four cannot be checked as it is disabled.</span>
+                  </label>
+                </li>
+              </ul>
+              <span class="help-block">
+                <strong>Note:</strong> Labels surround all the options for much larger click areas and a more usable form.
+              </span>
+            </div>
+          </div> <!-- /clearfix -->
+          <div class="clearfix">
+            <label>Date Range</label>
+            <div class="input">
+              <div class="inline-inputs">
+                <input class="small" type="text" value="May 1, 2011" />
+                <input class="mini" type="text" value="12:00am" />
+                to
+                <input class="small" type="text" value="May 8, 2011" />
+                <input class="mini" type="text" value="11:59pm" />
+                <span class="help-inline">All times are shown as Pacific Standard Time (GMT -08:00).</span>
+              </div>
+            </div>
+          </div> <!-- /clearfix -->
+          <div class="clearfix">
+            <label for="textarea">Textarea</label>
+            <div class="input">
+              <textarea class="xxlarge" id="textarea" name="textarea"></textarea>
+              <span class="help-block">
+                Block of help text to describe the field above if need be.
+              </span>
+            </div>
+          </div> <!-- /clearfix -->
+          <div class="clearfix">
+            <label id="optionsRadio">List of Options</label>
+            <div class="input">
+              <ul class="inputs-list">
+                <li>
+                  <label>
+                    <input type="checkbox" name="optionsCheckboxes" value="option1" />
+                    <span>Option one is this and that&mdash;be sure to include why it’s great</span>
+                  </label>
+                </li>
+                <li>
+                  <label>
+                    <input type="checkbox" name="optionsCheckboxes" value="option2" />
+                    <span>Option two can also be checked and included in form results</span>
+                  </label>
+                </li>
+              </ul>
+            </div>
+          </div> <!-- /clearfix -->
+          <div class="actions">
+            <button type="submit" class="btn primary">Save Changes</button>
+            <button type="reset" class="btn">Cancel</button>
+          </div>
+        </fieldset>
+>>>>>>> f169c99f726c250f0bb2f68ea4eedaaf3fbe15c0
+      </form>
+    </div>
+  </div> <!-- /row -->
+
+  <br />
+
+  <div class="row">
+    <div class="span4 columns">
+      <h2>Stacked forms</h2>
+      <p>Add <code>.form-stacked</code> to your form’s HTML and you’ll have labels on top of their fields instead of to their left. This works great if your forms are short or you have two columns of inputs for heavier forms.</p>
+    </div>
+    <div class="span12 columns">
+      <form action="" class="form-stacked">
+        <fieldset>
+          <legend>Example form legend</legend>
+          <div class="clearfix">
+            <label for="">X-Large Input</label>
+            <div class="input">
+              <input class="xlarge" id="xlInput" name="xlInput" size="30" type="text" />
+            </div>
+          </div> <!-- /clearfix -->
+          <div class="clearfix">
+            <label for="">Select</label>
+            <div class="input">
+              <select>
+                <option>1</option>
+                <option>2</option>
+                <option>3</option>
+                <option>4</option>
+                <option>5</option>
+              </select>
+            </div>
+          </div> <!-- /clearfix -->
+        </fieldset>
+        <fieldset>
+          <legend>Example form legend</legend>
+          <div class="clearfix error">
+            <label for="xlInput">X-Large Input</label>
+            <div class="input">
+              <input class="xlarge error" id="xlInput" name="xlInput" size="30" type="text" />
+              <span class="help-inline">Small snippet of help text</span>
+            </div>
+          </div> <!-- /clearfix -->
+          <div class="clearfix">
+            <label id="optionsCheckboxes">List of Options</label>
+            <div class="input">
+              <ul class="inputs-list">
+                <li>
+                  <label>
+                    <input type="checkbox" name="optionsCheckboxes" value="option1" />
+                    <span>Option one is this and that&mdash;be sure to include why it’s great</span>
+                  </label>
+                </li>
+                <li>
+                  <label>
+                    <input type="checkbox" name="optionsCheckboxes" value="option2" />
+                    <span>Option two can also be checked and included in form results</span>
+                  </label>
+                </li>
+              </ul>
+              <span class="help-block">
+                <strong>Note:</strong> Labels surround all the options for much larger click areas and a more usable form.
+              </span>
+            </div>
+          </div> <!-- /clearfix -->
+        </fieldset>
+        <div class="actions">
+          <button type="submit" class="btn primary">Save Changes</button>
+          <button type="reset" class="btn">Cancel</button>
+        </div>
+      </form>
+    </div>
+  </div> <!-- /row -->
+
+  <div class="row">
+    <div class="span4 columns">
+      <h2>Buttons</h2>
+      <p>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.</p>
+      <p>All buttons default to a light gray style, but a blue <code>.primary</code> class is available. Plus, rolling your own styles is easy peasy.</p>
+    </div>
+<<<<<<< HEAD
+    <h4>Buttons</h4>
+    <div class="well">
+      <form>
+        <button class="btn large primary disabled" disabled>Primary action</button>&nbsp;<button class="btn large disabled" disabled>Action</button>
+      </form>
+=======
     <div class="span12 columns">
       <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;">
-      <form>
+        <button type="submit" class="btn primary">Submit</button>
-        <button type="submit" class="btn primary">Submit</button>&nbsp;<button type="submit" class="btn">Cancel</button>
+        <button type="submit" class="btn">Cancel</button>
-      </form>
       </div>
       <h3>Alternate sizes</h3>
       <p>Fancy larger or smaller buttons? Have at it!</p>
@@ -846,7 +1144,6 @@
       </div>
       <h3>Disabled state</h3>
       <p>For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s <code>.disabled</code> for links and <code>:disabled</code> for <code>&lt;button&gt;</code> elements.</p>
-    <p><strong>Note:</strong> If you're developing for older browsers like IE8 or below -- you're going to want to use the <code>.disabled</code> class for <code>&lt;button&gt;</code> elements as well.
       <h4>Links</h4>
       <div class="well">
         <a href="#" class="btn large primary disabled">Primary action</a>
@@ -854,25 +1151,28 @@
       </div>
       <h4>Buttons</h4>
       <div class="well">
-      <form>
+        <button class="btn large primary" disabled>Primary action</button>
-        <button class="btn large primary disabled" disabled>Primary action</button>&nbsp;<button class="btn large disabled" disabled>Action</button>
+        <button class="btn large" disabled>Action</button>
-      </form>
       </div>
+>>>>>>> f169c99f726c250f0bb2f68ea4eedaaf3fbe15c0
     </div>
-</div>
+  </div> <!-- /row -->
 </section>
 
 
 
+<!-- Navigation
+================================================== -->
 <section id="navigation">
   <div class="page-header">
     <h1>Navigation</h1>
   </div>
+
   <h2>Fixed topbar</h2>
   <div class="topbar-wrapper" style="z-index: 5;">
     <div class="topbar">
       <div class="fill">
-        <div class="container fixed">
+        <div class="container">
           <h3><a href="#">Project Name</a></h3>
           <ul>
             <li class="active"><a href="#">Home</a></li>
@@ -895,9 +1195,10 @@
             </li>
           </ul>
         </div>
-      </div>
+      </div> <!-- /fill -->
-    </div>
+    </div> <!-- /topbar -->
   </div> <!-- topbar-wrapper -->
+
   <div class="row">
     <div class="span5 columns">
       <h4>What is it</h4>
@@ -915,20 +1216,20 @@
 
   <br />
 
-<div class="row">
+  <div class="row">
     <div class="span4 columns">
       <h2>Tabs and pills</h2>
       <p>Create simple secondary navigation with a <code>&lt;ul&gt;</code>. Swap between tabs or pills by adding the appropriate class.</p>
       <p>Great for sub-sections of content like our account settings pages and user timelines for toggling between pages of like content. Available in tabbed or pill styles.</p>
     </div>
     <div class="span12 columns">
-<ul class="tabs">
+      <ul class="tabs">
         <li class="active"><a href="#">Home</a></li>
         <li><a href="#">Profile</a></li>
         <li><a href="#">Messages</a></li>
         <li><a href="#">Settings</a></li>
         <li><a href="#">Contact</a></li>
-</ul>
+      </ul>
 <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;
@@ -938,13 +1239,13 @@
   &lt;li&gt;&lt;a href="#"&gt;Contact&lt;/a&gt;&lt;/li&gt;
 &lt;/ul&gt;
 </pre>
-<ul class="pills">
+      <ul class="pills">
         <li class="active"><a href="#">Home</a></li>
         <li><a href="#">Profile</a></li>
         <li><a href="#">Messages</a></li>
         <li><a href="#">Settings</a></li>
         <li><a href="#">Contact</a></li>
-</ul>
+      </ul>
 <pre class="prettyprint linenums">
 &lt;ul class="pills"&gt;
   &lt;li class="active"&gt;&lt;a href="#"&gt;Home&lt;/a&gt;&lt;/li&gt;
@@ -955,9 +1256,10 @@
 &lt;/ul&gt;
 </pre>
     </div>
-</div>
+  </div> <!-- /row -->
 
-<div class="row">
+  <!-- Pagination -->
+  <div class="row">
     <div class="span4 columns">
       <h2>Pagination</h2>
       <p>Ultra simplistic and minimally styled pagination inspired by Rdio. The large block is hard to miss, easily scalable, and provides large click areas.</p>
@@ -1018,16 +1320,19 @@
 &lt;/div&gt;
 </pre>
     </div>
-</div>
+  </div> <!-- /row -->
 
 </section>
 
 
 
+<!-- Alerts & Messages
+================================================== -->
 <section id="alerts">
   <div class="page-header">
     <h1>Alerts &amp; Errors <small>Styles for success, warning, and error messages or alerts</small></h1>
   </div>
+  <!-- Basic alert messages -->
   <div class="row">
     <div class="span4 columns">
       <h2>Basic alerts</h2>
@@ -1051,7 +1356,8 @@
         <p><strong>Heads up!</strong> This is an alert that needs your attention, but it’s not a huge priority just yet.</p>
       </div>
     </div>
-  </div>
+  </div> <!-- /row -->
+  <!-- Block messages -->
   <div class="row">
     <div class="span4 columns">
       <h2>Block messages</h2>
@@ -1079,10 +1385,12 @@
         <p><a class="btn small" href="#">Take this action</a> <a class="btn small" href="#">Or do this</a></p>
       </div>
     </div>
-  </div>
+  </div> <!-- /row -->
 </section>
 
 
+<!-- Popovers
+================================================== -->
 <section id="popovers">
   <div class="page-header">
     <h1>Popovers <small>Components for displaying content in modals, tooltips, and popovers</small></h1>
@@ -1112,6 +1420,7 @@
     </div>
   </div> <!-- /row -->
 
+  <!-- Tooltips -->
   <div class="row">
     <div class="span4 columns">
       <h2>Tool Tips</h2>
@@ -1144,6 +1453,7 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
     </div>
   </div> <!-- /row -->
 
+  <!-- Popovers -->
   <div class="row">
     <div class="span4 columns">
       <h2>Popovers</h2>
@@ -1170,6 +1480,8 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
 
 
 
+<!-- Using Bootstrap w/ Less
+================================================== -->
 <section id="less">
 <div class="page-header">
   <h1>Using Bootstrap with Less <small>Supercharge your CSS with variables, mixins, and functions</small></h1>
@@ -1326,6 +1638,8 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
 
     </div> <!-- /container -->
 
+
+
     <div id="footer">
       <div class="inner">
         <div class="container">

lib/forms.less

@@ -114,7 +114,7 @@ form {
   }
 
   // Error styles
-  .error {
+  div.error {
     background: lighten(@red, 57%);
     padding: 10px 0;
     margin: -10px 0 10px;
@@ -353,6 +353,13 @@ form.form-stacked {
       }
     }
   }
+  div.error {
+    padding-top: 10px;
+    padding-bottom: 10px;
+    padding-left: 10px;
+    margin-top: 0;
+    margin-left: -10px;
+  }
   .actions {
     margin-left: -20px;
     padding-left: 20px;

lib/preboot.less

@@ -173,15 +173,15 @@
 // CSS3 Content Columns
 .content-columns(@columnCount, @columnGap: 20px) {
 	-webkit-column-count: @columnCount;
-	-webkit-column-gap: @columnGap;
 	   -moz-column-count: @columnCount;
-	-moz-column-gap: @columnGap;
           column-count: @columnCount;
+  -webkit-column-gap: @columnGap;
+	   -moz-column-gap: @columnGap;
           column-gap: @columnGap;
 }
 
 // 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) {
+/*.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;
@@ -200,7 +200,7 @@
     color: @textColor;
     text-decoration: none;
   }
-}
+}*/
 
 // Add an alphatransparency value to any background or border color (via Elyse Holladay)
 #translucent {

lib/scaffolding.less

@@ -51,7 +51,7 @@ html, body {
   background-color: #fff;
 }
 body {
-  margin: 60px 0 0; // Add margin to the top of the page for the topbar
+  margin: 0;
   #font > .sans-serif(normal,@basefont,@baseline);
   color: @gray;
   text-rendering: optimizeLegibility;
@@ -87,6 +87,7 @@ a {
   color: @linkColor;
   text-decoration: none;
   line-height: inherit;
+  font-weight: inherit;
   &:hover {
     color: @linkColorHover;
     text-decoration: underline;
@@ -95,10 +96,40 @@ a {
 
 // Buttons
 .btn {
-  .button();
+  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);
+    //#gradient > .vertical(@blue, @blueDark);
     color: #fff;
     text-shadow: 0 -1px 0 rgba(0,0,0,.25);
     border-color: @blueDark @blueDark darken(@blueDark, 15%);