First cut at the Bootstrap 2.1.1 Less to Sass conversion

22 files changed, 374 insertions, 255 deletions

diff --git a/vendor/assets/stylesheets/bootstrap/_button-groups.scss b/vendor/assets/stylesheets/bootstrap/_button-groups.scss
index a65da2ef..f3479f96 100644
--- a/vendor/assets/stylesheets/bootstrap/_button-groups.scss
+++ b/vendor/assets/stylesheets/bootstrap/_button-groups.scss
@@ -7,6 +7,7 @@
 .btn-group {
   position: relative;
   font-size: 0; // remove as part 1 of font-size inline-block hack
+  vertical-align: middle; // match .btn alignment given font-size hack above
   white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
   @include ie7-restore-left-whitespace();
 }
diff --git a/vendor/assets/stylesheets/bootstrap/_buttons.scss b/vendor/assets/stylesheets/bootstrap/_buttons.scss
index eb7c1383..04951c5f 100644
--- a/vendor/assets/stylesheets/bootstrap/_buttons.scss
+++ b/vendor/assets/stylesheets/bootstrap/_buttons.scss
@@ -96,10 +96,13 @@
 .btn-mini {
   padding: 2px 6px;
   font-size: $baseFontSize - 3px;
-  line-height: $baseLineHeight - 4px;
+  line-height: $baseLineHeight - 3px;
 }
 
+
 // Block button
+// -------------------------
+
 .btn-block {
   display: block;
   width: 100%;
@@ -107,10 +110,22 @@
   padding-right: 0;
   @include box-sizing(border-box);
 }
+
+// Vertically space out multiple block buttons
 .btn-block + .btn-block {
   margin-top: 5px;
 }
 
+// Specificity overrides
+input[type="submit"],
+input[type="reset"],
+input[type="button"] {
+  &.btn-block {
+    width: 100%;
+  }
+}
+
+
 
 // Alternate buttons
 // --------------------------------------------------
