twitter-bootstrap-rails 2.0.1.0 → 2.0.2

data/vendor/toolkit/twitter/bootstrap/buttons.less

@@ -9,14 +9,12 @@
 .btn {
   display: inline-block;
   padding: 4px 10px 4px;
-  margin-bottom: 0; // For input.btn
   font-size: @baseFontSize;
   line-height: @baseLineHeight;
   color: @grayDark;
   text-align: center;
   text-shadow: 0 1px 1px rgba(255,255,255,.75);
-  vertical-align: middle;
-  .buttonBackground(@white, darken(@white, 10%));
+  #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient
   border: 1px solid #ccc;
   border-bottom-color: #bbb;
   .border-radius(4px);
@@ -25,7 +23,6 @@
   cursor: pointer;
 
   // Give IE7 some love
-  .reset-filter();
   .ie7-restore-left-whitespace();
 }
 
@@ -54,6 +51,7 @@
   .box-shadow(@shadow);
   background-color: darken(@white, 10%);
   background-color: darken(@white, 15%) e("\9");
+  color: rgba(0,0,0,.5);
   outline: 0;
 }
 
@@ -78,7 +76,7 @@
   line-height: normal;
   .border-radius(5px);
 }
-.btn-large [class^="icon-"] {
+.btn-large .icon {
   margin-top: 1px;
 }
 
@@ -88,17 +86,10 @@
   font-size: @baseFontSize - 2px;
   line-height: @baseLineHeight - 2px;
 }
