bootstrap-sass 2.0.4.2 → 2.1.0.0

data/vendor/assets/stylesheets/bootstrap/_carousel.scss

@@ -1,5 +1,7 @@
-// CAROUSEL
-// --------
+//
+// Carousel
+// --------------------------------------------------
+
 
 .carousel {
   position: relative;
@@ -27,13 +29,16 @@
     line-height: 1;
   }
 
-  .active, .next, .prev { display: block; }
+  .active,
+  .next,
+  .prev { display: block; }
 
   .active {
     left: 0;
   }
 
-  .next, .prev {
+  .next,
+  .prev {
     position: absolute;
     top: 0;
     width: 100%;
@@ -45,7 +50,8 @@
   .prev {
     left: -100%;
   }
-  .next.left, .prev.right {
+  .next.left,
+  .prev.right {
     left: 0;
   }
 
@@ -99,6 +105,7 @@
   }
 }
 
+
 // Caption for text below images
 // -----------------------------
 
@@ -107,10 +114,18 @@
   left: 0;
   right: 0;
   bottom: 0;
-  padding: 10px 15px 5px;
+  padding: 15px;
   background: $grayDark;
   background: rgba(0,0,0,.75);
 }
-.carousel-caption h4, .carousel-caption p {
+.carousel-caption h4,
+.carousel-caption p {
   color: $white;
+  line-height: $baseLineHeight;
+}
+.carousel-caption h4 {
+  margin: 0 0 5px;
 }
+.carousel-caption p {
+  margin-bottom: 0;
+}

data/vendor/assets/stylesheets/bootstrap/_close.scss

@@ -1,5 +1,7 @@
-// CLOSE ICONS
-// -----------
+//
+// Close icons
+// --------------------------------------------------
+
 
 .close {
   float: right;
@@ -23,7 +25,7 @@
 button.close {
   padding: 0;
   cursor: pointer;
-  background-color: transparent;
+  background: transparent;
   border: 0;
   -webkit-appearance: none;
 }

data/vendor/assets/stylesheets/bootstrap/_code.scss

@@ -1,12 +1,14 @@
-// Code.css.scss
-// Code typography styles for the <code> and <pre> elements
-// --------------------------------------------------------
+//
+// Code (inline and blocK)
+// --------------------------------------------------
+
 
 // Inline and block code styles
-code, pre {
+code,
+pre {
   padding: 0 3px 2px;
   @include font-family-monospace();
-  font-size: $baseFontSize - 1;
+  font-size: $baseFontSize - 2;
   color: $grayDark;
   @include border-radius(3px);
 }
@@ -24,7 +26,7 @@ pre {
   display: block;
   padding: ($baseLineHeight - 1) / 2;
   margin: 0 0 $baseLineHeight / 2;
-  font-size: $baseFontSize * .925; // 13px to 12px
+  font-size: $baseFontSize - 1; // 14px to 13px
   line-height: $baseLineHeight;
   word-break: break-all;
   word-wrap: break-word;

data/vendor/assets/stylesheets/bootstrap/_component-animations.scss

@@ -1,5 +1,7 @@
-// COMPONENT ANIMATIONS
-// --------------------
+//
+// Component animations
+// --------------------------------------------------
+
 
 .fade {
   opacity: 0;
@@ -10,9 +12,10 @@
 }
 
 .collapse {
-  position:relative;
+  position: relative;
   height: 0;
-  overflow:hidden;
+  overflow: hidden;
+  overflow: visible \9;
   @include transition(height .35s ease);
   &.in {
     height: auto;

data/vendor/assets/stylesheets/bootstrap/_dropdowns.scss

@@ -1,15 +1,19 @@
-// DROPDOWN MENUS
-// --------------
+//
+// Dropdown menus
+// --------------------------------------------------
+
 
 // Use the .menu class on any <li> element within the topbar or ul.tabs and you'll get some superfancy dropdowns
-.dropup, .dropdown {
+.dropup,
+.dropdown {
   position: relative;
 }
 .dropdown-toggle {
   // The caret makes the toggle a bit too tall in IE7
   *margin-bottom: -3px;
 }
-.dropdown-toggle:active, .open .dropdown-toggle {
+.dropdown-toggle:active,
+.open .dropdown-toggle {
   outline: 0;
 }
 
@@ -24,7 +28,6 @@
   border-right: 4px solid transparent;
   border-left:  4px solid transparent;
   content: "";
-  @include opacity(0.3);
 }
 
 // Place the caret
@@ -32,9 +35,6 @@
   margin-top: 8px;
   margin-left: 2px;
 }
-.dropdown:hover .caret, .open .caret {
-  @include opacity(1);
-}
 
 // The dropdown menu (ul)
 // ----------------------
@@ -46,15 +46,15 @@
   display: none; // none by default, but block on "open" of the menu
   float: left;
   min-width: 160px;
-  padding: 4px 0;
-  margin: 1px 0 0; // override default ul
+  padding: 5px 0;
+  margin: 2px 0 0; // override default ul
   list-style: none;
   background-color: $dropdownBackground;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0,0,0,.2);
+  border: 1px solid #ccc; // Fallback for IE7-8
+  border: 1px solid $dropdownBorder;
   *border-right-width: 2px;
   *border-bottom-width: 2px;
-  @include border-radius(5px);
+  @include border-radius(6px);
   @include box-shadow(0 5px 10px rgba(0,0,0,.2));
   -webkit-background-clip: padding-box;
      -moz-background-clip: padding;
@@ -74,7 +74,7 @@
   // Links within the dropdown menu
   a {
     display: block;
-    padding: 3px 15px;
+    padding: 3px 20px;
     clear: both;
     font-weight: normal;
     line-height: $baseLineHeight;
@@ -85,10 +85,38 @@
 
 // Hover state
 // -----------
-.dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover {
-  color: $dropdownLinkColorHover;
+.dropdown-menu li > a:hover,
+.dropdown-menu li > a:focus,
+.dropdown-submenu:hover > a {
   text-decoration: none;
+  color: $dropdownLinkColorHover;
   background-color: $dropdownLinkBackgroundHover;
+  @include gradient-vertical($dropdownLinkBackgroundHover, darken($dropdownLinkBackgroundHover, 5%));
+}
+
+// Active state
+// ------------
+.dropdown-menu .active > a,
+.dropdown-menu .active > a:hover {
+  color: $dropdownLinkColorHover;
+  text-decoration: none;
+  outline: 0;
+  background-color: $dropdownLinkBackgroundActive;
+  @include gradient-vertical($dropdownLinkBackgroundActive, darken($dropdownLinkBackgroundActive, 5%));
+}
+
+// Disabled state
+// --------------
+// Gray out text and ensure the hover state remains gray
+.dropdown-menu .disabled > a,
+.dropdown-menu .disabled > a:hover {
+  color: $grayLight;
+}
+// Nuke hover effects
+.dropdown-menu .disabled > a:hover {
+  text-decoration: none;
+  background-color: transparent;
+  cursor: default;
 }
 
 // Open state for the dropdown
@@ -114,7 +142,8 @@
 // ------------------------------------------------------
 // Just add .dropup after the standard .dropdown class and you're set, bro.
 // TODO: abstract this so that the navbar fixed styles are not placed here?
-.dropup, .navbar-fixed-bottom .dropdown {
+.dropup,
+.navbar-fixed-bottom .dropdown {
   // Reverse the caret
   .caret {
     border-top: 0;
@@ -129,6 +158,50 @@
   }
 }
 
+// Sub menus
+// ---------------------------
+.dropdown-submenu {
+  position: relative;
+}
+.dropdown-submenu > .dropdown-menu {
+  top: 0;
+  left: 100%;
+  margin-top: -6px;
+  margin-left: -1px;
+  -webkit-border-radius: 0 6px 6px 6px;
+     -moz-border-radius: 0 6px 6px 6px;
+          border-radius: 0 6px 6px 6px;
+}
+.dropdown-submenu:hover .dropdown-menu {
+  display: block;
+}
+
+.dropdown-submenu > a:after {
+  display: block;
+  content: " ";
+  float: right;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+  border-width: 5px 0 5px 5px;
+  border-left-color: darken($dropdownBackground, 20%);
+  margin-top: 5px;
+  margin-right: -10px;
+}
+.dropdown-submenu:hover > a:after {
+  border-left-color: $dropdownLinkColorHover;
+}
+
+
+// Tweak nav headers
+// -----------------
+// Increase padding from 15px to 20px on sides
+.dropdown .dropdown-menu .nav-header {
+  padding-left: 20px;
+  padding-right: 20px;
+}
+
 // Typeahead
 // ---------
 .typeahead {

data/vendor/assets/stylesheets/bootstrap/_forms.scss

@@ -1,6 +1,6 @@
-// Forms.less
-// Base styles for various input types, form layouts, and states
-// -------------------------------------------------------------
+//
+// Forms
+// --------------------------------------------------
 
 
 // GENERAL STYLES
@@ -22,7 +22,7 @@ legend {
   display: block;
   width: 100%;
   padding: 0;
-  margin-bottom: $baseLineHeight * 1.5;
+  margin-bottom: $baseLineHeight;
   font-size: $baseFontSize * 1.5;
   line-height: $baseLineHeight * 2;
   color: $grayDark;
@@ -37,10 +37,17 @@ legend {
 }
 
 // Set font for forms
-label, input, button, select, textarea {
-  @include font-shorthand($baseFontSize, normal, $baseLineHeight); // Set size, weight, line-height here
+label,
+input,
+button,
+select,
+textarea {
+  @include font-shorthand($baseFontSize,normal,$baseLineHeight); // Set size, weight, line-height here
 }
-input, button, select, textarea {
+input,
+button,
+select,
+textarea {
   font-family: $baseFontFamily; // And only set font-family here for those that need it (note the missing label element)
 }
 
@@ -54,21 +61,37 @@ label {
 // -------------------------
 
 // Shared size and type resets
-select, textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"],
-input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"],
-input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input {
+select,
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
   display: inline-block;
   height: $baseLineHeight;
-  padding: 4px;
+  padding: 4px 6px;
   margin-bottom: 9px;
   font-size: $baseFontSize;
   line-height: $baseLineHeight;
   color: $gray;
+  @include border-radius($inputBorderRadius);
 }
 
 // Reset appearance properties for textual inputs and textarea
 // Declare width for legacy (can't be on input[type=*] selectors or it's too specific)
-input, textarea {
+input,
+textarea {
   width: 210px;
 }
 // Reset height since textareas have rows
@@ -76,12 +99,24 @@ textarea {
   height: auto;
 }
 // Everything else
-textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"],
-input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"],
-input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input {
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
   background-color: $inputBackground;
   border: 1px solid $inputBorder;
-  @include border-radius($inputBorderRadius);
   @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
   @include transition(#{border linear .2s, box-shadow linear .2s});
 
@@ -95,76 +130,124 @@ input[type="url"], input[type="search"], input[type="tel"], input[type="color"],
 }
 
 // Position radios and checkboxes better
-input[type="radio"], input[type="checkbox"] {
-  margin: 3px 0;
+input[type="radio"],
+input[type="checkbox"] {
+  margin: 4px 0 0;
   *margin-top: 0; /* IE7 */
+  margin-top: 1px \9; /* IE8-9 */
   line-height: normal;
   cursor: pointer;
 }
 
-// Reset width of input buttons, radios, checkboxes
-input[type="submit"], input[type="reset"], input[type="button"], input[type="radio"], input[type="checkbox"] {
+// Reset width of input images, buttons, radios, checkboxes
+input[type="file"],
+input[type="image"],
+input[type="submit"],
+input[type="reset"],
+input[type="button"],
+input[type="radio"],
+input[type="checkbox"] {
   width: auto; // Override of generic input selector
 }
 
-// Make uneditable textareas behave like a textarea
-.uneditable-textarea {
-  width: auto;
-  height: auto;
-}
-
 // Set the height of select and file controls to match text inputs
-select, input[type="file"] {
-  height: 28px; /* In IE7, the height of the select element cannot be changed by height, only font-size */
+select,
+input[type="file"] {
+  height: 30px; /* In IE7, the height of the select element cannot be changed by height, only font-size */
   *margin-top: 4px; /* For IE7, add top margin to align select with labels */
-  line-height: 28px;
+  line-height: 30px;
 }
 
 // Make select elements obey height by applying a border
 select {
   width: 220px; // default input width + 10px of padding that doesn't get applied
   border: 1px solid #bbb;
+  background-color: $inputBackground; // Chrome on Linux and Mobile Safari need background-color
 }
 
 // Make multiple select elements height not fixed
-select[multiple], select[size] {
+select[multiple],
+select[size] {
   height: auto;
 }
 
 // Focus for select, file, radio, and checkbox
-select:focus, input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus {
+select:focus,
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus {
   @include tab-focus();
 }
 
 
+// Uneditable inputs
+// -------------------------
+
+// Make uneditable inputs look inactive
+.uneditable-input,
+.uneditable-textarea {
+  color: $grayLight;
+  background-color: darken($inputBackground, 1%);
+  border-color: $inputBorder;
+  @include box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
+  cursor: not-allowed;
+}
+
+// For text that needs to appear as an input but should not be an input
+.uneditable-input {
+  overflow: hidden; // prevent text from wrapping, but still cut it off like an input does
+  white-space: nowrap;
+}
+
+// Make uneditable textareas behave like a textarea
+.uneditable-textarea {
+  width: auto;
+  height: auto;
+}
+
+
+// Placeholder
+// -------------------------
+
+// Placeholder text gets special styles; can't be bundled together though for some reason
+input,
+textarea {
+  @include placeholder();
+}
+
 
 // CHECKBOXES & RADIOS
 // -------------------
 
 // Indent the labels to position radios/checkboxes as hanging
-.radio, .checkbox {
+.radio,
+.checkbox {
   min-height: 18px; // clear the floating input if there is no label text
   padding-left: 18px;
 }
-.radio input[type="radio"], .checkbox input[type="checkbox"] {
+.radio input[type="radio"],
+.checkbox input[type="checkbox"] {
   float: left;
   margin-left: -18px;
 }
 
 // Move the options list down to align with labels
-.controls > .radio:first-child, .controls > .checkbox:first-child {
+.controls > .radio:first-child,
+.controls > .checkbox:first-child {
   padding-top: 5px; // has to be padding because margin collaspes
 }
 
 // Radios and checkboxes on same line
 // TODO v3: Convert .inline to .control-inline
-.radio.inline, .checkbox.inline {
+.radio.inline,
+.checkbox.inline {
   display: inline-block;
   padding-top: 5px;
   margin-bottom: 0;
   vertical-align: middle;
 }
-.radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline {
+.radio.inline + .radio.inline,
+.checkbox.inline + .checkbox.inline {
   margin-left: 10px; // space out consecutive inline controls
 }
 
@@ -182,15 +265,29 @@ select:focus, input[type="file"]:focus, input[type="radio"]:focus, input[type="c
 .input-xxlarge    { width: 530px; }
 
 // Grid style input sizes
-input[class*="span"], select[class*="span"], textarea[class*="span"], .uneditable-input[class*="span"],
+input[class*="span"],
+select[class*="span"],
+textarea[class*="span"],
+.uneditable-input[class*="span"],
 // Redeclare since the fluid row class is more specific
-.row-fluid input[class*="span"], .row-fluid select[class*="span"], .row-fluid textarea[class*="span"], .row-fluid .uneditable-input[class*="span"] {
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"] {
   float: none;
   margin-left: 0;
 }
 // Ensure input-prepend/append never wraps
-.input-append input[class*="span"], .input-append .uneditable-input[class*="span"], .input-prepend input[class*="span"],
-.input-prepend .uneditable-input[class*="span"], .row-fluid .input-prepend [class*="span"], .row-fluid .input-append [class*="span"] {
+.input-append input[class*="span"],
+.input-append .uneditable-input[class*="span"],
+.input-prepend input[class*="span"],
+.input-prepend .uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"],
+.row-fluid .input-prepend [class*="span"],
+.row-fluid .input-append [class*="span"] {
   display: inline-block;
 }
 
@@ -199,7 +296,17 @@ input[class*="span"], select[class*="span"], textarea[class*="span"], .uneditabl
 // GRID SIZING FOR INPUTS
 // ----------------------
 
-@include gridInput($gridColumnWidth, $gridGutterWidth);
+// Grid sizes
+@include grid-input($gridColumnWidth, $gridGutterWidth);
+
+// Control row for multiple inputs per line
+.controls-row {
+  @include clearfix(); // Clear the float from controls
+}
+.controls-row [class*="span"] {
+  float: left; // Float to collapse white-space for proper grid alignment
+}
+
 
 
 
@@ -207,13 +314,20 @@ input[class*="span"], select[class*="span"], textarea[class*="span"], .uneditabl
 // --------------
 
 // Disabled and read-only inputs
-input[disabled], select[disabled], textarea[disabled], input[readonly], select[readonly], textarea[readonly] {
+input[disabled],
+select[disabled],
+textarea[disabled],
+input[readonly],
+select[readonly],
+textarea[readonly] {
   cursor: not-allowed;
   background-color: $inputDisabledBackground;
-  border-color: #ddd;
 }
 // Explicitly reset the colors here
-input[type="radio"][disabled], input[type="checkbox"][disabled], input[type="radio"][readonly], input[type="checkbox"][readonly] {
+input[type="radio"][disabled],
+input[type="checkbox"][disabled],
+input[type="radio"][readonly],
+input[type="checkbox"][readonly] {
   background-color: transparent;
 }
 
@@ -238,7 +352,9 @@ input[type="radio"][disabled], input[type="checkbox"][disabled], input[type="rad
 
 // HTML5 invalid states
 // Shares styles with the .control-group.error above
-input:focus:required:invalid, textarea:focus:required:invalid, select:focus:required:invalid {
+input:focus:required:invalid,
+textarea:focus:required:invalid,
+select:focus:required:invalid {
   color: #b94a48;
   border-color: #ee5f5b;
   &:focus {
@@ -261,27 +377,14 @@ input:focus:required:invalid, textarea:focus:required:invalid, select:focus:requ
   @include clearfix(); // Adding clearfix to allow for .pull-right button containers
 }
 
-// For text that needs to appear as an input but should not be an input
-.uneditable-input {
-  overflow: hidden; // prevent text from wrapping, but still cut it off like an input does
-  white-space: nowrap;
-  cursor: not-allowed;
-  background-color: $inputBackground;
-  border-color: #eee;
-  @include box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
-}
-
-// Placeholder text gets special styles; can't be bundled together though for some reason
-// (sass-edit) - need special mixin
-@include rootPlaceholder();
-
 
 
 // HELP TEXT
 // ---------
 
-.help-block, .help-inline {
-  color: $gray; // lighten the text some for contrast
+.help-block,
+.help-inline {
+  color: lighten($textColor, 15%); // lighten the text some for contrast
 }
 
 .help-block {
@@ -302,38 +405,44 @@ input:focus:required:invalid, textarea:focus:required:invalid, select:focus:requ
 // ------------
 
 // Allow us to put symbols and text within the input field for a cleaner look
-.input-prepend, .input-append {
+.input-append,
+.input-prepend {
   margin-bottom: 5px;
-  input, select, .uneditable-input {
+  font-size: 0;
+  white-space: nowrap; // Prevent span and input from separating
+
+  input,
+  select,
+  .uneditable-input {
     position: relative; // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness
     margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
     *margin-left: 0;
-    vertical-align: middle;
+    font-size: $baseFontSize;
+    vertical-align: top;
     @include border-radius(0 $inputBorderRadius $inputBorderRadius 0);
     // Make input on top when focused so blue border and shadow always show
     &:focus {
       z-index: 2;
     }
   }
-  .uneditable-input {
-    border-left-color: #ccc;
-  }
   .add-on {
     display: inline-block;
     width: auto;
     height: $baseLineHeight;
     min-width: 16px;
     padding: 4px 5px;
+    font-size: $baseFontSize;
     font-weight: normal;
     line-height: $baseLineHeight;
     text-align: center;
     text-shadow: 0 1px 0 $white;
-    vertical-align: middle;
     background-color: $grayLighter;
     border: 1px solid #ccc;
   }
-  .add-on, .btn {
+  .add-on,
+  .btn {
     margin-left: -1px;
+    vertical-align: top;
     @include border-radius(0);
   }
   .active {
@@ -342,35 +451,40 @@ input:focus:required:invalid, textarea:focus:required:invalid, select:focus:requ
   }
 }
 .input-prepend {
-  .add-on, .btn {
+  .add-on,
+  .btn {
     margin-right: -1px;
   }
-  .add-on:first-child, .btn:first-child {
+  .add-on:first-child,
+  .btn:first-child {
     @include border-radius($inputBorderRadius 0 0 $inputBorderRadius);
   }
 }
 .input-append {
-  input, select, .uneditable-input {
-    @include border-radius($inputBorderRadius 0 0 $inputBorderRadius);
-  }
+  input,
+  select,
   .uneditable-input {
-    border-right-color: #ccc;
-    border-left-color: #eee;
+    @include border-radius($inputBorderRadius 0 0 $inputBorderRadius);
   }
-  .add-on:last-child, .btn:last-child {
+  .add-on:last-child,
+  .btn:last-child {
     @include border-radius(0 $inputBorderRadius $inputBorderRadius 0);
   }
 }
 // Remove all border-radius for inputs with both prepend and append
 .input-prepend.input-append {
-  input, select, .uneditable-input {
+  input,
+  select,
+  .uneditable-input {
     @include border-radius(0);
   }
-  .add-on:first-child, .btn:first-child {
+  .add-on:first-child,
+  .btn:first-child {
     margin-right: -1px;
     @include border-radius($inputBorderRadius 0 0 $inputBorderRadius);
   }
-  .add-on:last-child, .btn:last-child {
+  .add-on:last-child,
+  .btn:last-child {
     margin-left: -1px;
     @include border-radius(0 $inputBorderRadius $inputBorderRadius 0);
   }
@@ -381,15 +495,34 @@ input:focus:required:invalid, textarea:focus:required:invalid, select:focus:requ
 // SEARCH FORM
 // -----------
 
-input.search-query { // input. fix the overwriting of the search-query and allow rounded corner for the search field
+input.search-query {
   padding-right: 14px;
   padding-right: 4px \9;
   padding-left: 14px;
   padding-left: 4px \9; /* IE7-8 doesn't have border-radius, so don't indent the padding */
-  margin-bottom: 0; // remove the default margin on all inputs
-  @include border-radius(14px);
+  margin-bottom: 0; // Remove the default margin on all inputs
+  @include border-radius(15px);
 }
 
+/* Allow for input prepend/append in search forms */
+.form-search .input-append .search-query,
+.form-search .input-prepend .search-query {
+  @include border-radius(0); // Override due to specificity
+}
+.form-search .input-append .search-query {
+  @include border-radius(14px 0 0 14px)
+}
+.form-search .input-append .btn {
+  @include border-radius(0 14px 14px 0)
+}
+.form-search .input-prepend .search-query {
+  @include border-radius(0 14px 14px 0)
+}
+.form-search .input-prepend .btn {
+  @include border-radius(14px 0 0 14px)
+}
+
+
 
 
 // HORIZONTAL & VERTICAL FORMS
@@ -398,33 +531,53 @@ input.search-query { // input. fix the overwriting of the search-query and allow
 // Common properties
 // -----------------
 
-.form-search, .form-inline, .form-horizontal {
-  input, textarea, select, .help-inline, .uneditable-input, .input-prepend, .input-append {
+.form-search,
+.form-inline,
+.form-horizontal {
+  input,
+  textarea,
+  select,
+  .help-inline,
+  .uneditable-input,
+  .input-prepend,
+  .input-append {
     display: inline-block;
     @include ie7-inline-block();
     margin-bottom: 0;
+    vertical-align: middle;
   }
   // Re-hide hidden elements due to specifity
   .hide {
     display: none;
   }
 }
-.form-search label, .form-inline label {
+.form-search label,
+.form-inline label,
+.form-search .btn-group,
+.form-inline .btn-group {
   display: inline-block;
 }
 // Remove margin for input-prepend/-append
-.form-search .input-append, .form-inline .input-append, .form-search .input-prepend, .form-inline .input-prepend {
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
   margin-bottom: 0;
 }
 // Inline checkbox/radio labels (remove padding on left)
-.form-search .radio, .form-search .checkbox, .form-inline .radio, .form-inline .checkbox {
+.form-search .radio,
+.form-search .checkbox,
+.form-inline .radio,
+.form-inline .checkbox {
   padding-left: 0;
   margin-bottom: 0;
   vertical-align: middle;
 }
 // Remove float and margin, set to inline-block
-.form-search .radio input[type="radio"], .form-search .checkbox input[type="checkbox"],
-.form-inline .radio input[type="radio"], .form-inline .checkbox input[type="checkbox"] {
+.form-search .radio input[type="radio"],
+.form-search .checkbox input[type="checkbox"],
+.form-inline .radio input[type="radio"],
+.form-inline .checkbox input[type="checkbox"] {
   float: left;
   margin-right: 3px;
   margin-left: 0;