@@ -193,7 +208,8 @@ input[type="submit"].btn {
 
 // Make a button look and behave like a link
 .btn-link,
-.btn-link:active {
+.btn-link:active,
+.btn-link[disabled] {
   background-color: transparent;
   background-image: none;
   @include box-shadow(none);
@@ -209,3 +225,7 @@ input[type="submit"].btn {
   text-decoration: underline;
   background-color: transparent;
 }
+.btn-link[disabled]:hover {
+  color: $grayDark;
+  text-decoration: none;
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_component-animations.scss b/vendor/assets/stylesheets/bootstrap/_component-animations.scss
index 66192431..0a367f3e 100644
--- a/vendor/assets/stylesheets/bootstrap/_component-animations.scss
+++ b/vendor/assets/stylesheets/bootstrap/_component-animations.scss
@@ -15,7 +15,6 @@
   position: relative;
   height: 0;
   overflow: hidden;
-  overflow: visible \9;
   @include transition(height .35s ease);
   &.in {
     height: auto;
diff --git a/vendor/assets/stylesheets/bootstrap/_dropdowns.scss b/vendor/assets/stylesheets/bootstrap/_dropdowns.scss
index 600db03c..4bd79949 100644
--- a/vendor/assets/stylesheets/bootstrap/_dropdowns.scss
+++ b/vendor/assets/stylesheets/bootstrap/_dropdowns.scss
@@ -55,7 +55,7 @@
   *border-right-width: 2px;
   *border-bottom-width: 2px;
   @include border-radius(6px);
-  @include box-shadow(0 5px 10px rgba(0,0,0,.2));
+  @include box-shadow(#{0 5px 10px rgba(0,0,0,.2)});
   -webkit-background-clip: padding-box;
      -moz-background-clip: padding;
           background-clip: padding-box;
@@ -148,7 +148,7 @@
   .caret {
     border-top: 0;
     border-bottom: 4px solid $black;
-    content: "\2191";
+    content: "";
   }
   // Different positioning for bottom up menu
   .dropdown-menu {
@@ -207,4 +207,4 @@
 .typeahead {
   margin-top: 2px; // give it some space to breathe
   @include border-radius(4px);
-}
\ No newline at end of file
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_forms.scss b/vendor/assets/stylesheets/bootstrap/_forms.scss
index ad2b771b..d2dc3eda 100644
--- a/vendor/assets/stylesheets/bootstrap/_forms.scss
+++ b/vendor/assets/stylesheets/bootstrap/_forms.scss
@@ -91,8 +91,9 @@ input[type="color"],
 // 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 {
-  width: 210px;
+textarea,
+.uneditable-input {
+  width: 206px; // plus 12px padding and 2px border
 }
 // Reset height since textareas have rows
 textarea {
@@ -117,7 +118,7 @@ input[type="color"],
 .uneditable-input {
   background-color: $inputBackground;
   border: 1px solid $inputBorder;
-  @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
+  @include box-shadow(#{inset 0 1px 1px rgba(0,0,0,.075)});
   @include transition(#{border linear .2s, box-shadow linear .2s});
 
   // Focus state
@@ -161,7 +162,7 @@ input[type="file"] {
 // 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;
+  border: 1px solid $inputBorder;
   background-color: $inputBackground; // Chrome on Linux and Mobile Safari need background-color
 }
 
@@ -189,7 +190,7 @@ input[type="checkbox"]:focus {
   color: $grayLight;
   background-color: darken($inputBackground, 1%);
   border-color: $inputBorder;
-  @include box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
+  @include box-shadow(#{inset 0 1px 2px rgba(0,0,0,.025)});
   cursor: not-allowed;
 }
 
@@ -209,7 +210,7 @@ input[type="checkbox"]:focus {
 // Placeholder
 // -------------------------
 
-// Placeholder text gets special styles; can't be bundled together though for some reason
+// Placeholder text gets special styles because when browsers invalidate entire lines if it doesn’t understand a selector
 input,
 textarea {
   @include placeholder();
@@ -349,6 +350,10 @@ input[type="checkbox"][readonly] {
 .control-group.success {
   @include formFieldState($successText, $successText, $successBackground);
 }
+// Success
+.control-group.info {
+  @include formFieldState($infoText, $infoText, $infoBackground);
+}
 
 // HTML5 invalid states
 // Shares styles with the .control-group.error above
@@ -359,7 +364,7 @@ select:focus:required:invalid {
   border-color: #ee5f5b;
   &:focus {
     border-color: darken(#ee5f5b, 10%);
-    @include box-shadow(0 0 6px lighten(#ee5f5b, 20%));
+    @include box-shadow(#{0 0 6px lighten(#ee5f5b, 20%)});
   }
 }
 
@@ -441,7 +446,6 @@ select:focus:required:invalid {
   }
   .add-on,
   .btn {
-    margin-left: -1px;
     vertical-align: top;
     @include border-radius(0);
   }
@@ -466,6 +470,10 @@ select:focus:required:invalid {
   .uneditable-input {
     @include border-radius($inputBorderRadius 0 0 $inputBorderRadius);
   }
+  .add-on,
+  .btn {
+    margin-left: -1px;
+  }
   .add-on:last-child,
   .btn:last-child {
     @include border-radius(0 $inputBorderRadius $inputBorderRadius 0);
@@ -510,16 +518,16 @@ input.search-query {
   @include border-radius(0); // Override due to specificity
 }
 .form-search .input-append .search-query {
-  @include border-radius(14px 0 0 14px)
+  @include border-radius(14px 0 0 14px);
 }
 .form-search .input-append .btn {
-  @include border-radius(0 14px 14px 0)
+  @include border-radius(0 14px 14px 0);
 }
 .form-search .input-prepend .search-query {
-  @include border-radius(0 14px 14px 0)
+  @include border-radius(0 14px 14px 0);
 }
 .form-search .input-prepend .btn {
-  @include border-radius(14px 0 0 14px)
+  @include border-radius(14px 0 0 14px);
 }
 
 
@@ -607,7 +615,7 @@ legend + .control-group {
   // Float the labels left
   .control-label {
     float: left;
-    width: 140px;
+    width: $horizontalComponentOffset - 20;
     padding-top: 5px;
     text-align: right;
   }
@@ -617,19 +625,26 @@ legend + .control-group {
     // don't inherit the margin of the parent, in this case .controls
     *display: inline-block;
     *padding-left: 20px;
-    margin-left: 160px;
+    margin-left: $horizontalComponentOffset;
     *margin-left: 0;
     &:first-child {
-      *padding-left: 160px;
+      *padding-left: $horizontalComponentOffset;
     }
   }
   // Remove bottom margin on block level help text since that's accounted for on .control-group
   .help-block {
-    margin-top: $baseLineHeight / 2;
     margin-bottom: 0;
   }
+  // And apply it only to .help-block instances that follow a form control
+  input,
+  select,
+  textarea {
+    + .help-block {
+      margin-top: $baseLineHeight / 2;
+    }
+  }
   // Move over buttons in .form-actions to align with .controls
   .form-actions {
-    padding-left: 160px;
+    padding-left: $horizontalComponentOffset;
   }
-}
\ No newline at end of file
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_mixins.scss b/vendor/assets/stylesheets/bootstrap/_mixins.scss
index 7d9130fe..c8d12c35 100644
--- a/vendor/assets/stylesheets/bootstrap/_mixins.scss
+++ b/vendor/assets/stylesheets/bootstrap/_mixins.scss
@@ -171,14 +171,15 @@
   select,
   textarea {
     color: $textColor;
+  }
+  input,
+  select,
+  textarea {
     border-color: $borderColor;
-    @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
+    @include box-shadow(#{inset 0 1px 1px rgba(0,0,0,.075)}); // Redeclare so transitions work
     &:focus {
       border-color: darken($borderColor, 10%);
-      // Write out in full since the lighten() function isn't easily escaped
-      -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($borderColor, 20%);
-         -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($borderColor, 20%);
-              box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($borderColor, 20%);
+      @include box-shadow(#{inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($borderColor, 20%)});
     }
   }
   // Give a small background color for input-prepend/-append
@@ -256,6 +257,12 @@
        -o-transition: $transition;
           transition: $transition;
 }
+@mixin transition-delay($transition-delay) {
+  -webkit-transition-delay: $transition-delay;
+     -moz-transition-delay: $transition-delay;
+       -o-transition-delay: $transition-delay;
+          transition-delay: $transition-delay;
+}
 
 // Transformations
 @mixin rotate($degrees) {
@@ -282,7 +289,7 @@
 @mixin skew($x, $y) {
   -webkit-transform: skew($x, $y);
      -moz-transform: skew($x, $y);
-      -ms-transform: skew($x, $y);
+      -ms-transform: skewX($x) skewY($y); // See https://github.com/twitter/bootstrap/issues/4885
        -o-transform: skew($x, $y);
           transform: skew($x, $y);
 }
@@ -545,6 +552,7 @@
 
   [class*="span"] {
     float: left;
+    min-height: 1px; // prevent collapsing columns
     margin-left: $gridGutterWidth;
   }
 
diff --git a/vendor/assets/stylesheets/bootstrap/_modals.scss b/vendor/assets/stylesheets/bootstrap/_modals.scss
index 1bf488ea..7df98752 100644
--- a/vendor/assets/stylesheets/bootstrap/_modals.scss
+++ b/vendor/assets/stylesheets/bootstrap/_modals.scss
@@ -3,8 +3,9 @@
 // --------------------------------------------------
 
 
-// Recalculate z-index where appropriate
-.modal-open {
+// Recalculate z-index where appropriate,
+// but only apply to elements within modal
+.modal-open modal {
   .dropdown-menu {  z-index: $zindexDropdown + $zindexModal; }
   .dropdown.open { *z-index: $zindexDropdown + $zindexModal; }
   .popover       {  z-index: $zindexPopover  + $zindexModal; }
@@ -43,7 +44,7 @@
   border: 1px solid rgba(0,0,0,.3);
   *border: 1px solid #999; /* IE6-7 */
   @include border-radius(6px);
-  @include box-shadow(0 3px 7px rgba(0,0,0,0.3));
+  @include box-shadow(#{0 3px 7px rgba(0,0,0,0.3)});
   @include background-clip(padding-box);
   &.fade {
     @include transition(#{opacity .3s linear, top .3s ease-out});
@@ -82,7 +83,7 @@
   background-color: #f5f5f5;
   border-top: 1px solid #ddd;
   @include border-radius(0 0 6px 6px);
-  @include box-shadow(inset 0 1px 0 $white);
+  @include box-shadow(#{inset 0 1px 0 $white});
   @include clearfix(); // clear it in case folks use .pull-* classes on buttons
 
   // Properly space out buttons
diff --git a/vendor/assets/stylesheets/bootstrap/_navbar.scss b/vendor/assets/stylesheets/bootstrap/_navbar.scss
index 373c0d01..72b9888f 100644
--- a/vendor/assets/stylesheets/bootstrap/_navbar.scss
+++ b/vendor/assets/stylesheets/bootstrap/_navbar.scss
@@ -26,7 +26,10 @@
   @include gradient-vertical($navbarBackgroundHighlight, $navbarBackground);
   border: 1px solid $navbarBorder;
   @include border-radius(4px);
-  @include box-shadow(0 1px 4px rgba(0,0,0,.065));
+  @include box-shadow(#{0 1px 4px rgba(0,0,0,.065)});
+
+  // Prevent floats from breaking the navbar
+  @include clearfix();
 }
 
 // Set width to auto for default container
@@ -87,13 +90,16 @@
 // -------------------------
 .navbar .btn,
 .navbar .btn-group {
-  @include navbarVerticalAlign(28px); // Vertically center in navbar
+  @include navbarVerticalAlign(30px); // Vertically center in navbar
 }
-.navbar .btn-group .btn {
-  margin: 0; // then undo the margin here so we don't accidentally double it
+.navbar .btn-group .btn,
+.navbar .input-prepend .btn,
+.navbar .input-append .btn {
+  margin-top: 0; // then undo the margin here so we don't accidentally double it
 }
 
 // Navbar forms
+// -------------------------
 .navbar-form {
   margin-bottom: 0; // remove default bottom margin
   @include clearfix();
@@ -125,6 +131,7 @@
 }
 
 // Navbar search
+// -------------------------
 .navbar-search {
   position: relative;
   float: left;
@@ -166,12 +173,12 @@
   z-index: $zindexFixedNavbar;
   margin-bottom: 0; // remove 18px margin for default navbar
 }
-.navbar-fixed-top,
-.navbar-fixed-bottom,
-.navbar-static-top {
-  .navbar-inner {
-    border: 0;
-  }
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+  border-width: 0 0 1px;
+}
+.navbar-fixed-bottom .navbar-inner {
+  border-width: 1px 0 0;
 }
 .navbar-fixed-top .navbar-inner,
 .navbar-fixed-bottom .navbar-inner {
@@ -221,6 +228,7 @@
 }
 .navbar .nav.pull-right {
   float: right; // redeclare due to specificity
+  margin-right: 0; // remove margin on float right nav
 }
 .navbar .nav > li {
   float: left;
@@ -254,9 +262,7 @@
   color: $navbarLinkColorActive;
   text-decoration: none;
   background-color: $navbarLinkBackgroundActive;
-  -webkit-box-shadow: inset 0 3px 8px rgba(0,0,0,.125);
-     -moz-box-shadow: inset 0 3px 8px rgba(0,0,0,.125);
-          box-shadow: inset 0 3px 8px rgba(0,0,0,.125);
+  @include box-shadow(#{inset 0 3px 8px rgba(0,0,0,.125)});
 }
 
 // Navbar button for toggling navbar items in responsive layouts
@@ -276,7 +282,7 @@
   height: 2px;
   background-color: #f5f5f5;
   @include border-radius(1px);
-  @include box-shadow(0 1px 0 rgba(0,0,0,.25));
+  @include box-shadow(#{0 1px 0 rgba(0,0,0,.25)});
 }
 .btn-navbar .icon-bar + .icon-bar {
   margin-top: 3px;
@@ -452,7 +458,7 @@
         text-shadow: 0 1px 0 $white;
         background-color: $navbarInverseSearchBackgroundFocus;
         border: 0;
-        @include box-shadow(0 0 3px rgba(0,0,0,.15));
+        @include box-shadow(#{0 0 3px rgba(0,0,0,.15)});
         outline: 0;
       }
     }
@@ -463,4 +469,4 @@
     @include buttonBackground(darken($navbarInverseBackgroundHighlight, 5%), darken($navbarInverseBackground, 5%));
   }
 
-}
\ No newline at end of file
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_pager.scss b/vendor/assets/stylesheets/bootstrap/_pager.scss
index 9776f392..16c6d0fb 100644
--- a/vendor/assets/stylesheets/bootstrap/_pager.scss
+++ b/vendor/assets/stylesheets/bootstrap/_pager.scss
@@ -12,7 +12,8 @@
 .pager li {
   display: inline;
 }
-.pager a {
+.pager a,
+.pager span {
   display: inline-block;
   padding: 5px 14px;
   background-color: #fff;
@@ -23,14 +24,16 @@
   text-decoration: none;
   background-color: #f5f5f5;
 }
-.pager .next a {
+.pager .next a,
+.pager .next span {
   float: right;
 }
 .pager .previous a {
   float: left;
 }
 .pager .disabled a,
-.pager .disabled a:hover {
+.pager .disabled a:hover,
+.pager .disabled span {
   color: $grayLight;
   background-color: #fff;
   cursor: default;
diff --git a/vendor/assets/stylesheets/bootstrap/_pagination.scss b/vendor/assets/stylesheets/bootstrap/_pagination.scss
index 681d677a..e26ce2de 100644
--- a/vendor/assets/stylesheets/bootstrap/_pagination.scss
+++ b/vendor/assets/stylesheets/bootstrap/_pagination.scss
@@ -13,13 +13,13 @@
   margin-left: 0;
   margin-bottom: 0;
   @include border-radius(3px);
-  @include box-shadow(0 1px 2px rgba(0,0,0,.05));
+  @include box-shadow(#{0 1px 2px rgba(0,0,0,.05)});
 }
-.pagination li {
-    display: inline;
-  }
-.pagination a,
-.pagination span {
+.pagination ul > li {
+  display: inline;
+}
+.pagination ul > li > a,
+.pagination ul > li > span {
   float: left;
   padding: 0 14px;
   line-height: ($baseLineHeight * 2) - 2;
@@ -28,30 +28,30 @@
   border: 1px solid $paginationBorder;
   border-left-width: 0;
 }
-.pagination a:hover,
-.pagination .active a,
-.pagination .active span {
+.pagination ul > li > a:hover,
+.pagination ul > .active > a,
+.pagination ul > .active > span {
   background-color: #f5f5f5;
 }
-.pagination .active a,
-.pagination .active span {
+.pagination ul > .active > a,
+.pagination ul > .active > span {
   color: $grayLight;
   cursor: default;
 }
-.pagination .disabled span,
-.pagination .disabled a,
-.pagination .disabled a:hover {
+.pagination ul > .disabled > span,
+.pagination ul > .disabled > a,
+.pagination ul > .disabled > a:hover {
   color: $grayLight;
   background-color: transparent;
   cursor: default;
 }
-.pagination li:first-child a,
-.pagination li:first-child span {
+.pagination ul > li:first-child > a,
+.pagination ul > li:first-child > span {
   border-left-width: 1px;
   @include border-radius(3px 0 0 3px);
 }
-.pagination li:last-child a,
-.pagination li:last-child span {
+.pagination ul > li:last-child > a,
+.pagination ul > li:last-child > span {
   @include border-radius(0 3px 3px 0);
 }
 
@@ -61,4 +61,4 @@
 }
 .pagination-right {
   text-align: right;
-}
\ No newline at end of file
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_popovers.scss b/vendor/assets/stylesheets/bootstrap/_popovers.scss
index 3e4d3bd9..9fb4a66c 100644
--- a/vendor/assets/stylesheets/bootstrap/_popovers.scss
+++ b/vendor/assets/stylesheets/bootstrap/_popovers.scss
@@ -18,7 +18,7 @@
   border: 1px solid #ccc;
   border: 1px solid rgba(0,0,0,.2);
   @include border-radius(6px);
-  @include box-shadow(0 5px 10px rgba(0,0,0,.2));
+  @include box-shadow(#{0 5px 10px rgba(0,0,0,.2)});
 
   // Offset the popover to account for the popover arrow
   &.top     { margin-bottom: 10px; }
diff --git a/vendor/assets/stylesheets/bootstrap/_progress-bars.scss b/vendor/assets/stylesheets/bootstrap/_progress-bars.scss
index 118b72df..77c742eb 100644
--- a/vendor/assets/stylesheets/bootstrap/_progress-bars.scss
+++ b/vendor/assets/stylesheets/bootstrap/_progress-bars.scss
@@ -47,7 +47,7 @@
   height: $baseLineHeight;
   margin-bottom: $baseLineHeight;
   @include gradient-vertical(#f5f5f5, #f9f9f9);
-  @include box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
+  @include box-shadow(#{inset 0 1px 2px rgba(0,0,0,.1)});
   @include border-radius(4px);
 }
 
@@ -61,7 +61,7 @@
   text-align: center;
   text-shadow: 0 -1px 0 rgba(0,0,0,.25);
   @include gradient-vertical(#149bdf, #0480be);
-  @include box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
+  @include box-shadow(#{inset 0 -1px 0 rgba(0,0,0,.15)});
   @include box-sizing(border-box);
   @include transition(width .6s ease);
 }
diff --git a/vendor/assets/stylesheets/bootstrap/_reset.scss b/vendor/assets/stylesheets/bootstrap/_reset.scss
index e5ccc68e..dc90fcf4 100644
--- a/vendor/assets/stylesheets/bootstrap/_reset.scss
+++ b/vendor/assets/stylesheets/bootstrap/_reset.scss
@@ -1,5 +1,5 @@
 //
-// Reset
+// Modals
 // Adapted from http://github.com/necolas/normalize.css
 // --------------------------------------------------
 
@@ -77,8 +77,10 @@ sub {
 // -------------------------
 
 img {
-  max-width: 100%; // Make images inherently responsive
-  height: auto; // Make images inherently responsive
+  /* Responsive images (ensure images don't scale beyond their parents) */
+  max-width: 100%; /* Part 1: Set a maxium relative to the parent */
+  width: auto\9; /* IE7-8 need help adjusting responsive images */
+  height: auto; /* Part 2: Scale the height according to the width, otherwise you get stretching */
   vertical-align: middle;
   border: 0;
   -ms-interpolation-mode: bicubic;
diff --git a/vendor/assets/stylesheets/bootstrap/_responsive-767px-max.scss b/vendor/assets/stylesheets/bootstrap/_responsive-767px-max.scss
index 54649fe6..d15b6c56 100644
--- a/vendor/assets/stylesheets/bootstrap/_responsive-767px-max.scss
+++ b/vendor/assets/stylesheets/bootstrap/_responsive-767px-max.scss
@@ -12,7 +12,8 @@
   }
   // Negative indent the now static "fixed" navbar
   .navbar-fixed-top,
-  .navbar-fixed-bottom {
+  .navbar-fixed-bottom,
+  .navbar-static-top {
     margin-left: -20px;
     margin-right: -20px;
   }
@@ -60,8 +61,9 @@
   .row-fluid [class*="span"] {
     float: none;
     display: block;
-    width: auto;
+    width: 100%;
     margin-left: 0;
+    @include box-sizing(border-box);
   }
   .span12,
   .row-fluid .span12 {
@@ -89,6 +91,9 @@
     display: inline-block; // redeclare so they don't wrap to new lines
     width: auto;
   }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 0;
+  }
 
   // Modals
   .modal {
@@ -128,24 +133,26 @@
   }
 
   // Remove the horizontal form styles
-  .form-horizontal .control-group > label {
-    float: none;
-    width: auto;
-    padding-top: 0;
-    text-align: left;
-  }
-  // Move over all input controls and content
-  .form-horizontal .controls {
-    margin-left: 0;
-  }
-  // Move the options list down to align with labels
-  .form-horizontal .control-list {
-    padding-top: 0; // has to be padding because margin collaspes
-  }
-  // Move over buttons in .form-actions to align with .controls
-  .form-horizontal .form-actions {
-    padding-left: 10px;
-    padding-right: 10px;
+  .form-horizontal {
+    .control-label {
+      float: none;
+      width: auto;
+      padding-top: 0;
+      text-align: left;
+    }
+    // Move over all input controls and content
+    .controls {
+      margin-left: 0;
+    }
+    // Move the options list down to align with labels
+    .control-list {
+      padding-top: 0; // has to be padding because margin collaspes
+    }
+    // Move over buttons in .form-actions to align with .controls
+    .form-actions {
+      padding-left: 10px;
+      padding-right: 10px;
+    }
   }
 
   // Modals
@@ -164,4 +171,4 @@
     position: static;
   }
 
-}
\ No newline at end of file
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_responsive-navbar.scss b/vendor/assets/stylesheets/bootstrap/_responsive-navbar.scss
index 3f647fb7..0482d176 100644
--- a/vendor/assets/stylesheets/bootstrap/_responsive-navbar.scss
+++ b/vendor/assets/stylesheets/bootstrap/_responsive-navbar.scss
@@ -5,7 +5,7 @@
 
 // TABLETS AND BELOW
 // -----------------
-@media (max-width: 979px) {
+@media (max-width: $navbarCollapseWidth) {
 
   // UNFIX THE TOPBAR
   // ----------------
@@ -115,6 +115,12 @@
   .nav-collapse .dropdown-menu .divider {
     display: none;
   }
+  .nav-collapse .nav > li > .dropdown-menu {
+    &:before,
+    &:after {
+      display: none;
+    }
+  }
   // Forms in navbar
   .nav-collapse .navbar-form,
   .nav-collapse .navbar-search {
@@ -125,6 +131,11 @@
     border-bottom: 1px solid $navbarBackground;
     @include box-shadow(#{inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1)});
   }
+  .navbar-inverse .nav-collapse .navbar-form,
+  .navbar-inverse .nav-collapse .navbar-search {
+    border-top-color: $navbarInverseBackground;
+    border-bottom-color: $navbarInverseBackground;
+  }
   // Pull right (secondary) nav content
   .navbar .nav-collapse .nav.pull-right {
     float: none;
@@ -147,6 +158,8 @@
     padding-left:  10px;
     padding-right: 10px;
   }
+
+
 }
 
 
diff --git a/vendor/assets/stylesheets/bootstrap/_scaffolding.scss b/vendor/assets/stylesheets/bootstrap/_scaffolding.scss
index 7223df5a..ee073908 100644
--- a/vendor/assets/stylesheets/bootstrap/_scaffolding.scss
+++ b/vendor/assets/stylesheets/bootstrap/_scaffolding.scss
@@ -32,20 +32,21 @@ a:hover {
 // Images
 // -------------------------
 
+// Rounded corners
 .img-rounded {
   @include border-radius(6px);
 }
 
+// Add polaroid-esque trim
 .img-polaroid {
   padding: 4px;
   background-color: #fff;
   border: 1px solid #ccc;
   border: 1px solid rgba(0,0,0,.2);
-  -webkit-box-shadow: 0 1px 3px rgba(0,0,0,.1);
-     -moz-box-shadow: 0 1px 3px rgba(0,0,0,.1);
-          box-shadow: 0 1px 3px rgba(0,0,0,.1);
+  @include box-shadow(#{0 1px 3px rgba(0,0,0,.1)});
 }
 
+// Perfect circle
 .img-circle {
-  @include border-radius(500px);
-}
\ No newline at end of file
+  @include border-radius(500px); // crank the border-radius so it works with most reasonably sized images
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_sprites.scss b/vendor/assets/stylesheets/bootstrap/_sprites.scss
index 97a33162..e231419f 100644
--- a/vendor/assets/stylesheets/bootstrap/_sprites.scss
+++ b/vendor/assets/stylesheets/bootstrap/_sprites.scss
@@ -30,8 +30,14 @@
 
 /* White icons with optional class, or on hover/active states of certain elements */
 .icon-white,
-.nav > .active > a > [class^="icon-"],
-.nav > .active > a > [class*=" icon-"],
+.nav-tabs > .active > a > [class^="icon-"],
+.nav-tabs > .active > a > [class*=" icon-"],
+.nav-pills > .active > a > [class^="icon-"],
+.nav-pills > .active > a > [class*=" icon-"],
+.nav-list > .active > a > [class^="icon-"],
+.nav-list > .active > a > [class*=" icon-"],
+.navbar-inverse .nav > .active > a > [class^="icon-"],
+.navbar-inverse .nav > .active > a > [class*=" icon-"],
 .dropdown-menu > li > a:hover > [class^="icon-"],
 .dropdown-menu > li > a:hover > [class*=" icon-"],
 .dropdown-menu > .active > a > [class^="icon-"],
@@ -184,4 +190,4 @@
 .icon-tasks                   { background-position: -384px -144px; }
 .icon-filter                  { background-position: -408px -144px; }
 .icon-briefcase               { background-position: -432px -144px; }
-.icon-fullscreen              { background-position: -456px -144px; }
\ No newline at end of file
+.icon-fullscreen              { background-position: -456px -144px; }
diff --git a/vendor/assets/stylesheets/bootstrap/_tables.scss b/vendor/assets/stylesheets/bootstrap/_tables.scss
index 2bf88129..c23a90b6 100644
--- a/vendor/assets/stylesheets/bootstrap/_tables.scss
+++ b/vendor/assets/stylesheets/bootstrap/_tables.scss
@@ -133,7 +133,7 @@ table {
   colgroup + tbody tr:first-child td:last-child {
     -webkit-border-top-right-radius: 4px;
             border-top-right-radius: 4px;
-          -moz-border-right-topleft: 4px;
+         -moz-border-radius-topleft: 4px;
   }
 
 }
@@ -187,18 +187,38 @@ table {
 }
 
 
+
 // TABLE BACKGROUNDS
 // -----------------
 // Exact selectors below required to override .table-striped
 
-.table {
-  tbody tr.success td {
+.table tbody tr {
+  &.success td {
     background-color: $successBackground;
   }
-  tbody tr.error td {
+  &.error td {
     background-color: $errorBackground;
   }
-  tbody tr.info td {
+  &.warning td {
+    background-color: $warningBackground;
+  }
+  &.info td {
     background-color: $infoBackground;
   }
 }
+
+// Hover states for .table-hover
+.table-hover tbody tr {
+  &.success:hover td {
+    background-color: darken($successBackground, 5%);
+  }
+  &.error:hover td {
+    background-color: darken($errorBackground, 5%);
+  }
+  &.warning:hover td {
+    background-color: darken($warningBackground, 5%);
+  }
+  &.info:hover td {
+    background-color: darken($infoBackground, 5%);
+  }
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_thumbnails.scss b/vendor/assets/stylesheets/bootstrap/_thumbnails.scss
index 22af505c..8ff9065e 100644
--- a/vendor/assets/stylesheets/bootstrap/_thumbnails.scss
+++ b/vendor/assets/stylesheets/bootstrap/_thumbnails.scss
@@ -30,13 +30,13 @@
   line-height: $baseLineHeight;
   border: 1px solid #ddd;
   @include border-radius(4px);
-  @include box-shadow(0 1px 3px rgba(0,0,0,.055));
+  @include box-shadow(#{0 1px 3px rgba(0,0,0,.055)});
   @include transition(all .2s ease-in-out);
 }
 // Add a hover state for linked versions only
 a.thumbnail:hover {
   border-color: $linkColor;
-  @include box-shadow(0 1px 4px rgba(0,105,214,.25));
+  @include box-shadow(#{0 1px 4px rgba(0,105,214,.25)});
 }
 
 // Images and captions
diff --git a/vendor/assets/stylesheets/bootstrap/_type.scss b/vendor/assets/stylesheets/bootstrap/_type.scss
index 1eaf3ac9..6c944c7c 100644
--- a/vendor/assets/stylesheets/bootstrap/_type.scss
+++ b/vendor/assets/stylesheets/bootstrap/_type.scss
@@ -11,7 +11,7 @@ p {
 }
 .lead {
   margin-bottom: $baseLineHeight;
-  font-size: 20px;
+  font-size: $baseFontSize * 1.5;
   font-weight: 200;
   line-height: $baseLineHeight * 1.5;
 }
@@ -32,9 +32,23 @@ em {
 cite {
   font-style: normal;
 }
+
+// Utility classes
 .muted {
   color: $grayLight;
 }
+.text-warning {
+  color: $warningText;
+}
+.text-error {
+  color: $errorText;
+}
+.text-info {
+  color: $infoText;
+}
+.text-success {
+  color: $successText;
+}
 
 
 // Headings
@@ -116,15 +130,16 @@ dd {
 }
 // Horizontal layout (like forms)
 .dl-horizontal {
+  @include clearfix(); // Ensure dl clears floats if empty dd elements present
   dt {
     float: left;
-    width: 120px;
+    width: $horizontalComponentOffset - 20;
     clear: left;
     text-align: right;
     @include text-overflow();
   }
   dd {
-    margin-left: 130px;
+    margin-left: $horizontalComponentOffset;
   }
 }
 
diff --git a/vendor/assets/stylesheets/bootstrap/_variables.scss b/vendor/assets/stylesheets/bootstrap/_variables.scss
index 5af75e39..c3ee3dc4 100644
--- a/vendor/assets/stylesheets/bootstrap/_variables.scss
+++ b/vendor/assets/stylesheets/bootstrap/_variables.scss
@@ -9,110 +9,107 @@
 
 // Grays
 // -------------------------
-$black:                 #000 !default;
-$grayDarker:            #222 !default;
-$grayDark:              #333 !default;
-$gray:                  #555 !default;
-$grayLight:             #999 !default;
-$grayLighter:           #eee !default;
-$white:                 #fff !default;
+$black:                 #000;
+$grayDarker:            #222;
+$grayDark:              #333;
+$gray:                  #555;
+$grayLight:             #999;
+$grayLighter:           #eee;
+$white:                 #fff;
 
 
 // Accent colors
 // -------------------------
-$blue:                  #049cdb !default;
-$blueDark:              #0064cd !default;
-$green:                 #46a546 !default;
-$red:                   #9d261d !default;
-$yellow:                #ffc40d !default;
-$orange:                #f89406 !default;
-$pink:                  #c3325f !default;
-$purple:                #7a43b6 !default;
+$blue:                  #049cdb;
+$blueDark:              #0064cd;
+$green:                 #46a546;
+$red:                   #9d261d;
+$yellow:                #ffc40d;
+$orange:                #f89406;
+$pink:                  #c3325f;
+$purple:                #7a43b6;
 
 
 // Scaffolding
 // -------------------------
-$bodyBackground:        $white !default;
-$textColor:             $grayDark !default;
+$bodyBackground:        $white;
+$textColor:             $grayDark;
 
 
 // Links
 // -------------------------
-$linkColor:             #08c !default;
+$linkColor:             #08c;
 $linkColorHover:        darken($linkColor, 15%) !default;
 
 
 // Typography
 // -------------------------
-$sansFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif !default;
-$serifFontFamily:       Georgia, "Times New Roman", Times, serif !default;
-$monoFontFamily:        Monaco, Menlo, Consolas, "Courier New", monospace !default;
+$sansFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif;
+$serifFontFamily:       Georgia, "Times New Roman", Times, serif;
+$monoFontFamily:        Monaco, Menlo, Consolas, "Courier New", monospace;
 
-$baseFontSize:          14px !default;
-$baseFontFamily:        $sansFontFamily !default;
-$baseLineHeight:        20px !default;
-$altFontFamily:         $serifFontFamily !default;
-
-$headingsFontFamily:    inherit !default; // empty to use BS default, $baseFontFamily
-$headingsFontWeight:    bold !default;    // instead of browser default, bold
-$headingsColor:         inherit !default; // empty to use BS default, $textColor
+$baseFontSize:          14px;
+$baseFontFamily:        $sansFontFamily;
+$baseLineHeight:        20px;
+$altFontFamily:         $serifFontFamily;
 
+$headingsFontFamily:    inherit; // empty to use BS default, $baseFontFamily
+$headingsFontWeight:    bold;    // instead of browser default, bold
+$headingsColor:         inherit; // empty to use BS default, $textColor
 
 // Tables
 // -------------------------
-$tableBackground:                   transparent !default; // overall background-color
-$tableBackgroundAccent:             #f9f9f9 !default; // for striping
-$tableBackgroundHover:              #f5f5f5 !default; // for hover
-$tableBorder:                       #ddd !default; // table and cell border
-
+$tableBackground:                   transparent; // overall background-color
+$tableBackgroundAccent:             #f9f9f9; // for striping
+$tableBackgroundHover:              #f5f5f5; // for hover
+$tableBorder:                       #ddd; // table and cell border
 
 // Buttons
 // -------------------------
-$btnBackground:                     $white !default;
-$btnBackgroundHighlight:            darken($white, 10%) !default;
-$btnBorder:                         #bbb !default;
+$btnBackground:                     $white;
+$btnBackgroundHighlight:            darken($white, 10%);
+$btnBorder:                         #bbb;
 
-$btnPrimaryBackground:              $linkColor !default;
+$btnPrimaryBackground:              $linkColor;
 $btnPrimaryBackgroundHighlight:     adjust-hue($btnPrimaryBackground, 20%) !default;
 
-$btnInfoBackground:                 #5bc0de !default;
-$btnInfoBackgroundHighlight:        #2f96b4 !default;
+$btnInfoBackground:                 #5bc0de;
+$btnInfoBackgroundHighlight:        #2f96b4;
 
-$btnSuccessBackground:              #62c462 !default;
-$btnSuccessBackgroundHighlight:     #51a351 !default;
+$btnSuccessBackground:              #62c462;
+$btnSuccessBackgroundHighlight:     #51a351;
 
-$btnWarningBackground:              lighten($orange, 15%) !default;
-$btnWarningBackgroundHighlight:     $orange !default;
+$btnWarningBackground:              lighten($orange, 15%);
+$btnWarningBackgroundHighlight:     $orange;
 
-$btnDangerBackground:               #ee5f5b !default;
-$btnDangerBackgroundHighlight:      #bd362f !default;
+$btnDangerBackground:               #ee5f5b;
+$btnDangerBackgroundHighlight:      #bd362f;
 
-$btnInverseBackground:              #444 !default;
-$btnInverseBackgroundHighlight:     $grayDarker !default;
+$btnInverseBackground:              #444;
+$btnInverseBackgroundHighlight:     $grayDarker;
 
 
 // Forms
 // -------------------------
-$inputBackground:               $white !default;
-$inputBorder:                   #ccc !default;
-$inputBorderRadius:             3px !default;
-$inputDisabledBackground:       $grayLighter !default;
-$formActionsBackground:         #f5f5f5 !default;
+$inputBackground:               $white;
+$inputBorder:                   #ccc;
+$inputBorderRadius:             3px;
+$inputDisabledBackground:       $grayLighter;
+$formActionsBackground:         #f5f5f5;
 
 // Dropdowns
 // -------------------------
-$dropdownBackground:            $white !default;
-$dropdownBorder:                rgba(0,0,0,.2) !default;
-$dropdownDividerTop:            #e5e5e5 !default;
-$dropdownDividerBottom:         $white !default;
-
-$dropdownLinkColor:             $grayDark !default;
+$dropdownBackground:            $white;
+$dropdownBorder:                rgba(0,0,0,.2);
+$dropdownDividerTop:            #e5e5e5;
+$dropdownDividerBottom:         $white;
 
-$dropdownLinkColorActive:       $dropdownLinkColor !default;
-$dropdownLinkBackgroundActive:  $linkColor !default;
+$dropdownLinkColor:             $grayDark;
+$dropdownLinkColorHover:        $white;
+$dropdownLinkColorActive:       $dropdownLinkColor;
 
-$dropdownLinkColorHover:        $white !default;
-$dropdownLinkBackgroundHover:   $dropdownLinkBackgroundActive !default;
+$dropdownLinkBackgroundActive:  $linkColor;
+$dropdownLinkBackgroundHover:   $dropdownLinkBackgroundActive;
 
 
 
@@ -123,12 +120,12 @@ $dropdownLinkBackgroundHover:   $dropdownLinkBackgroundActive !default;
 // -------------------------
 // Used for a bird's eye view of components dependent on the z-axis
 // Try to avoid customizing these :)
-$zindexDropdown:          1000 !default;
-$zindexPopover:           1010 !default;
-$zindexTooltip:           1030 !default;
-$zindexFixedNavbar:       1030 !default;
-$zindexModalBackdrop:     1040 !default;
-$zindexModal:             1050 !default;
+$zindexDropdown:          1000;
+$zindexPopover:           1010;
+$zindexTooltip:           1030;
+$zindexFixedNavbar:       1030;
+$zindexModalBackdrop:     1040;
+$zindexModal:             1050;
 
 
 // Sprite icons path
@@ -139,105 +136,110 @@ $iconWhiteSpritePath:     asset-url("glyphicons-halflings-white.png", image) !de
 
 // Input placeholder text color
 // -------------------------
-$placeholderText:         $grayLight !default;
+$placeholderText:         $grayLight;
 
 
 // Hr border color
 // -------------------------
-$hrBorder:                $grayLighter !default;
+$hrBorder:                $grayLighter;
+
+
+// Horizontal forms & lists
+// -------------------------
+$horizontalComponentOffset:       180px;
 
 
 // Wells
 // -------------------------
-$wellBackground:                  #f5f5f5 !default;
+$wellBackground:                  #f5f5f5;
 
 
 // Navbar
 // -------------------------
-$navbarCollapseWidth:             979px !default;
+$navbarCollapseWidth:             979px;
 
-$navbarHeight:                    40px !default;
-$navbarBackgroundHighlight:       #ffffff !default;
-$navbarBackground:                darken($navbarBackgroundHighlight, 5%) !default;
-$navbarBorder:                    darken($navbarBackground, 12%) !default;
+$navbarHeight:                    40px;
+$navbarBackgroundHighlight:       #ffffff;
+$navbarBackground:                darken($navbarBackgroundHighlight, 5%);
+$navbarBorder:                    darken($navbarBackground, 12%);
 
 $navbarText:                      $gray !default;
 $navbarLinkColor:                 $gray !default;
-$navbarLinkColorHover:            $grayDark !default;
-$navbarLinkColorActive:           $gray !default;
-$navbarLinkBackgroundHover:       transparent !default;
-$navbarLinkBackgroundActive:      darken($navbarBackground, 5%) !default;
+$navbarLinkColorHover:            $grayDark;
+$navbarLinkColorActive:           $gray;
+$navbarLinkBackgroundHover:       transparent;
+$navbarLinkBackgroundActive:      darken($navbarBackground, 5%);
 
-$navbarBrandColor:                $navbarLinkColor !default;
+$navbarBrandColor:                $navbarLinkColor;
 
 // Inverted navbar
-$navbarInverseBackground:                #111111 !default;
-$navbarInverseBackgroundHighlight:       #222222 !default;
-$navbarInverseBorder:                    #252525 !default;
+$navbarInverseBackground:                #111111;
+$navbarInverseBackgroundHighlight:       #222222;
+$navbarInverseBorder:                    #252525;
 
-$navbarInverseText:                      $grayLight !default;
-$navbarInverseLinkColor:                 $grayLight !default;
-$navbarInverseLinkColorHover:            $white !default;
-$navbarInverseLinkColorActive:           $navbarInverseLinkColorHover !default;
-$navbarInverseLinkBackgroundHover:       transparent !default;
-$navbarInverseLinkBackgroundActive:      $navbarInverseBackground !default;
+$navbarInverseText:                      $grayLight;
+$navbarInverseLinkColor:                 $grayLight;
+$navbarInverseLinkColorHover:            $white;
+$navbarInverseLinkColorActive:           $navbarInverseLinkColorHover;
+$navbarInverseLinkBackgroundHover:       transparent;
+$navbarInverseLinkBackgroundActive:      $navbarInverseBackground;
 
-$navbarInverseSearchBackground:          lighten($navbarInverseBackground, 25%) !default;
-$navbarInverseSearchBackgroundFocus:     $white !default;
-$navbarInverseSearchBorder:              $navbarInverseBackground !default;
-$navbarInverseSearchPlaceholderColor:    #ccc !default;
+$navbarInverseSearchBackground:          lighten($navbarInverseBackground, 25%);
+$navbarInverseSearchBackgroundFocus:     $white;
+$navbarInverseSearchBorder:              $navbarInverseBackground;
+$navbarInverseSearchPlaceholderColor:    #ccc;
 
-$navbarInverseBrandColor:                $navbarInverseLinkColor !default;
+$navbarInverseBrandColor:                $navbarInverseLinkColor;
 
 
 // Pagination
 // -------------------------
-$paginationBackground:                #fff !default;
-$paginationBorder:                    #ddd !default;
-$paginationActiveBackground:          #f5f5f5 !default;
+$paginationBackground:                #fff;
+$paginationBorder:                    #ddd;
+$paginationActiveBackground:          #f5f5f5;
 
 
 // Hero unit
 // -------------------------
-$heroUnitBackground:              $grayLighter !default;
-$heroUnitHeadingColor:            inherit !default;
-$heroUnitLeadColor:               inherit !default;
+$heroUnitBackground:              $grayLighter;
+$heroUnitHeadingColor:            inherit;
+$heroUnitLeadColor:               inherit;
 
 
 // Form states and alerts
 // -------------------------
-$warningText:             #c09853 !default;
-$warningBackground:       #fcf8e3 !default;
+$warningText:             #c09853;
+$warningBackground:       #fcf8e3;
 $warningBorder:           darken(adjust-hue($warningBackground, -10), 3%) !default;
 
-$errorText:               #b94a48 !default;
-$errorBackground:         #f2dede !default;
+$errorText:               #b94a48;
+$errorBackground:         #f2dede;
 $errorBorder:             darken(adjust-hue($errorBackground, -10), 3%) !default;
 
-$successText:             #468847 !default;
-$successBackground:       #dff0d8 !default;
+$successText:             #468847;
+$successBackground:       #dff0d8;
 $successBorder:           darken(adjust-hue($successBackground, -10), 5%) !default;
 
-$infoText:                #3a87ad !default;
-$infoBackground:          #d9edf7 !default;
+$infoText:                #3a87ad;
+$infoBackground:          #d9edf7;
 $infoBorder:              darken(adjust-hue($infoBackground, -10), 7%) !default;
 
 
 // Tooltips and popovers
 // -------------------------
-$tooltipColor:            #fff !default;
-$tooltipBackground:       #000 !default;
-$tooltipArrowWidth:       5px !default;
-$tooltipArrowColor:       $tooltipBackground !default;
+$tooltipColor:            #fff;
+$tooltipBackground:       #000;
+$tooltipArrowWidth:       5px;
+$tooltipArrowColor:       $tooltipBackground;
 
-$popoverBackground:       #fff !default;
-$popoverArrowWidth:       10px !default;
-$popoverArrowColor:       #fff !default;
-$popoverTitleBackground:  darken($popoverBackground, 3%) !default;
+$popoverBackground:       #fff;
+$popoverArrowWidth:       10px;
+$popoverArrowColor:       #fff;
+$popoverTitleBackground:  darken($popoverBackground, 3%);
 
 // Special enhancement for popovers
-$popoverArrowOuterWidth:  $popoverArrowWidth + 1 !default;
-$popoverArrowOuterColor:  rgba(0,0,0,.25) !default;
+$popoverArrowOuterWidth:  $popoverArrowWidth + 1;
+$popoverArrowOuterColor:  rgba(0,0,0,.25);
 
 
 
@@ -247,31 +249,31 @@ $popoverArrowOuterColor:  rgba(0,0,0,.25) !default;
 
 // Default 940px grid
 // -------------------------
-$gridColumns:             12 !default;
-$gridColumnWidth:         60px !default;
-$gridGutterWidth:         20px !default;
-$gridRowWidth:            ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1)) !default;
+$gridColumns:             12;
+$gridColumnWidth:         60px;
+$gridGutterWidth:         20px;
+$gridRowWidth:            ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1));
 
 // 1200px min
-$gridColumnWidth1200:     70px !default;
-$gridGutterWidth1200:     30px !default;
-$gridRowWidth1200:        ($gridColumns * $gridColumnWidth1200) + ($gridGutterWidth1200 * ($gridColumns - 1)) !default;
+$gridColumnWidth1200:     70px;
+$gridGutterWidth1200:     30px;
+$gridRowWidth1200:        ($gridColumns * $gridColumnWidth1200) + ($gridGutterWidth1200 * ($gridColumns - 1));
 
 // 768px-979px
-$gridColumnWidth768:      42px !default;
-$gridGutterWidth768:      20px !default;
-$gridRowWidth768:         ($gridColumns * $gridColumnWidth768) + ($gridGutterWidth768 * ($gridColumns - 1)) !default;
+$gridColumnWidth768:      42px;
+$gridGutterWidth768:      20px;
+$gridRowWidth768:         ($gridColumns * $gridColumnWidth768) + ($gridGutterWidth768 * ($gridColumns - 1));
 
 
 // Fluid grid
 // -------------------------
-$fluidGridColumnWidth:    percentage($gridColumnWidth/$gridRowWidth) !default;
-$fluidGridGutterWidth:    percentage($gridGutterWidth/$gridRowWidth) !default;
+$fluidGridColumnWidth:    percentage($gridColumnWidth/$gridRowWidth);
+$fluidGridGutterWidth:    percentage($gridGutterWidth/$gridRowWidth);
 
 // 1200px min
-$fluidGridColumnWidth1200:     percentage($gridColumnWidth1200/$gridRowWidth1200) !default;
-$fluidGridGutterWidth1200:     percentage($gridGutterWidth1200/$gridRowWidth1200) !default;
+$fluidGridColumnWidth1200:     percentage($gridColumnWidth1200/$gridRowWidth1200);
+$fluidGridGutterWidth1200:     percentage($gridGutterWidth1200/$gridRowWidth1200);
 
 // 768px-979px
-$fluidGridColumnWidth768:      percentage($gridColumnWidth768/$gridRowWidth768) !default;
-$fluidGridGutterWidth768:      percentage($gridGutterWidth768/$gridRowWidth768) !default;
\ No newline at end of file
+$fluidGridColumnWidth768:      percentage($gridColumnWidth768/$gridRowWidth768);
+$fluidGridGutterWidth768:      percentage($gridGutterWidth768/$gridRowWidth768);
diff --git a/vendor/assets/stylesheets/bootstrap/_wells.scss b/vendor/assets/stylesheets/bootstrap/_wells.scss
index 14b81622..7134bf6f 100644
--- a/vendor/assets/stylesheets/bootstrap/_wells.scss
+++ b/vendor/assets/stylesheets/bootstrap/_wells.scss
@@ -11,7 +11,7 @@
   background-color: $wellBackground;
   border: 1px solid darken($wellBackground, 7%);
   @include border-radius(4px);
-  @include box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
+  @include box-shadow(#{inset 0 1px 1px rgba(0,0,0,.05)});
   blockquote {
     border-color: #ddd;
     border-color: rgba(0,0,0,.15);