-.btn-small [class^="icon-"] {
+.btn-small .icon {
   margin-top: -1px;
 }
 
-// Mini
-.btn-mini {
-  padding: 2px 6px;
-  font-size: @baseFontSize - 2px;
-  line-height: @baseLineHeight - 4px;
-}
-
 
 // Alternate buttons
 // --------------------------------------------------
@@ -114,9 +105,7 @@
 .btn-success,
 .btn-success:hover,
 .btn-info,
-.btn-info:hover,
-.btn-inverse,
-.btn-inverse:hover {
+.btn-info:hover {
   text-shadow: 0 -1px 0 rgba(0,0,0,.25);
   color: @white;
 }
@@ -125,8 +114,7 @@
 .btn-warning.active,
 .btn-danger.active,
 .btn-success.active,
-.btn-info.active,
-.btn-dark.active {
+.btn-info.active {
   color: rgba(255,255,255,.75);
 }
 
@@ -151,10 +139,6 @@
 .btn-info {
   .buttonBackground(#5bc0de, #2f96b4);
 }
-// Inverse appears as dark gray
-.btn-inverse {
-  .buttonBackground(#454545, #262626);
-}
 
 
 // Cross-browser Jank
@@ -162,10 +146,8 @@
 
 button.btn,
 input[type="submit"].btn {
-
-  // Firefox 3.6 only I believe
   &::-moz-focus-inner {
-    padding: 0;
+  padding: 0;
     border: 0;
   }
 

data/vendor/toolkit/twitter/bootstrap/code.less

@@ -11,16 +11,12 @@ pre {
   color: @grayDark;
   .border-radius(3px);
 }
-
-// Inline code
 code {
   padding: 3px 4px;
   color: #d14;
   background-color: #f7f7f9;
   border: 1px solid #e1e1e8;
 }
-
-// Blocks of code
 pre {
   display: block;
   padding: (@baseLineHeight - 1) / 2;
@@ -34,7 +30,6 @@ pre {
   white-space: pre;
   white-space: pre-wrap;
   word-break: break-all;
-  word-wrap: break-word;
 
   // Make prettyprint styles more spaced out for readability
   &.prettyprint {
@@ -44,14 +39,6 @@ pre {
   // Account for some code outputs that place code tags in pre tags
   code {
     padding: 0;
-    color: inherit;
     background-color: transparent;
-    border: 0;
   }
 }
-
-// Enable scrollable blocks of code
-.pre-scrollable {
-  max-height: 340px;
-  overflow-y: scroll;
-}

data/vendor/toolkit/twitter/bootstrap/dropdowns.less

@@ -46,6 +46,7 @@
   float: left;
   display: none; // none by default, but block on "open" of the menu
   min-width: 160px;
+  max-width: 220px;
   _width: 160px;
   padding: 4px 0;
   margin: 0; // override default ul
@@ -92,7 +93,7 @@
     padding: 3px 15px;
     clear: both;
     font-weight: normal;
-    line-height: @baseLineHeight;
+    line-height: 18px;
     color: @gray;
     white-space: nowrap;
   }

data/vendor/toolkit/twitter/bootstrap/forms.less

@@ -28,12 +28,6 @@ legend {
   color: @grayDark;
   border: 0;
   border-bottom: 1px solid #eee;
-
-  // Small
-  small {
-    font-size: @baseLineHeight * .75;
-    color: @grayLight;
-  }
 }
 
 // Set font for forms
@@ -42,13 +36,7 @@ input,
 button,
 select,
 textarea {
-  #font > .shorthand(@baseFontSize,normal,@baseLineHeight); // Set size, weight, line-height here
-}
-input,
-button,
-select,
-textarea {
-  #font > #family > .sans-serif(); // And only set font-family here for those that need it (note the missing label element)
+  #font > .sans-serif(@baseFontSize,normal,@baseLineHeight);
 }
 
 // Identify controls by their labels
@@ -96,17 +84,13 @@ input[type="radio"] {
   margin: 3px 0;
   *margin-top: 0; /* IE7 */
   line-height: normal;
-  cursor: pointer;
-  .border-radius(0);
-  border: 0 \9; /* IE9 and down */
-}
-input[type="image"] {
   border: 0;
+  cursor: pointer;
+  .border-radius(0px); /* mirror bootstrap commit 9b9e1d3 reversing IE9 hack and use mixin instead */
 }
 
 // Reset the file input to browser defaults
 input[type="file"] {
-  width: auto;
   padding: initial;
   line-height: initial;
   border: initial;
@@ -131,11 +115,6 @@ input[type="file"] {
   line-height: 28px;
 }
 
-// Reset line-height for IE
-input[type="file"] {
-  line-height: 18px \9;
-}
-
 // Chrome on Linux and Mobile Safari need background-color
 select {
   width: 220px; // default input width + 10px of padding that doesn't get applied
@@ -186,11 +165,9 @@ input[type="hidden"] {
 }
 
 // Radios and checkboxes on same line
-// TODO v3: Convert .inline to .control-inline
 .radio.inline,
 .checkbox.inline {
   display: inline-block;
-  padding-top: 5px;
   margin-bottom: 0;
   vertical-align: middle;
 }
@@ -198,6 +175,11 @@ input[type="hidden"] {
 .checkbox.inline + .checkbox.inline {
   margin-left: 10px; // space out consecutive inline controls
 }
+// But don't forget to remove their padding on first-child
+.controls > .radio.inline:first-child,
+.controls > .checkbox.inline:first-child {
+  padding-top: 0;
+}
 
 
 
@@ -216,10 +198,9 @@ textarea:focus {
   @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
   .box-shadow(@shadow);
   outline: 0;
-  outline: thin dotted \9; /* IE6-9 */
+  outline: thin dotted \9; /* IE6-8 */
 }
 input[type="file"]:focus,
-input[type="radio"]:focus,
 input[type="checkbox"]:focus,
 select:focus {
   .box-shadow(none); // override for file inputs
@@ -279,6 +260,33 @@ textarea[readonly] {
 // FORM FIELD FEEDBACK STATES
 // --------------------------
 
+// Mixin for form field states
+.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) {
+  // Set the text color
+  > label,
+  .help-block,
+  .help-inline {
+    color: @textColor;
+  }
+  // Style inputs accordingly
+  input,
+  select,
+  textarea {
+    color: @textColor;
+    border-color: @borderColor;
+    &:focus {
+      border-color: darken(@borderColor, 10%);
+      .box-shadow(0 0 6px lighten(@borderColor, 20%));
+    }
+  }
+  // Give a small background color for input-prepend/-append
+  .input-prepend .add-on,
+  .input-append .add-on {
+    color: @textColor;
+    background-color: @backgroundColor;
+    border-color: @textColor;
+  }
+}
 // Warning
 .control-group.warning {
   .formFieldState(@warningText, @warningText, @warningBackground);
@@ -301,7 +309,7 @@ select:focus:required:invalid {
   border-color: #ee5f5b;
   &:focus {
     border-color: darken(#ee5f5b, 10%);
-    .box-shadow(0 0 6px lighten(#ee5f5b, 20%));    
+    .box-shadow(0 0 6px lighten(#ee5f5b, 20%));
   }
 }
 
@@ -336,7 +344,6 @@ select:focus:required:invalid {
 // ---------
 
 .help-block {
-  display: block; // account for any element using help-block
   margin-top: 5px;
   margin-bottom: 0;
   color: @grayLight;
@@ -405,8 +412,7 @@ select:focus:required:invalid {
     .border-radius(3px 0 0 3px);
   }
   .uneditable-input {
-    border-left-color: #eee;
-    border-right-color: #ccc;    
+    border-right-color: #ccc;
   }
   .add-on {
     margin-right: 0;
@@ -455,10 +461,6 @@ select:focus:required:invalid {
     display: inline-block;
     margin-bottom: 0;
   }
-  // Re-hide hidden elements due to specifity
-  .hide {
-    display: none;
-  }
 }
 .form-search label,
 .form-inline label,
@@ -475,37 +477,28 @@ select:focus:required:invalid {
 .form-inline .input-prepend .add-on {
   vertical-align: middle;
 }
-// Inline checkbox/radio labels
-.form-search .radio,
-.form-inline .radio,
-.form-search .checkbox,
-.form-inline .checkbox {
-  margin-bottom: 0;
-  vertical-align: middle;
-}
 
 // Margin to space out fieldsets
 .control-group {
   margin-bottom: @baseLineHeight / 2;
 }
 
-// Legend collapses margin, so next element is responsible for spacing
-legend + .control-group {
-  margin-top: @baseLineHeight;
-  -webkit-margin-top-collapse: separate;
-}
-
 // Horizontal-specific styles
 // --------------------------
 
 .form-horizontal {
+  // Legend collapses margin, so we're relegated to padding
+  legend + .control-group {
+    margin-top: @baseLineHeight;
+    -webkit-margin-top-collapse: separate;
+  }
   // Increase spacing between groups
   .control-group {
     margin-bottom: @baseLineHeight;
     .clearfix();
   }
   // Float the labels left
-  .control-label {
+  .control-group > label {
     float: left;
     width: 140px;
     padding-top: 5px;

data/vendor/toolkit/twitter/bootstrap/labels.less

@@ -1,32 +1,16 @@
 // LABELS
 // ------
 
-// Base
 .label {
-  padding: 2px 4px 3px;
-  font-size: @baseFontSize * .85;
+  padding: 1px 3px 2px;
+  font-size: @baseFontSize * .75;
   font-weight: bold;
   color: @white;
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+  text-transform: uppercase;
   background-color: @grayLight;
   .border-radius(3px);
 }
-
-// Hover state
-.label:hover {
-  color: @white;
-  text-decoration: none;
-}
-
-// Colors
-.label-important        { background-color: @errorText; }
-.label-important:hover  { background-color: darken(@errorText, 10%); }
-
-.label-warning          { background-color: @orange; }
-.label-warning:hover    { background-color: darken(@orange, 10%); }
-
-.label-success          { background-color: @successText; }
-.label-success:hover    { background-color: darken(@successText, 10%); }
-
-.label-info             { background-color: @infoText; }
-.label-info:hover       { background-color: darken(@infoText, 10%); }
+.label-important { background-color: @errorText; }
+.label-warning   { background-color: @orange; }
+.label-success   { background-color: @successText; }
+.label-info      { background-color: @infoText; }

data/vendor/toolkit/twitter/bootstrap/mixins.less

@@ -9,7 +9,7 @@
 // Clearfix
 // --------
 // For clearing floats like a boss h5bp.com/q
-.clearfix {
+.clearfix() {
   *zoom: 1;
   &:before,
   &:after {
@@ -25,7 +25,7 @@
 // ------------------
 .tab-focus() {
   // Default
-  outline: thin dotted #333;
+  outline: thin dotted;
   // Webkit
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
@@ -89,15 +89,6 @@
   }
 }
 
-// Text overflow
-// -------------------------
-// Requires inline-block or block for proper styling
-.text-overflow() {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
 
 
 // FONTS
@@ -208,13 +199,13 @@
   // Setup the mixins to be used
   .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, @columns) {
     width: 1% * (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1));
-  }
+  } 
   .gridColumn(@fluidGridGutterWidth) {
     float: left;
     margin-left: @fluidGridGutterWidth;
   }
   // Take these values and mixins, and make 'em do their thang
-  .generate(@gridColumns, @fluidGridColumnWidth, @fluidGridGutterWidth) {
+  .generate(@gridColumns, @fluidGridColumnWidth, @fluidGridGutterWidth) {      
     // Row surrounds the columns
     .row-fluid {
       width: 100%;
@@ -228,22 +219,24 @@
         margin-left: 0;
       }
       // Default columns
-      > .span1     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 1); }
-      > .span2     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 2); }
-      > .span3     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 3); }
-      > .span4     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 4); }
-      > .span5     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 5); }
-      > .span6     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 6); }
-      > .span7     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 7); }
-      > .span8     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 8); }
-      > .span9     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 9); }
-      > .span10    { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 10); }
-      > .span11    { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 11); }
-      > .span12    { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 12); }
+      .span1     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 1); }
+      .span2     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 2); }
+      .span3     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 3); }
+      .span4     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 4); }
+      .span5     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 5); }
+      .span6     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 6); }
+      .span7     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 7); }
+      .span8     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 8); }
+      .span9     { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 9); }
+      .span10    { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 10); }
+      .span11    { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 11); }
+      .span12    { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 12); }
     }
   }
 }
 
+
+
 // Input grid system
 // -------------------------
 #inputGridSystem {
@@ -270,52 +263,6 @@
   }
 }
 
-// Make a Grid
-// -------------------------
-// Use .makeRow and .makeColumn to assign semantic layouts grid system behavior
-.makeRow() {
-  margin-left: @gridGutterWidth * -1;
-  .clearfix();
-}
-.makeColumn(@columns: 1) {
-  float: left;
-  margin-left: @gridGutterWidth;
-  width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
-}
-
-
-
-// Form field states (used in forms.less)
-// --------------------------------------------------
-
-// Mixin for form field states
-.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) {
-  // Set the text color
-  > label,
-  .help-block,
-  .help-inline {
-    color: @textColor;
-  }
-  // Style inputs accordingly
-  input,
-  select,
-  textarea {
-    color: @textColor;
-    border-color: @borderColor;
-    &:focus {
-      border-color: darken(@borderColor, 10%);
-      .box-shadow(0 0 6px lighten(@borderColor, 20%));
-    }
-  }
-  // Give a small background color for input-prepend/-append
-  .input-prepend .add-on,
-  .input-append .add-on {
-    color: @textColor;
-    background-color: @backgroundColor;
-    border-color: @textColor;
-  }
-}
-
 
 
 // CSS3 PROPERTIES
@@ -366,6 +313,13 @@
        -o-transform: translate(@x, @y);
           transform: translate(@x, @y);
 }
+.skew(@x: 0, @y: 0) {
+  -webkit-transform: translate(@x, @y);
+     -moz-transform: translate(@x, @y);
+      -ms-transform: translate(@x, @y);
+       -o-transform: translate(@x, @y);
+          transform: translate(@x, @y);
+}
 .skew(@x: 0, @y: 0) {
   -webkit-transform: skew(@x, @y);
      -moz-transform: skew(@x, @y);
@@ -373,13 +327,6 @@
        -o-transform: skew(@x, @y);
           transform: skew(@x, @y);
 }
-.translate3d(@x: 0, @y: 0, @z: 0) {
-  -webkit-transform: translate(@x, @y, @z);
-     -moz-transform: translate(@x, @y, @z);
-      -ms-transform: translate(@x, @y, @z);
-       -o-transform: translate(@x, @y, @z);
-          transform: translate(@x, @y, @z);
-}
 
 // Background clipping
 // Heads up: FF 3.6 and under need "padding" instead of "padding-box"

data/vendor/toolkit/twitter/bootstrap/modals.less

@@ -1,7 +1,6 @@
 // MODALS
 // ------
 
-// Recalculate z-index where appropriate
 .modal-open {
   .dropdown-menu {  z-index: @zindexDropdown + @zindexModal; }
   .dropdown.open { *z-index: @zindexDropdown + @zindexModal; }
@@ -9,7 +8,6 @@
   .tooltip       {  z-index: @zindexTooltip  + @zindexModal; }
 }
 
-// Background
 .modal-backdrop {
   position: fixed;
   top: 0;
@@ -27,7 +25,6 @@
   .opacity(80);
 }
 
-// Base modal
 .modal {
   position: fixed;
   top: 50%;
@@ -56,17 +53,9 @@
   // Close icon
   .close { margin-top: 2px; }
 }
-
-// Body (where all modal content resises)
 .modal-body {
   padding: 15px;
 }
-// Remove bottom margin if need be
-.modal-body .modal-form {
-  margin-bottom: 0;
-}
-
-// Footer (for actions)
 .modal-footer {
   padding: 14px 15px 15px;
   margin-bottom: 0;

data/vendor/toolkit/twitter/bootstrap/navbar.less

@@ -81,7 +81,7 @@
     margin-top: 5px; // make buttons vertically centered in navbar
   }
   .btn-group .btn {
-    margin-top: 0; // then undo the margin here so we don't accidentally double it
+    margin-top: 0;
   }
 }
 
@@ -104,14 +104,6 @@
   input[type="radio"] {
     margin-top: 3px;
   }
-  .input-append,
-  .input-prepend {
-    margin-top: 6px;
-    white-space: nowrap; // preven two  items from separating within a .navbar-form that has .pull-left
-    input {
-      margin-top: 0; // remove the margin on top since it's on the parent
-    }
-  }
 }
 
 // Navbar search
@@ -141,7 +133,7 @@
       background-color: @grayLight;
       background-color: rgba(255,255,255,.5);
     }
-    // Focus states (we use .focused since IE7-8 and down doesn't support :focus)
+    // Focus states (we use .focused since IE8 and down doesn't support :focus)
     &:focus,
     &.focused {
       padding: 5px 10px;
@@ -169,7 +161,7 @@
 .navbar-fixed-top .navbar-inner {
   padding-left:  0;
   padding-right: 0;
-  .border-radius(0);
+  .border-radius(0px);
 }
 
 
@@ -202,7 +194,7 @@
 }
 // Hover
 .navbar .nav > li > a:hover {
-  background-color: @navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover from .active
+  background-color: transparent;
   color: @navbarLinkColorHover;
   text-decoration: none;
 }
@@ -213,6 +205,7 @@
   color: @navbarLinkColorHover;
   text-decoration: none;
   background-color: @navbarBackground;
+  background-color: rgba(0,0,0,.5);
 }
 
 // Dividers (basically a vertical hr)
@@ -296,4 +289,4 @@
     left: auto;
     right: 13px;
   }
-}
+}