From bff06c002acced45bf75c47a22f4de50e60ebc73 Mon Sep 17 00:00:00 2001
From: Daniel Chapman <dan@theclymb.com>
Date: Wed, 15 May 2013 09:38:13 -0700
Subject: [PATCH] update to latest working copy of 3-wip

---
 .../stylesheets/bootstrap/_accordion.scss     |   2 +-
 .../assets/stylesheets/bootstrap/_alerts.scss |  45 ++-
 .../assets/stylesheets/bootstrap/_badges.scss |   4 +-
 .../stylesheets/bootstrap/_breadcrumbs.scss   |   4 +-
 .../stylesheets/bootstrap/_button-groups.scss |  77 ++--
 .../stylesheets/bootstrap/_buttons.scss       | 146 ++++----
 .../stylesheets/bootstrap/_carousel.scss      |  24 +-
 .../assets/stylesheets/bootstrap/_close.scss  |   4 +-
 .../assets/stylesheets/bootstrap/_code.scss   |  10 +-
 .../stylesheets/bootstrap/_dropdowns.scss     |  18 +-
 .../assets/stylesheets/bootstrap/_forms.scss  | 206 ++++-------
 .../stylesheets/bootstrap/_glyphicons.scss    |   4 +-
 .../assets/stylesheets/bootstrap/_grid.scss   |  36 +-
 .../stylesheets/bootstrap/_jumbotron.scss     |  10 +-
 .../assets/stylesheets/bootstrap/_labels.scss |  64 +++-
 .../stylesheets/bootstrap/_list-group.scss    |  96 +++++
 .../assets/stylesheets/bootstrap/_mixins.scss | 101 ++++--
 .../assets/stylesheets/bootstrap/_modals.scss |   7 +-
 .../assets/stylesheets/bootstrap/_navbar.scss | 321 ++++++++---------
 .../assets/stylesheets/bootstrap/_navs.scss   | 341 ++++++++----------
 .../assets/stylesheets/bootstrap/_pager.scss  |  77 ++--
 .../stylesheets/bootstrap/_pagination.scss    |  12 +-
 .../assets/stylesheets/bootstrap/_panels.scss |  86 +++++
 .../stylesheets/bootstrap/_popovers.scss      |  14 +-
 .../assets/stylesheets/bootstrap/_print.scss  |   4 +-
 .../stylesheets/bootstrap/_progress-bars.scss |   8 +-
 .../bootstrap/_responsive-utilities.scss      |  62 ++--
 .../stylesheets/bootstrap/_scaffolding.scss   |  23 +-
 .../assets/stylesheets/bootstrap/_tables.scss | 146 ++++----
 .../stylesheets/bootstrap/_thumbnails.scss    |   7 +-
 .../stylesheets/bootstrap/_tooltip.scss       |   4 +-
 .../assets/stylesheets/bootstrap/_type.scss   | 103 +++---
 .../stylesheets/bootstrap/_utilities.scss     |   2 +-
 .../stylesheets/bootstrap/_variables.scss     | 299 +++++++++------
 .../assets/stylesheets/bootstrap/_wells.scss  |   4 +-
 .../stylesheets/bootstrap/bootstrap.scss      |   2 +
 36 files changed, 1310 insertions(+), 1063 deletions(-)
 create mode 100644 vendor/assets/stylesheets/bootstrap/_list-group.scss
 create mode 100644 vendor/assets/stylesheets/bootstrap/_panels.scss

diff --git a/vendor/assets/stylesheets/bootstrap/_accordion.scss b/vendor/assets/stylesheets/bootstrap/_accordion.scss
index 0cba7fb5..92a9b102 100644
--- a/vendor/assets/stylesheets/bootstrap/_accordion.scss
+++ b/vendor/assets/stylesheets/bootstrap/_accordion.scss
@@ -5,7 +5,7 @@
 
 // Parent container
 .accordion {
-  margin-bottom: $line-height-base;
+  margin-bottom: $line-height-computed;
 }
 
 // Group == heading + body
diff --git a/vendor/assets/stylesheets/bootstrap/_alerts.scss b/vendor/assets/stylesheets/bootstrap/_alerts.scss
index b5b5a1a6..a3e5e52c 100644
--- a/vendor/assets/stylesheets/bootstrap/_alerts.scss
+++ b/vendor/assets/stylesheets/bootstrap/_alerts.scss
@@ -8,11 +8,11 @@
 
 .alert {
   padding: 8px 35px 8px 14px;
-  margin-bottom: $line-height-base;
-  color: $state-warning-text;
-  background-color: $state-warning-background;
-  border: 1px solid $state-warning-border;
-  border-radius: $border-radius-base;
+  margin-bottom: $line-height-computed;
+  color: $alert-text;
+  background-color: $alert-bg;
+  border: 1px solid $alert-border;
+  border-radius: $alert-border-radius;
 
   // Headings for larger alerts
   h4 {
@@ -22,13 +22,13 @@
   }
   // Match the hr to the border of the alert
   hr {
-    border-top-color: darken($state-warning-border, 5%);
+    border-top-color: darken($alert-border, 5%);
   }
   // Inherit color for immediate links and bolden them some
   > a,
   > p > a {
     font-weight: 500;
-    color: darken($state-warning-text, 10%);
+    color: darken($alert-text, 10%);
   }
   
     
@@ -37,7 +37,6 @@
     position: relative;
     top: -2px;
     right: -21px;
-    line-height: $line-height-base;
     color: inherit;
   }
 }
@@ -47,40 +46,40 @@
 // -------------------------
 
 .alert-success {
-  background-color: $state-success-background;
+  background-color: $state-success-bg;
   border-color: $state-success-border;
-  color: $state-success-text;
+  color: $alert-success-text;
   hr {
-    border-top-color: darken($state-success-border, 5%);
+    border-top-color: darken($alert-success-border, 5%);
   }
   > a,
   > p > a {
-    color: darken($state-success-text, 10%);
+    color: darken($alert-success-text, 10%);
   }
 }
 .alert-danger,
 .alert-error {
-  background-color: $state-error-background;
-  border-color: $state-error-border;
-  color: $state-error-text;
+  background-color: $alert-danger-bg;
+  border-color: $alert-danger-border;
+  color: $alert-danger-text;
   hr {
-    border-top-color: darken($state-error-border, 5%);
+    border-top-color: darken($alert-danger-border, 5%);
   }
   > a,
   > p > a {
-    color: darken($state-error-text, 10%);
+    color: darken($alert-danger-text, 10%);
   }
 }
 .alert-info {
-  background-color: $state-info-background;
-  border-color: $state-info-border;
-  color: $state-info-text;
+  background-color: $alert-danger-bg;
+  border-color: $alert-info-border;
+  color: $alert-info-text;
   hr {
     border-top-color: darken($state-info-border, 5%);
   }
   > a,
   > p > a {
-    color: darken($state-info-text, 10%);
+    color: darken($alert-info-text, 10%);
   }
 }
 
@@ -88,8 +87,8 @@
 // -------------------------
 
 .alert-block {
-  padding-top: 14px;
-  padding-bottom: 14px;
+  padding-top: 15px;
+  padding-bottom: 15px;
 }
 .alert-block > p,
 .alert-block > ul {
diff --git a/vendor/assets/stylesheets/bootstrap/_badges.scss b/vendor/assets/stylesheets/bootstrap/_badges.scss
index b327913d..f9ceac2e 100644
--- a/vendor/assets/stylesheets/bootstrap/_badges.scss
+++ b/vendor/assets/stylesheets/bootstrap/_badges.scss
@@ -8,14 +8,14 @@
   display: inline-block;
   min-width: 10px;
   padding: 3px 7px;
-  font-size: 12px;
+  font-size: $font-size-small;
   font-weight: bold;
   color: #fff;
   line-height: 1;
   vertical-align: middle;
   white-space: nowrap;
   text-align: center;
-  background-color: $grayLight;
+  background-color: $gray-light;
   border-radius: 10px;
 
   // Empty labels/badges collapse
diff --git a/vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss b/vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss
index 92f8e9cb..bd55b206 100644
--- a/vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss
+++ b/vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss
@@ -19,10 +19,10 @@
       color: #ccc;
     }
     &:last-child:after {
-      content: ""; // No divider after last element
+      display: none; // No divider after last element
     }
   }
   > .active {
-    color: $grayLight;
+    color: $gray-light;
   }
 }
diff --git a/vendor/assets/stylesheets/bootstrap/_button-groups.scss b/vendor/assets/stylesheets/bootstrap/_button-groups.scss
index 0e6614f0..82bc62a4 100644
--- a/vendor/assets/stylesheets/bootstrap/_button-groups.scss
+++ b/vendor/assets/stylesheets/bootstrap/_button-groups.scss
@@ -4,35 +4,37 @@
 
 // Button carets
 .btn .caret {
-  border-top-color: $btn-color;
+  border-top-color: $btn-default-color;
 }
 .dropup .btn .caret {
-  border-bottom-color: $btn-color;
+  border-bottom-color: $btn-default-color;
 }
 
 // Make the div behave like a button
-.btn-group {
+.btn-group,
+.btn-group-vertical {
   position: relative;
   display: inline-block;
   vertical-align: middle; // match .btn alignment given font-size hack above
   > .btn {
     position: relative;
     float: left;
-    // Prevent double borders when buttons are next to each other
-    + btn {
-      margin-left: -1px;
-    }
     // Bring the "active" button to the front
     &:hover,
     &:active {
       z-index: 2;
-    }
+    }  
   }
 }
 
+// Prevent double borders when buttons are next to each other
+.btn-group .btn + .btn {
+  margin-left: -1px;
+}
+
 // Optional: Group multiple button groups together for a toolbar
 .btn-toolbar {
-  @include clear_float();
+  @include clearfix();
 
   .btn-group {
     float: left;
@@ -46,31 +48,36 @@
   }
 }
 
-// Float them, remove border radius, then re-add to first and last elements
-.btn-group > .btn {
-  position: relative;
+.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
   border-radius: 0;
 }
 
-
 // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
 .btn-group > .btn:first-child {
   margin-left: 0;
-  @include border-left-radius($border-radius-base);
+  &:not(:last-child):not(.dropdown-toggle) {
+    @include border-right-radius(0);
+  }
 }
 // Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
-.btn-group > .btn:last-child,
-.btn-group > .dropdown-toggle {
-  @include border-right-radius($border-radius-base);
+.btn-group > .btn:last-child:not(:first-child),
+.btn-group > .dropdown-toggle:not(:first-child) {
+  @include border-left-radius(0);
 }
-// Reset corners for large buttons
-.btn-group > .btn.large:first-child {
-  margin-left: 0;
-  @include border-left-radius($border-radius-large);
+
+// Custom edits for including btn-groups within btn-groups (useful for including dropdown buttons within a btn-group)
+.btn-group > .btn-group {
+  float: left;
 }
-.btn-group > .btn.large:last-child,
-.btn-group > .large.dropdown-toggle {
-  @include border-right-radius($border-radius-large);
+.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
+  border-radius: 0;
+}
+.btn-group > .btn-group:first-child > .btn:last-child,
+.btn-group > .btn-group:first-child > .dropdown-toggle {
+  @include border-right-radius(0);
+}
+.btn-group > .btn-group:last-child > .btn:first-child {
+  @include border-left-radius(0);
 }
 
 // On active and open, don't show outline
@@ -80,7 +87,6 @@
 }
 
 
-
 // Split button dropdowns
 // ----------------------
 
@@ -128,22 +134,19 @@
   float: none;
   width: 100%;
   max-width: 100%;
+  + .btn {
+    margin-top: -1px;
+  }
+}
+.btn-group-vertical .btn:not(:first-child):not(:last-child) {
+  border-radius: 0;
 }
 .btn-group-vertical .btn:first-child {
-  border-radius: 0; // Needs to be here for specificity since we're not zeroing them out again
-  @include border-top-radius($border-radius-base);
+  @inclue border-bottom-radius(0);
 }
 .btn-group-vertical .btn:last-child {
-  border-radius: 0; // Needs to be here for specificity since we're not zeroing them out again
-  @include border-bottom-radius($border-radius-base);
+  @include border-top-radius(0);
 }
-.btn-group-vertical .btn-large:first-child {
-  @include border-top-radius($border-radius-large);
-}
-.btn-group-vertical .btn-large:last-child {
-  @include border-bottom-radius($border-radius-large);
-}
-
 
 // Justified button groups
 // ----------------------
@@ -163,4 +166,4 @@
 .btn-group[data-toggle="buttons-radio"] > .btn > input[type="radio"],
 .btn-group[data-toggle="buttons-checkbox"] > .btn > input[type="checkbox"] {
   display: none;
-}
\ No newline at end of file
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_buttons.scss b/vendor/assets/stylesheets/bootstrap/_buttons.scss
index b933a800..ca4ab94d 100644
--- a/vendor/assets/stylesheets/bootstrap/_buttons.scss
+++ b/vendor/assets/stylesheets/bootstrap/_buttons.scss
@@ -17,7 +17,7 @@
   text-align: center;
   vertical-align: middle;
   cursor: pointer;
-  border: 1px solid $btn-border;
+  border: 1px solid transparent;
   border-radius: $border-radius-base;
   white-space: nowrap;
 
@@ -50,6 +50,75 @@
 }
 
 
+// Alternate buttons
+// --------------------------------------------------
+
+.btn-default {
+  @include btn-pseudo-states($btn-default-color, $btn-default-bg, $btn-default-border);
+}
+.btn-primary {
+  @include btn-pseudo-states($btn-primary-color, $btn-primary-bg, $btn-primary-border);
+}
+// Warning appears as orange
+.btn-warning {
+  @include btn-pseudo-states($btn-warning-color, $btn-warning-bg, $btn-warning-border);
+}
+// Danger and error appear as red
+.btn-danger {
+  @include btn-pseudo-states($btn-danger-color, $btn-danger-bg, $btn-danger-border);
+}
+// Success appears as green
+.btn-success {
+  @include btn-pseudo-states($btn-success-color, $btn-success-bg, $btn-success-border);
+}
+// Info appears as blue-green
+.btn-info {
+  @include btn-pseudo-states($btn-info-color, $btn-info-bg, $btn-info-border);
+}
+
+
+// Link buttons
+// -------------------------
+
+// Make a button look and behave like a link
+.btn-link,
+.btn-link:active,
+.btn-link[disabled],
+fieldset[disabled] .btn-link {
+  background-color: transparent;
+  background-image: none;
+  @include box-shadow(none);
+}
+.btn-link,
+.btn-link:hover,
+.btn-link:focus,
+.btn-link:active {
+  border-color: transparent;
+}
+.btn-link {
+  color: $link-color;
+  font-weight: normal;
+  cursor: pointer;
+  border-radius: 0;
+}
+.btn-link:hover,
+.btn-link:focus {
+  color: $link-hover-color;
+  text-decoration: underline;
+  background-color: transparent;
+}
+.btn-link {
+  &[disabled],
+  fieldset[disabled] & {
+    &:hover,
+    &:focus {
+      color: $gray-dark;
+      text-decoration: none;
+    }
+  }
+}
+
+
 // Button Sizes
 // -------------------------
 
@@ -75,11 +144,6 @@
 }
 
 
-// Icons in buttons
-// -------------------------
-
-// TODO: figure this shit out
-
 // Block button
 // -------------------------
 
@@ -103,73 +167,3 @@ input[type="button"] {
     width: 100%;
   }
 }
-
-
-// Alternate buttons
-// --------------------------------------------------
-
-.btn {
-  color: $btn-color;
-  @include btn-pseudo-states($btn-background, $btn-border);
-}
-.btn-primary {
-  @include btn-pseudo-states($btn-background-primary, $btn-border-primary);
-}
-// Warning appears as orange
-.btn-warning {
-  @include btn-pseudo-states($btn-background-warning, $btn-border-warning);
-}
-// Danger and error appear as red
-.btn-danger {
-  @include btn-pseudo-states($btn-background-danger, $btn-border-danger);
-}
-// Success appears as green
-.btn-success {
-  @include btn-pseudo-states($btn-background-success, $btn-border-success);
-}
-// Info appears as blue-green
-.btn-info {
-  @include btn-pseudo-states($btn-background-info, $btn-border-info);
-}
-
-
-// Link buttons
-// --------------------------------------------------
-
-// Make a button look and behave like a link
-.btn-link,
-.btn-link:active,
-.btn-link[disabled],
-fieldset[disabled] .btn-link {
-  background-color: transparent;
-  background-image: none;
-  @include box-shadow(none);
-}
-.btn-link,
-.btn-link:hover,
-.btn-link:focus,
-.btn-link:active {
-  border-color: transparent;
-}
-.btn-link {
-  color: $link-color;
-  font-weight: normal;
-  cursor: pointer;
-  border-radius: 0;
-}
-.btn-link:hover,
-.btn-link:focus {
-  color: $link-color-hover;
-  text-decoration: underline;
-  background-color: transparent;
-}
-.btn-link {
-  &[disabled],
-  fieldset[disabled] & {
-    &:hover,
-    &:focus {
-      color: $grayDark;
-      text-decoration: none;
-    }
-  }
-}
\ No newline at end of file
diff --git a/vendor/assets/stylesheets/bootstrap/_carousel.scss b/vendor/assets/stylesheets/bootstrap/_carousel.scss
index 617c15e5..a22a317a 100644
--- a/vendor/assets/stylesheets/bootstrap/_carousel.scss
+++ b/vendor/assets/stylesheets/bootstrap/_carousel.scss
@@ -155,19 +155,22 @@
 // Hidden by default for smaller viewports
 .carousel-caption {
   position: absolute;
-  left: 20%;
-  right: 20%;
+  left: 15%;
+  right: 15%;
   bottom: 20px;
-  display: none;
+  z-index: 10;
   padding-top: 20px;
   padding-bottom: 20px;
   color: #fff;
   text-shadow: 0 1px 2px rgba(0,0,0,.6);
+  & .btn {
+    text-shadow: none; // No shadow for button elements in carousel-caption
+  }
 }
 
 
-// Scale up controls for >768px
-@media screen and (min-width: 768px) {
+// Scale up controls for tablets and up
+@media screen and (min-width: $screen-tablet) {
 
   // Scale up the controls a smidge
   .carousel-control .glyphicon {
@@ -180,13 +183,8 @@
 
   // Show and left align the captions
   .carousel-caption {
-    left: 0;
-    right: 0;
-    z-index: 10;
-    display: block;
-    max-width: 60%;
+    left: 20%;
+    right: 20%;
     padding: 30px;
-    margin-left: 0;
-    margin-right: 0;
   }
-}
\ No newline at end of file
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_close.scss b/vendor/assets/stylesheets/bootstrap/_close.scss
index da8eab48..30bcce36 100644
--- a/vendor/assets/stylesheets/bootstrap/_close.scss
+++ b/vendor/assets/stylesheets/bootstrap/_close.scss
@@ -7,7 +7,7 @@
   float: right;
   font-size: 20px;
   font-weight: bold;
-  line-height: $line-height-base;
+  line-height: 1;
   color: #000;
   text-shadow: 0 1px 0 rgba(255,255,255,1);
   @include opacity(.2);
@@ -29,4 +29,4 @@ button.close {
   background: transparent;
   border: 0;
   -webkit-appearance: none;
-}
\ No newline at end of file
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_code.scss b/vendor/assets/stylesheets/bootstrap/_code.scss
index 0c281491..9a952136 100644
--- a/vendor/assets/stylesheets/bootstrap/_code.scss
+++ b/vendor/assets/stylesheets/bootstrap/_code.scss
@@ -9,7 +9,7 @@ pre {
   padding: 0 3px 2px;
   font-family: $font-family-monospace;
   font-size: ($font-size-base - 2);
-  color: $grayDark;
+  color: $gray-dark;
   border-radius: 4px;
 }
 
@@ -25,8 +25,8 @@ code {
 // Blocks of code
 pre {
   display: block;
-  padding: (($line-height-base - 1) / 2);
-  margin: 0 0 ($line-height-base / 2);
+  padding: (($line-height-computed - 1) / 2);
+  margin: 0 0 ($line-height-computed / 2);
   font-size: ($font-size-base - 1); // 14px to 13px
   line-height: $line-height-base;
   word-break: break-all;
@@ -40,7 +40,7 @@ pre {
 
   // Make prettyprint styles more spaced out for readability
   &.prettyprint {
-    margin-bottom: $line-height-base;
+    margin-bottom: $line-height-computed;
   }
 
   // Account for some code outputs that place code tags in pre tags
@@ -58,4 +58,4 @@ pre {
 .pre-scrollable {
   max-height: 340px;
   overflow-y: scroll;
-}
\ No newline at end of file
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_dropdowns.scss b/vendor/assets/stylesheets/bootstrap/_dropdowns.scss
index f368371b..69613a9a 100644
--- a/vendor/assets/stylesheets/bootstrap/_dropdowns.scss
+++ b/vendor/assets/stylesheets/bootstrap/_dropdowns.scss
@@ -45,7 +45,7 @@
   padding: 5px 0;
   margin: 2px 0 0; // override default ul
   list-style: none;
-  background-color: $dropdown-background;
+  background-color: $dropdown-bg;
   border: 1px solid #ccc; // IE8 fallback
   border: 1px solid $dropdown-border;
   border-radius: $border-radius-base;
@@ -82,8 +82,8 @@
 .dropdown-submenu:hover > a,
 .dropdown-submenu:focus > a {
   text-decoration: none;
-  color: $dropdown-link-color-hover;
-  @include gradient-vertical($dropdown-link-background-hover, darken($dropdown-link-background-hover, 5%));
+  color: $dropdown-link-hover-color;
+  @include gradient-vertical($dropdown-link-hover-bg, darken($dropdown-link-hover-bg, 5%));
 }
 
 // Active state
@@ -91,10 +91,10 @@
 .dropdown-menu > .active > a,
 .dropdown-menu > .active > a:hover,
 .dropdown-menu > .active > a:focus {
-  color: $dropdown-link-color-active;
+  color: $dropdown-link-active-color;
   text-decoration: none;
   outline: 0;
-  @include gradient-vertical($dropdown-link-background-active, darken($dropdown-link-background-active, 5%));
+  @include gradient-vertical($dropdown-link-active-bg, darken($dropdown-link-active-bg, 5%));
 }
 
 // Disabled state
@@ -103,7 +103,7 @@
 .dropdown-menu > .disabled > a,
 .dropdown-menu > .disabled > a:hover,
 .dropdown-menu > .disabled > a:focus {
-  color: $grayLight;
+  color: $gray-light;
 }
 // Nuke hover/focus effects
 .dropdown-menu > .disabled > a:hover,
@@ -186,12 +186,12 @@
   border-color: transparent;
   border-style: solid;
   border-width: 5px 0 5px 5px;
-  border-left-color: darken($dropdown-background, 20%);
+  border-left-color: darken($dropdown-bg, 20%);
   margin-top: 5px;
   margin-right: -10px;
 }
 .dropdown-submenu:hover > a:after {
-  border-left-color: $dropdown-link-color-hover;
+  border-left-color: $dropdown-link-hover-color;
 }
 
 // Left aligned submenus
@@ -220,4 +220,4 @@
 // ---------------------------
 .typeahead {
   z-index: 1051;
-}
\ No newline at end of file
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_forms.scss b/vendor/assets/stylesheets/bootstrap/_forms.scss
index da0b3e14..3f23610a 100644
--- a/vendor/assets/stylesheets/bootstrap/_forms.scss
+++ b/vendor/assets/stylesheets/bootstrap/_forms.scss
@@ -20,10 +20,10 @@ legend {
   display: block;
   width: 100%;
   padding: 0;
-  margin-bottom: $line-height-base;
+  margin-bottom: $line-height-computed;
   font-size: ($font-size-base * 1.5);
-  line-height: ($line-height-base * 2);
-  color: $grayDark;
+  line-height: $line-height-headings;
+  color: $gray-dark;
   border: 0;
   border-bottom: 1px solid #e5e5e5;
 }
@@ -54,15 +54,14 @@ input[type="url"],
 input[type="search"],
 input[type="tel"],
 input[type="color"] {
-  display: inline-block;
+  display: block;
   min-height: $input-height-base; // Make inputs at least the height of their button counterpart (base line-height + padding + border)
   padding: 6px 9px;
-  // margin-bottom: ($line-height-base / 2);
   font-size: $font-size-base;
   line-height: $line-height-base;
   color: $gray;
   vertical-align: middle;
-  background-color: $input-background;
+  background-color: $input-bg;
   border: 1px solid $input-border;
   border-radius: $input-border-radius;
   @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
@@ -88,6 +87,11 @@ input[type="checkbox"] {
   width: auto; // Override of generic input selector
 }
 
+// Override content-box in Normalize (* isn't specific enough)
+input[type="search"] {
+  @include box-sizing(border-box);
+}
+
 // Reset height since textareas have rows
 textarea {
   height: auto;
@@ -166,16 +170,18 @@ textarea {
 .radio,
 .checkbox {
   display: block;
-  min-height: $line-height-base; // clear the floating input if there is no label text
-  margin-bottom: ($line-height-base / 2);
+  min-height: $line-height-computed; // clear the floating input if there is no label text
+  margin-top: 10px;
+  margin-bottom: 10px;
   padding-left: 20px;
+  vertical-align: middle;
   label {
     display: inline;
     margin-bottom: 0;
     font-weight: normal;
+    cursor: pointer;
   }
 }
-
 .radio input[type="radio"],
 .radio-inline input[type="radio"],
 .checkbox input[type="checkbox"],
@@ -185,7 +191,7 @@ textarea {
 }
 .radio + .radio,
 .checkbox + .checkbox {
-  margin-top: (($line-height-base / 4) * -1);
+  margin-top: -5px; // Move up sibling radios or checkboxes for tighter spacing
 }
 
 // Move the options list down to align with labels
@@ -198,11 +204,12 @@ textarea {
 .radio-inline,
 .checkbox-inline {
   display: inline-block;
-  padding-top: 5px;
+  // padding-top: 5px;
   padding-left: 20px;
   margin-bottom: 0;
   vertical-align: middle;
   font-weight: normal;
+  cursor: pointer;
 }
 .radio-inline + .radio-inline,
 .checkbox-inline + .checkbox-inline {
@@ -245,33 +252,6 @@ input[type="color"] {
 }
 
 
-
-// GRID SIZING FOR INPUTS
-// ----------------------
-
-// Grid style input sizes
-input[class*="span"],
-select[class*="span"],
-textarea[class*="span"] {
-  float: none;
-  margin-left: 0;
-  margin-right: 0;
-}
-
-// Ensure input-prepend/append never wraps
-.input-append input[class*="span"],
-.input-prepend input[class*="span"] {
-  display: inline-block;
-}
-
-input[class*="span"],
-select[class*="span"],
-textarea[class*="span"] {
-  height: $input-height-base;
-}
-
-
-
 // DISABLED STATE
 // --------------
 
@@ -286,7 +266,7 @@ textarea {
   &[readonly],
   fieldset[disabled] & {
     cursor: not-allowed;
-    background-color: $input-background-disabled;
+    background-color: $input-bg-disabled;
   }
 }
 // Explicitly reset the colors here
@@ -307,15 +287,15 @@ input[type="checkbox"] {
 
 // Warning
 .has-warning {
-  @include formFieldState($state-warning-text, $state-warning-text, $state-warning-background);
+  @include formFieldState($state-warning-text, $state-warning-text, $state-warning-bg);
 }
 // Error
 .has-error {
-  @include formFieldState($state-error-text, $state-error-text, $state-error-background);
+  @include formFieldState($state-danger-text, $state-danger-text, $state-danger-bg);
 }
 // Success
 .has-success {
-  @include formFieldState($state-success-text, $state-success-text, $state-success-background);
+  @include formFieldState($state-success-text, $state-success-text, $state-success-bg);
 }
 
 // HTML5 invalid states
@@ -338,12 +318,12 @@ select:focus:invalid {
 // ------------
 
 .form-actions {
-  padding: ($line-height-base - 1) 20px $line-height-base;
-  margin-top: $line-height-base;
-  margin-bottom: $line-height-base;
-  background-color: $form-actions-background;
+  padding: $line-height-computed 20px;
+  margin-top: $line-height-computed;
+  margin-bottom: $line-height-computed;
+  background-color: $form-actions-bg;
   border-top: 1px solid #e5e5e5;
-  @include clear_float(); // Adding clearfix to allow for .pull-right button containers
+  @include clearfix(); // Adding clearfix to allow for .pull-right button containers
 }
 
 
@@ -351,20 +331,11 @@ select:focus:invalid {
 // HELP TEXT
 // ---------
 
-.help-block,
-.help-inline {
-  color: lighten($text-color, 25%); // lighten the text some for contrast
-}
-
 .help-block {
   display: block; // account for any element using help-block
-  margin-bottom: ($line-height-base / 2);
-}
-
-.help-inline {
-  display: inline-block;
-  vertical-align: middle;
-  padding-left: 5px;
+  margin-top: 5px;
+  margin-bottom: 10px;
+  color: lighten($text-color, 25%); // lighten the text some for contrast
 }
 
 
@@ -378,29 +349,26 @@ select:focus:invalid {
   display: table;
 
   // Undo padding and float of grid classes
-  &[class*="span"] {
+  &.col {
     float: none;
-    padding: 0;
+    padding-left: 0;
+    padding-right: 0;
   }
 
   input,
   select {
     width: 100%;
+    margin-bottom: 0;
   }
 }
 
 // Display as table-cell
 // -------------------------
-.input-group-addon,
 .input-group-btn,
 .input-group input {
   display: table-cell;
-  margin: 0;
-  border-radius: 0;
-  &.input-small {
-    border-radius: 0;
-  }
-  &.input-large {
+
+  &:not(:first-child):not(:last-child) {
     border-radius: 0;
   }
 }
@@ -421,42 +389,36 @@ select:focus:invalid {
   line-height: $line-height-base;
   text-align: center;
   text-shadow: 0 1px 0 #fff;
-  background-color: $grayLighter;
+  background-color: $gray-lighter;
   border: 1px solid #ccc;
 
 	&.input-small {
 	  padding: $padding-small;
 	  font-size: $font-size-small;
+    border-radius: $border-radius-small;
   }
 	&.input-large {
 		padding: $padding-large;
 		font-size: $font-size-large;
+    border-radius: $border-radius-large;
 	}
 }
 
 // Reset rounded corners
 .input-group input:first-child,
-.input-group-addon:first-child {
-  @include border-left-radius($border-radius-base);
-  &.input-small {
-    @include border-left-radius($border-radius-small);
-  }
-  &.input-large {
-    @include border-left-radius($border-radius-large);
-  }
+.input-group-addon:first-child,
+.input-group-btn:first-child > .btn:first-child,
+.input-group-btn:first-child > .dropdown-toggle:first-child {
+  @include border-right-radius(0);
 }
 .input-group-addon:first-child {
   border-right: 0;
 }
 .input-group input:last-child,
-.input-group-addon:last-child {
-  @include border-right-radius($border-radius-base);
-  &.input-small {
-    @include border-right-radius($border-radius-small);
-  }
-  &.input-large {
-    @include border-right-radius($border-radius-large);
-  }
+.input-group-addon:last-child,
+.input-group-btn:last-child > .btn:last-child,
+.input-group-btn:last-child > .dropdown-toggle {
+  @include border-left-radius(0);
 }
 .input-group-addon:last-child {
   border-left: 0;
@@ -482,62 +444,36 @@ select:focus:invalid {
   }
 }
 
-// Prepended buttons
-.input-group-btn:first-child {
-  // Round the left corners only
-  > .btn:first-child,
-  > .dropdown-toggle:first-child {
-    @include border-left-radius($border-radius-base);
-    &.btn-large { @include border-left-radius($border-radius-large); }
-    &.btn-small { @include border-left-radius($border-radius-small); }
+
+// Inline forms
+// --------------------------------------------------
+
+.form-inline {
+  input,
+  select,
+  textarea,
+  .radio,
+  .checkbox {
+    display: inline-block;
+  }
+  .radio,
+  .checkbox {
+    margin-top: 0;
+    margin-bottom: 0;
   }
 }
 
-// Appended buttons
-.input-group-btn:last-child {
-  // Round the right corners only
-  > .btn:last-child,
-  > .dropdown-toggle {
-    @include border-right-radius($border-radius-base);
-    &.btn-large { @include border-right-radius($border-radius-large); }
-    &.btn-small { @include border-right-radius($border-radius-small); }
-  }
-}
-
-
 
 // Horizontal forms
 // --------------------------------------------------
+// Horizontal forms are built on grid classes.
 
-@media screen and (min-width: 768px) {
-
-  .form-horizontal {
-
-    // Increase spacing between groups
-    .control-group {
-      position: relative;
-      margin-bottom: $line-height-base;
-      @include clear_float();
-
-      input,
-      select,
-      textarea {
-        margin-bottom: 0;
-      }
-    }
-
-    // Float the labels left
-    .control-group > .control-label {
-      float: left;
-      width: ($component-offset-horizontal - 20);
-      padding-top: 6px;
-      text-align: right;
-    }
-
-    // Move over all input controls and content over
-    .control-group > .controls {
-      margin-left: $component-offset-horizontal;
-    }
-
+.form-horizontal {
+  .row + .row {
+    margin-top: 15px;
+  }
+  .row-label {
+    padding-top: 6px;
+    text-align: right;
   }
 }
diff --git a/vendor/assets/stylesheets/bootstrap/_glyphicons.scss b/vendor/assets/stylesheets/bootstrap/_glyphicons.scss
index 6bdae204..0d935ea1 100644
--- a/vendor/assets/stylesheets/bootstrap/_glyphicons.scss
+++ b/vendor/assets/stylesheets/bootstrap/_glyphicons.scss
@@ -26,15 +26,15 @@
        url('@{glyphicons-font-path}/glyphiconshalflings-regular.woff') format('woff'),
        url('@{glyphicons-font-path}/glyphiconshalflings-regular.ttf') format('truetype'),
        url('@{glyphicons-font-path}/glyphiconshalflings-regular.svg#glyphicons_halflingsregular') format('svg');
-  font-style: normal;
-  font-weight: normal;
 }
 
 // Catchall baseclass
 .glyphicon:before {
   font-family: 'Glyphicons Halflings';
   font-style: normal;
+  font-weight: normal;
   line-height: 1;
+  -webkit-font-smoothing: antialiased;
 }
 
 // Individual icons
diff --git a/vendor/assets/stylesheets/bootstrap/_grid.scss b/vendor/assets/stylesheets/bootstrap/_grid.scss
index 0df6816e..6efcfddf 100644
--- a/vendor/assets/stylesheets/bootstrap/_grid.scss
+++ b/vendor/assets/stylesheets/bootstrap/_grid.scss
@@ -12,38 +12,56 @@
 .row {
   @include make-row();
 }
-[class^="span"] {
+
+
+// Common styles for small and large grid columns
+.col {
   position: relative;
+  // Float and set width: 100%; for easy stacking on mobile devices
+  float: left;
+  width: 100%;
+  // Prevent columns from collapsing when empty
   min-height: 1px;
+  // Inner gutter via padding
   padding-left:  ($grid-gutter-width / 2);
   padding-right: ($grid-gutter-width / 2);
 }
 
+// Generate small grid classes first
+@include generate-grid-columns($grid-columns);
+
+// Then generate the larger grid classes via media query
+@media screen and (min-width: $screen-small) {
+  @include generate-large-grid-columns($grid-columns);
+}
+
+
 // Responsive: Tablets and up
-@media screen and (min-width: 768px) {
+@media screen and (min-width: $screen-tablet) {
   .container {
     max-width: 728px;
   }
-  // Generate the grid columns and offsets
-  [class^="span"] { float: left; }
-  @include generate-grid-columns($grid-columns);
+  .row {
+    margin-left:  ($grid-gutter-width / -2);
+    margin-right: ($grid-gutter-width / -2);
+  }
 }
 
 // Responsive: Desktops and up
-@media screen and (min-width: 992px) {
+@media screen and (min-width: $screen-desktop) {
   .container {
     max-width: 940px;
   }
 }
 
 // Responsive: Large desktops and up
-@media screen and (min-width: 1200px) {
+@media screen and (min-width: $screen-large-desktop) {
   .container {
     max-width: 1170px;
   }
 }
 
 // Reset utility classes due to specificity
-[class*="span"].pull-right {
+/*[class*="col-span-"].pull-right {
   float: right;
-}
+}*/
diff --git a/vendor/assets/stylesheets/bootstrap/_jumbotron.scss b/vendor/assets/stylesheets/bootstrap/_jumbotron.scss
index bac858cc..e98cc552 100644
--- a/vendor/assets/stylesheets/bootstrap/_jumbotron.scss
+++ b/vendor/assets/stylesheets/bootstrap/_jumbotron.scss
@@ -10,7 +10,7 @@
   font-weight: 200;
   line-height: ($line-height-base * 1.5);
   color: $jumbotron-lead-color;
-  background-color: $jumbotron-background;
+  background-color: $jumbotron-bg;
   h1 {
     line-height: 1;
     color: $jumbotron-heading-color;
@@ -20,13 +20,13 @@
   }
 }
 
-@media screen and (min-width: 768px) {
+@media screen and (min-width: $screen-tablet) {
   .jumbotron {
     padding: 50px 60px;
-    border-radius: 6px; // Only round corners at higher resolutions
+    border-radius: $border-radius-large; // Only round corners at higher resolutions
 
     h1 {
-      font-size: 60px;
+      font-size: ($font-size-base * 4.5);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_labels.scss b/vendor/assets/stylesheets/bootstrap/_labels.scss
index b0de345f..b3c1004d 100644
--- a/vendor/assets/stylesheets/bootstrap/_labels.scss
+++ b/vendor/assets/stylesheets/bootstrap/_labels.scss
@@ -5,15 +5,15 @@
 
 // Base classes
 .label {
-  padding: .25em .6em;
+  padding: inline;
   font-size: 75%;
   font-weight: 500;
-  color: #fff;
   line-height: 1;
-  vertical-align: middle;
-  white-space: nowrap;
+  color: #fff;
   text-align: center;
-  background-color: $grayLight;
+  white-space: nowrap;
+  vertical-align: middle;
+  background-color: $gray_light;
   border-radius: .25em;
 }
 
@@ -24,20 +24,48 @@ a.label {
     color: #fff;
     text-decoration: none;
     cursor: pointer;
+    background-color: darken($gray-light, 10%);
   }
 }
 
 // Colors
-// Only give background-color difference to links (and to simplify, we don't qualifty with `a` but [href] attribute)
-// Danger (red)
-.label-danger            { background-color: $label-danger-background; }
-.label-danger[href]      { background-color: darken($label-danger-background, 10%); }
-// Warnings (orange)
-.label-warning           { background-color: $label-warning-background; }
-.label-warning[href]     { background-color: darken($label-warning-background, 10%); }
-// Success (green)
-.label-success           { background-color: $label-success-background; }
-.label-success[href]     { background-color: darken($label-success-background, 10%); }
-// Info (turquoise)
-.label-info              { background-color: $label-info-background; }
-.label-info[href]        { background-color: darken($label-info-background, 10%); }
+// Contextual variations (linked labels get darker on :hover)
+.label-danger {
+  background-color: $label-danger-bg;
+  &[href] {
+    &:hover, 
+    &:focus {
+      background-color: darken($label-danger-bg, 10%);
+    }
+  }
+}
+
+.label-success {
+  background-color: $label-success-bg;
+  &[href] {
+    &:hover,
+    &:focus {
+      background-color: darken($label-success-bg, 10%);
+    }
+  }
+}
+
+.label-warning {
+  background-color: $label-warning-bg;
+  &[href] {
+    &:hover,
+    &:focus {
+      background-color: darken($label-warning-bg, 10%);
+    }
+  }
+}
+
+.label-info {
+  background-color: $label-info-bg;
+  &[href] {
+    &:hover,
+    &:focus {
+      background-color: darken($label-info-bg, 10%);
+    }
+  }
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_list-group.scss b/vendor/assets/stylesheets/bootstrap/_list-group.scss
new file mode 100644
index 00000000..6ba2d3c9
--- /dev/null
+++ b/vendor/assets/stylesheets/bootstrap/_list-group.scss
@@ -0,0 +1,96 @@
+//
+// List groups
+// --------------------------------------------------
+
+// Base class
+//
+// Easily usable on <ul>, <ol>, or <div>.
+.list-group {
+  // No need to set list-style: none; since .list-group-item is block level
+  margin: 0 0 20px; // reset all margins because ul and ol
+  background-color: $list-group-bg;
+}
+
+// Individual list items
+// -------------------------
+
+.list-group-item {
+  position: relative;
+  display: block;
+  padding: 10px 30px 10px 15px;
+  // Place the border on the list items and negative margin up for better styling
+  margin-bottom: -1px;
+  border: 1px solid $list-group-border;
+}
+// Round the first and last items
+.list-group-item:first-child {
+  @include border-top-radius($border-radius-base);
+}
+.list-group-item:last-child {
+  margin-bottom: 0;
+  @include border-bottom-radius($border-radius-base);
+}
+
+
+// Custom content options
+// -------------------------
+
+.list-group-item-heading {
+  margin-top: 0;
+  margin-bottom: 5px;
+}
+.list-group-item-text {
+  margin-bottom: 0;
+  line-height: 1.3;
+}
+
+// Linked list items
+// -------------------------
+
+// Custom content within linked items
+a.list-group-item {
+  .list-group-item-heading {
+    color: #333;
+  }
+  .list-group-item-text {
+    color: #555;
+  }
+}
+
+// Hover state
+a.list-group-item:hover,
+a.list-group-item:focus {
+  text-decoration: none;
+  background-color: $list-group-hover-bg;
+}
+
+// Active class on item itself, not parent
+a.list-group-item.active {
+  z-index: 2; // Place active items above their siblings for proper border styling
+  color: $list-group-active-color;
+  background-color: $list-group-active-bg;
+  border-color: $list-group-active-border;
+
+  // Force color to inherit for custom content
+  .list-group-item-heading {
+    color: inherit;
+  }
+  .list-group-item-text {
+    color: lighten($list-group-active-bg, 40%);
+  }
+}
+
+// Chevrons and badges within list items
+// -------------------------
+
+.list-group-item > .badge,
+.list-group-item > .glyphicon-chevron-right {
+  float: right;
+  margin-right: -15px;
+}
+.list-group-item > .glyphicon-chevron-right {
+  margin-right: -15px;
+}
+.list-group-item > .glyphicon + .badge {
+  margin-right: 5px;
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_mixins.scss b/vendor/assets/stylesheets/bootstrap/_mixins.scss
index d8cab271..115b9133 100644
--- a/vendor/assets/stylesheets/bootstrap/_mixins.scss
+++ b/vendor/assets/stylesheets/bootstrap/_mixins.scss
@@ -16,7 +16,7 @@
 //    that are clearfixed.
 // 2. The use of `table` rather than `block` is only necessary if using
 //    `:before` to contain the top-margins of child elements.
-@mixin clear_float() {
+@mixin clearfix() {
   &:before,
   &:after {
     content: " "; /* 1 */
@@ -345,8 +345,8 @@
 // -------------------------
 // Dividers (basically an hr) within dropdowns and nav lists
 @mixin nav-divider($top: #e5e5e5, $bottom: #fff) {
-  height: 1px;
-  margin: (($line-height-base / 2) - 1) 0;
+  height: 2px; // 1px for background, one for border
+  margin: (($line-height-computed / 2) - 1) 0;
   overflow: hidden;
   background-color: $top;
   border-bottom: 1px solid $bottom;
@@ -356,7 +356,8 @@
 // -------------------------
 // Easily pump out default styles, as well as :hover, :focus, :active,
 // and disabled options for all buttons
-@mixin btn-pseudo-states($background, $border) {
+@mixin btn-pseudo-states($color, $background, $border) {
+  color: $color;
   background-color: $background;
   border-color: $border;
 
@@ -399,7 +400,7 @@
 @mixin container-fixed() {
   margin-right: auto;
   margin-left: auto;
-  @include clear_float();
+  @include clearfix();
 }
 
 // Make a grid
@@ -407,14 +408,14 @@
 // Creates a wrapper for a series of columns
 @mixin make-row() {
   // Then clear the floated columns
-  @include clear_float();
+  @include clearfix();
   
   // Negative margin the row out to align the content of columns
   .row {
   	margin-left:  ($grid-gutter-width / -2);
   	margin-right: ($grid-gutter-width / -2);
   }
-  
+
 }
 // Generate the columns
 @mixin make-column($columns) {
@@ -424,13 +425,13 @@
   width: 100%;
   // Prevent columns from collapsing when empty
   min-height: 1px;
-  // Set inner padding as gutters instead of margin
+  // Inner gutter via padding
   padding-left:  ($grid-gutter-width / 2);
   padding-right: ($grid-gutter-width / 2);
+
+  // Calculate width based on number of columns available
   @media (min-width: $grid-float-breakpoint) {
-    float: left;
-    // Calculate width based on number of columns available
-    width: percentage($columns / $grid-columns);
+    width: percentage(($columns / $grid-columns));
   }
 }
 // Generate the column offsets
@@ -451,64 +452,90 @@
 }
 
 
+// Small grid columns
 
-// The Grid
+// Generate columns
 @mixin generate-grid-columns($grid-columns) {
-  // Generate .spanX and .offsetX
-  @include grid-spanX($grid-columns);
-  @include grid-offsetX($grid-columns);
-  @include grid-pushX($grid-columns);
-  @include grid-pullX($grid-columns);
+  @include col-sm-X($grid-columns)
 }
 
-@mixin grid-spanX($grid-columns) {
+@mixin col-sm-X ($grid-columns) {
   $index: $grid-columns;
   @while $index > 0 {
-    .span#{$index} { @include grid-span($grid-columns, $index); }
+    .col-sm-#{$index} { @include col-sm-($index, $grid-columns); }
     $index: $index - 1;
   }
 }
 
-@mixin grid-span($grid-columns, $index) {
-  width: percentage($index / $grid-columns);
+// Apply the styles
+@mixin col-sm-($columns, $grid-columns) {
+  width: percentage(($columns / $grid-columns));
 }
 
-@mixin grid-offsetX($grid-columns) {
+
+// Large grid columns
+
+// Generate columns
+@mixin generate-large-grid-columns($grid-columns) {
+  @include col-lg-X($grid-columns);
+  @include col-offset-X($grid-columns);
+  @include col-push-X($grid-columns);
+  @include col-pull-X($grid-columns);
+}
+
+@mixin col-lg-X ($grid-columns) {
   $index: $grid-columns;
   @while $index > 0 {
-    .offset#{$index} { @include grid-offset($grid-columns, $index); }
+    .col-lg-#{$index} { @include col-lg-($index, $grid-columns); }
     $index: $index - 1;
   }
 }
 
-@mixin grid-offset($grid-columns, $index) {
-  margin-left: percentage($index / $grid-columns);
-}
-
-@mixin grid-pushX($grid-columns) {
+// Offsets (gaps between columns)
+@mixin col-offset-X ($grid-columns) {
   $index: $grid-columns;
   @while $index > 0 {
-    .push#{$index} { @include grid-push($grid-columns, $index) }
+    .col-offset-#{$index} { @include col-offset-($index, $grid-columns); }
     $index: $index - 1;
   }
 }
 
-@mixin grid-push($grid-columns, $index) {
-  left: percentage($index / $grid-columns);
-}
-
-@mixin grid-pullX($grid-columns) {
+// Source Ordering
+@mixin col-push-X ($grid-columns) {
   $index: $grid-columns;
   @while $index > 0 {
-    .pull#{$index} { @include grid-pull($grid-columns, $index) }
+    .col-push-#{$index} { @include col-push-($index, $grid-columns); }
     $index: $index - 1;
   }
 }
 
-@mixin grid-pull($grid-columns, $index) {
-  right: percentage($index / $grid-columns);
+// Source Ordering
+@mixin col-pull-X ($grid-columns) {
+  $index: $grid-columns;
+  @while $index > 0 {
+    .col-pull-#{$index} { @include col-pull-($index, $grid-columns); }
+    $index: $index - 1;
+  }
 }
 
+// Apply the Styles
+@mixin col-lg-($columns, $grid-columns) {
+  width: percentage(($columns / $grid-columns));
+}
+
+@mixin col-offset-($columns, $grid-columns) {
+  width: percentage(($columns / $grid-columns));
+}
+
+@mixin col-push-($columns, $grid-columns) {
+  width: percentage(($columns / $grid-columns));
+}
+
+@mixin col-pull-($columns, $grid-columns) {
+  width: percentage(($columns / $grid-columns));
+}
+
+
 // Framework mixins
 // --------------------------------------------------
 
diff --git a/vendor/assets/stylesheets/bootstrap/_modals.scss b/vendor/assets/stylesheets/bootstrap/_modals.scss
index f1fc6025..23b2ca8f 100644
--- a/vendor/assets/stylesheets/bootstrap/_modals.scss
+++ b/vendor/assets/stylesheets/bootstrap/_modals.scss
@@ -74,8 +74,9 @@
 // Modal header
 // Top section of the modal w/ title and dismiss
 .modal-header {
-  padding: 9px 15px;
+  padding: $modal-title-padding;
   border-bottom: 1px solid #e5e5e5;
+  min-height: ($modal-title-padding + $modal-title-line-height);
 }
 // Close icon
 .modal-header .close {
@@ -85,7 +86,7 @@
 // Title text within header
 .modal-title {
   margin: 0;
-  line-height: 30px; // effectively set a min-height for the header
+  line-height: $modal-title-line-height;
 }
 
 // Modal body
@@ -119,7 +120,7 @@
 }
 
 // Scale up the modal
-@media screen and (min-width: 768px) {
+@media screen and (min-width: $screen-tablet) {
 
   .modal-dialog {
     left: 50%;
diff --git a/vendor/assets/stylesheets/bootstrap/_navbar.scss b/vendor/assets/stylesheets/bootstrap/_navbar.scss
index 43713fa4..0326b139 100644
--- a/vendor/assets/stylesheets/bootstrap/_navbar.scss
+++ b/vendor/assets/stylesheets/bootstrap/_navbar.scss
@@ -5,43 +5,45 @@
 // Wrapper and base class
 .navbar {
   position: relative;
-  padding: 10px 15px;
+  margin-bottom: 20px;
+  padding-left: 15px;
+  padding-right: 15px;
   background-color: $navbar-bg;
   border-radius: $border-radius-base;
   // Prevent floats from breaking the navbar
-  @include clear_float();
+  @include clearfix();
 }
 
 // Navbar nav links
 // -------------------------
 
-.navbar {
-  .nav {
-    // space out from .navbar .brand and .btn-navbar
-    margin-top: 15px;
-  }
-  .nav > li > a {
-    padding-top: (($navbar-height - $line-height-base) / 2);
-    padding-bottom: (($navbar-height - $line-height-base) / 2);
+.navbar-nav {
+  // Space out from .navbar .brand and .btn-navbar when stacked in mobile views
+  // and outdent nav links so text lines up with logo.
+  margin-top: 10px;
+
+  > li > a {
+    padding-top: (($navbar-height - $line-height-computed) / 2);
+    padding-bottom: (($navbar-height - $line-height-computed) / 2);
     color: $navbar-link-color;
     line-height: 20px;
   }
-  .nav > li > a:hover,
-  .nav > li > a:focus {
-    color: $navbar-link-color-hover;
-    background-color: $navbar-link-bg-hover;
+  > li > a:hover,
+  > li > a:focus {
+    color: $navbar-link-hover-color;
+    background-color: $navbar-link-hover-bg;
   }
-  .nav > .active > a,
-  .nav > .active > a:hover,
-  .nav > .active > a:focus {
-    color: $navbar-link-color-active;
-    background-color: $navbar-link-bg-active;
+  > .active > a,
+  > .active > a:hover,
+  > .active > a:focus {
+    color: $navbar-link-active-color;
+    background-color: $navbar-link-active-bg;
   }
-  .nav > .disabled > a,
-  .nav > .disabled > a:hover,
-  .nav > .disabled > a:focus {
-    color: $navbar-link-color-disabled;
-    background-color: $navbar-link-bg-disabled;
+  > .disabled > a,
+  > .disabled > a:hover,
+  > .disabled > a:focus {
+    color: $navbar-link-disabled-color;
+    background-color: $navbar-link-disabled-bg;
   }
 }
 
@@ -65,8 +67,13 @@
   z-index: $zindex-navbar-fixed;
   border-radius: 0;
 }
-.navbar-fixed-top    { top: 0; }
-.navbar-fixed-bottom { bottom: 0; }
+.navbar-fixed-top { 
+  top: 0;
+}
+.navbar-fixed-bottom { 
+  bottom: 0;
+  margin-bottom: 0; // override .navbar defaults
+}
 
 
 
@@ -80,17 +87,17 @@
   max-width: 200px;
   margin-left: auto;
   margin-right: auto;
-  padding: 7px 15px;
-  font-size: 18px;
+  padding: 15px;
+  font-size: $font-size-large;
   font-weight: 500;
-  line-height: $line-height-base;
+  line-height: $line-height-computed;
   color: $navbar-brand-color;
   text-align: center;
   &:hover,
   &:focus {
-    color: $navbar-brand-color-hover;
+    color: $navbar-brand-hover-color;
     text-decoration: none;
-    background-color: $navbar-brand-bg-hover;
+    background-color: $navbar-brand-hover-bg;
   }
 }
 
@@ -122,55 +129,51 @@
   }
 }
 
-// Dividers in navbar
-.navbar .nav > .divider {
-  @include nav-divider(darken($navbar-bg, 5%), lighten($navbar-bg, 5%));
-}
-
 // Navbar form
 .navbar-form {
+  @extend .form-inline;
   @include navbar-vertical-align(34px); // Vertically center in navbar
 }
 
 // Dropdown menus
 
 // Menu position and menu carets
-.navbar .nav > li > .dropdown-menu {
+.navbar-nav > li > .dropdown-menu {
   margin-top: 0;
   border-top-left-radius: 0;
   border-top-right-radius: 0;
 }
 // Menu position and menu caret support for dropups via extra dropup class
-.navbar-fixed-bottom .nav > li > .dropdown-menu {
+.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
   border-bottom-left-radius: 0;
   border-bottom-right-radius: 0;
 }
 
 // Dropdown menu items and carets
-.navbar .nav {
+.navbar-nav {
   // Caret should match text color on hover
-  li.dropdown > a:hover .caret,
-  li.dropdown > a:focus .caret {
-    border-top-color: $navbar-link-color-hover;
-    border-bottom-color: $navbar-link-color-hover;
+  > .dropdown > a:hover .caret,
+  > .dropdown > a:focus .caret {
+    border-top-color: $navbar-link-hover-color;
+    border-bottom-color: $navbar-link-hover-color;
   }
 
   // Remove background color from open dropdown
-  li.dropdown.open > .dropdown-toggle,
-  li.dropdown.active > .dropdown-toggle,
-  li.dropdown.open.active > .dropdown-toggle {
-    background-color: $navbar-link-bg-active;
-    color: $navbar-link-color-active;
+  > .open > a,
+  > .open > a:hover,
+  > .open > a:focus {
+    background-color: $navbar-link-active-bg;
+    color: $navbar-link-active-color;
   }
-  li.dropdown > .dropdown-toggle .caret {
+  > .dropdown > a .caret {
     border-top-color: $navbar-link-color;
     border-bottom-color: $navbar-link-color;
   }
-  li.dropdown.open > .dropdown-toggle .caret,
-  li.dropdown.active > .dropdown-toggle .caret,
-  li.dropdown.open.active > .dropdown-toggle .caret {
-    border-top-color: $navbar-link-color-active;
-    border-bottom-color: $navbar-link-color-active;
+  > .open > a .caret,
+  > .open > a:hover .caret,
+  > .open > a:focus .caret {
+    border-top-color: $navbar-link-active-color;
+    border-bottom-color: $navbar-link-active-color;
   }
 }
 
@@ -193,34 +196,36 @@
     color: $navbar-inverse-brand-color;
     &:hover,
     &:focus {
-      color: $navbar-inverse-brand-color-hover;
-      background-color: $navbar-inverse-brand-bg-hover;
+      color: $navbar-inverse-brand-hover-color;
+      background-color: $navbar-inverse-brand-hover-bg;
     }
   }
 
   .navbar-text {
-    color: $navbar-inverse-text;
+    color: $navbar-inverse-color;
   }
 
-  .nav > li > a {
-    color: $navbar-inverse-link-color;
-  }
-  .nav > li > a:hover,
-  .nav > li > a:focus {
-    color: $navbar-inverse-link-color-hover;
-    background-color: $navbar-inverse-link-bg-hover;
-  }
-  .nav > .active > a,
-  .nav > .active > a:hover,
-  .nav > .active > a:focus {
-    color: $navbar-inverse-link-color-active;
-    background-color: $navbar-inverse-link-bg-active;
-  }
-  .nav > .disabled > a,
-  .nav > .disabled > a:hover,
-  .nav > .disabled > a:focus {
-    color: $navbar-inverse-link-color-disabled;
-    background-color: $navbar-inverse-link-bg-disabled;
+  .navbar-nav {
+    > li > a {
+      color: $navbar-inverse-link-color;
+    }
+    > li > a:hover,
+    > li > a:focus {
+      color: $navbar-inverse-link-hover-color;
+      background-color: $navbar-inverse-link-hover-bg;
+    }
+    > .active > a,
+    > .active > a:hover,
+    > .active > a:focus {
+      color: $navbar-inverse-link-active-color;
+      background-color: $navbar-inverse-link-active-bg;
+    }
+    > .disabled > a,
+    > .disabled > a:hover,
+    > .disabled > a:focus {
+      color: $navbar-inverse-link-disabled-color;
+      background-color: $navbar-inverse-link-disabled-bg;
+    }
   }
 
   // Darken the responsive nav toggle
@@ -235,77 +240,54 @@
     }
   }
 
-  // Darken dividers
-  .nav > .divider {
-    background-color: darken($navbar-inverse-bg, 5%);
-    border-bottom-color: lighten($navbar-inverse-bg, 5%);
-  }
-
   // Dropdowns
-  .nav li.dropdown.open > .dropdown-toggle,
-  .nav li.dropdown.active > .dropdown-toggle,
-  .nav li.dropdown.open.active > .dropdown-toggle {
-    background-color: $navbar-inverse-link-bg-active;
-    color: $navbar-inverse-link-color-active;
-  }
-  .nav li.dropdown > a:hover .caret {
-    border-top-color: $navbar-inverse-link-color-hover;
-    border-bottom-color: $navbar-inverse-link-color-hover;
-  }
-  .nav li.dropdown > .dropdown-toggle .caret {
-    border-top-color: $navbar-inverse-link-color;
-    border-bottom-color: $navbar-inverse-link-color;
-  }
-  .nav li.dropdown.open > .dropdown-toggle .caret,
-  .nav li.dropdown.active > .dropdown-toggle .caret,
-  .nav li.dropdown.open.active > .dropdown-toggle .caret {
-    border-top-color: $navbar-inverse-link-color-active;
-    border-bottom-color: $navbar-inverse-link-color-active;
+  .navbar-nav {
+    > .open > a,
+    > .open > a:hover,
+    > .open > a:focus {
+      background-color: $navbar-inverse-link-active-bg;
+      color: $navbar-inverse-link-active-color;
+    }
+    > .dropdown > a:hover .caret {
+      border-top-color: $navbar-inverse-link-hover-color;
+      border-bottom-color: $navbar-inverse-link-hover-color;
+    }
+    > .dropdown > a .caret {
+      border-top-color: $navbar-inverse-link-color;
+      border-bottom-color: $navbar-inverse-link-color;
+    }
+    > .open > a .caret,
+    > .open > a:hover .caret,
+    > .open > a:focus .caret {
+      border-top-color: $navbar-inverse-link-active-color;
+      border-bottom-color: $navbar-inverse-link-active-color;
+    }
+
   }
 }
 
-
-
-// Inverse navbar
+// Responsive navbar
 // --------------------------------------------------
 
-@media screen and (min-width: 768px) {
-  .navbar {
-    padding-top: 0;
-    padding-bottom: 0;
-  }
+@media screen and (min-width: $screen-tablet) {
+
   .navbar-brand {
     float: left;
-    padding-top: (($navbar-height - $line-height-base) / 2);
-    padding-bottom: (($navbar-height - $line-height-base) / 2);
-    margin-left: -10px;
+    margin-left: -5px;
+    margin-right: 5px;
   }
   .navbar .nav {
     float: left;
     margin-top: 0; // undo top margin to make nav extend full height of navbar
-    @include clear_float();
+
+    > li {
+      float: left;
+    }
 
     &.pull-right {
       float: right;
     }
   }
-  .navbar .nav > li {
-    float: left;
-  }
-
-  // Dividers go vertical
-  // Change the height and height, disable bottom border, then add right border
-  .navbar .nav > .divider {
-    width: 1px;
-    height: ($navbar-height * .6);
-    margin: ($navbar-height * .2) 9px;
-    border-bottom: 0;
-    border-right: 1px solid lighten($navbar-bg, 5%);
-  }
-  // Since we override the border, we need to specify it again for inverted navbars
-  .navbar-inverse .nav > .divider {
-    border-right-color: lighten($navbar-inverse-bg, 5%);
-  }
 
   // Required to make the collapsing navbar work on regular desktops
   .navbar-toggle {
@@ -321,59 +303,44 @@
 
 }
 
-/*
 
-// Janky solution for now to account for links outside the .nav
-// -------------------------
+
+// Buttons in navbars
+//
+// Vertically center a button within a navbar (when *not* in a form).
+
+.navbar-btn {
+  margin-top: (($navbar-height - $input-height-base) / 2);
+}
+
+
+
+// Text in navbars
+//
+// Add a class to make any element properly align itself vertically within the navbars.
+
+.navbar-text {
+  @include navbar-vertical-align($line-height-computed);
+}
+
+
+
+// Links in navbars
+//
+// Add a class to ensure links outside the navbar nav are colored correctly.
+
+// Default navbar variables
 .navbar-link {
   color: $navbar-link-color;
   &:hover {
-    color: $navbar-link-color-hover;
+    color: $navbar-link-hover-color;
   }
 }
 
-// Buttons in navbar
-// -------------------------
-.navbar .btn,
-.navbar .btn-group {
-  .navbarVerticalAlign(30px); // Vertically center in navbar
-}
-.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
-  .clearfix();
-  input,
-  select,
-  .radio,
-  .checkbox {
-    .navbarVerticalAlign(30px); // Vertically center in navbar
-  }
-  input,
-  select,
-  .btn {
-    display: inline-block;
-    margin-bottom: 0;
-  }
-  input[type="image"],
-  input[type="checkbox"],
-  input[type="radio"] {
-    margin-top: 3px;
-  }
-  .input-append,
-  .input-prepend {
-    margin-top: 5px;
-    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
-    }
+// Use the inverse navbar variables
+.navbar-inverse .navbar-link {
+  color: $navbar-inverse-link-color;
+  &:hover {
+    color: $navbar-inverse-link-hover-color;
   }
 }
-
-*/
diff --git a/vendor/assets/stylesheets/bootstrap/_navs.scss b/vendor/assets/stylesheets/bootstrap/_navs.scss
index b1f34947..aefcb32f 100644
--- a/vendor/assets/stylesheets/bootstrap/_navs.scss
+++ b/vendor/assets/stylesheets/bootstrap/_navs.scss
@@ -11,28 +11,64 @@
   margin-bottom: 0;
   padding-left: 0; // Override default ul/ol
   list-style: none;
-  @include clear_float();
-}
-.nav > li {
-  display: block;
-}
-.nav > li > a {
-  position: relative;
-  display: block;
-  padding: 10px 15px;
-}
-.nav > li > a:hover,
-.nav > li > a:focus {
-  text-decoration: none;
-  background-color: $grayLighter;
-}
+  @include clearfix();
 
-// Redeclare pull classes because of specifity
-// Todo: consider making these utilities !important to avoid this bullshit
-.nav > .pull-right {
-  float: right;
-}
+  > li {
+    position: relative;
+    display: block;
 
+    > a {
+      position: relative;
+      display: block;
+      padding: 10px 15px;
+      &:hover,
+      &:focus {
+        text-decoration: none;
+        background-color: $gray-lighter;
+      }
+    }
+
+    // Disabled state sets text to gray and nukes hover/tab effects
+    &.disabled > a {
+      color: $gray-light;
+    }
+    &.disabled > a:hover,
+    &.disabled > a:focus {
+      color: $gray-light;
+      text-decoration: none;
+      background-color: transparent;
+      cursor: default;
+    }
+    // Space the headers out when they follow another list item (link)
+    &+ .nav-header {
+      margin-top: 9px;
+    }
+
+    // Open dropdowns
+    &.open > a,
+    &.open > a:hover,
+    &.open > a:focus {
+      color: #fff;
+      background-color: $link-color;
+      border-color: $link-color;
+      .caret {
+        border-top-color: #fff;
+        border-bottom-color: #fff;
+      }
+    }
+  }
+
+  // Redeclare pull classes because of specifity
+  // Todo: consider making these utilities !important to avoid this bullshit
+  > .pull-right {
+    float: right;
+  }
+
+  // Dividers (basically an hr) within the dropdown
+  .nav-divider {
+    @include nav-divider();
+  }
+}
 
 
 // Nav variations
@@ -44,146 +80,127 @@
 // Give the tabs something to sit on
 .nav-tabs {
   border-bottom: 1px solid #ddd;
-}
-.nav-tabs > li {
-  float: left;
-  // Make the list-items overlay the bottom border
-  margin-bottom: -1px;
-}
-// Actual tabs (as links)
-.nav-tabs > li > a {
-  margin-right: 2px;
-  line-height: $line-height-base;
-  border: 1px solid transparent;
-  border-radius: $border-radius-base $border-radius-base 0 0;
-  &:hover {
-    border-color: $grayLighter $grayLighter #ddd;
+  > li {
+    float: left;
+    // Make the list-items overlay the bottom border
+    margin-bottom: -1px;
+
+    // Actual tabs (as links)
+    > a {
+      margin-right: 2px;
+      line-height: $line-height-base;
+      border: 1px solid transparent;
+      border-radius: $border-radius-base $border-radius-base 0 0;
+      &:hover {
+        border-color: $gray-lighter $gray-lighter #ddd;
+      }
+    }
+
+    // Active state, and it's :hover to override normal :hover
+    &.active > a,
+    &.active > a:hover,
+    &.active > a:focus {
+      color: $gray;
+      background-color: $body-bg;
+      border: 1px solid #ddd;
+      border-bottom-color: transparent;
+      cursor: default;
+    }
+  }
+  // pulling this in mainly for less shorthand
+  &.nav-justified {
+    @extend .nav-justified;
+    @extend .nav-tabs-justified;
   }
 }
-// Active state, and it's :hover to override normal :hover
-.nav-tabs > .active > a,
-.nav-tabs > .active > a:hover,
-.nav-tabs > .active > a:focus {
-  color: $gray;
-  background-color: $body-background;
-  border: 1px solid #ddd;
-  border-bottom-color: transparent;
-  cursor: default;
-}
+
 
 // Pills
 // -------------------------
 
-.nav-pills > li {
-  float: left;
+.nav-pills {
+  > li {
+    float: left;
+
+    // Links rendered as pills
+    > a {
+      border-radius: 5px;
+    }
+    + li {
+      > a {
+        margin-left: 2px;
+      }
+    }
+
+    // Active state
+    &.active > a,
+    &.active > a:hover,
+    &.active > a:focus {
+      color: #fff;
+      background-color: $component-active-bg;
+    }
+  }
 }
 
-// Links rendered as pills
-.nav-pills > li > a {
-  border-radius: 5px;
-}
-.nav-pills > li + li > a {
-  margin-left: 2px;
-}
-
-// Active state
-.nav-pills > .active > a,
-.nav-pills > .active > a:hover,
-.nav-pills > .active > a:focus {
-  color: #fff;
-  background-color: $link-color;
-}
 
 // Stacked pills
-.nav-stacked > li {
-  float: none;
-}
-.nav-stacked > li + li > a {
-  margin-top: 2px;
-  margin-left: 0; // no need for this gap between nav items
+.nav-stacked {
+  > li {
+    float: none;
+    + li {
+      > a {
+        margin-top: 2px;
+        margin-left: 0; // no need for this gap between nav items
+      }
+    }
+  }
 }
 
+
 // Justified nav links
 // -------------------------
 
 .nav-justified {
-  // Negative margin doesn't work, so we hack it
-  max-height: 40px;
-}
-.nav-justified > li {
-  float: none;
-  display: table-cell;
-  width: 1%;
-  text-align: center;
+  width: 100%;
+  > li {
+    float: none;
+    display: table-cell;
+    width: 1%;
+    > a {
+      text-align: center;
+    }
+  }
 }
 
-// Lists
-// -------------------------
+// Move borders to anchors instead of bottom of list
+.nav-tabs-justified {
+  border-bottom: 0;
+  > li > a {
+    border-bottom: 1px solid #ddd;
 
-.nav-list > li > a {
-  margin-bottom: -1px; // pull up the following link for a 1px border between
-  border: 1px solid #e5e5e5;
-}
-.nav-list > li:first-child > a {
-   border-top-left-radius: $border-radius-base;
-  border-top-right-radius: $border-radius-base;
-}
-.nav-list > li:last-child > a {
-   border-bottom-left-radius: $border-radius-base;
-  border-bottom-right-radius: $border-radius-base;
-}
-.nav-list > .active > a,
-.nav-list > .active > a:hover,
-.nav-list > .active > a:focus {
-  z-index: 2; // Bring active item forward so border sits on top of next element
-  color: #fff;
-  background-color: $link-color;
-  border-color: $link-color;
+    // Override margin from .nav-tabs
+    margin-right: 0;
+  }
+  > .active > a {
+    border-bottom-color: $body-bg;
+  }
 }
 
 
 
-// Nav states and addons
-// --------------------------------------------------
-
-// Disabled state
-// -------------------------
-
-// Gray out text
-.nav > .disabled > a {
-  color: $grayLight;
-}
-// Nuke hover effects
-.nav > .disabled > a:hover,
-.nav > .disabled > a:focus {
-  color: $grayLight;
-  text-decoration: none;
-  background-color: transparent;
-  cursor: default;
-}
-
 // Nav headers (for dropdowns and lists)
 // -------------------------
 
 .nav-header {
   display: block;
   padding: 3px 15px;
-  font-size: 11px;
+  font-size: $font-size-mini;
   font-weight: bold;
   line-height: $line-height-base;
-  color: $grayLight;
+  color: $gray-light;
   text-shadow: 0 1px 0 rgba(255,255,255,.5);
   text-transform: uppercase;
 }
-// Space them out when they follow another list item (link)
-.nav li + .nav-header {
-  margin-top: 9px;
-}
-
-// Dividers (basically an hr) within the dropdown
-.nav .divider {
-  @include nav-divider();
-}
 
 
 
@@ -192,7 +209,7 @@
 
 // Clear any floats
 .tabbable {
-  @extend .clearfix;
+  @include clearfix();
 }
 
 // Show/hide tabbable areas
@@ -207,71 +224,23 @@
 
 
 
-/*
-// Prevent IE8 from misplacing imgs
-// See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
-.nav > li > a > img {
-  max-width: none;
-}
-
 // Dropdowns
 // -------------------------
 
-.nav-tabs .dropdown-menu {
-  // Remove the top rounded corners here since there is a hard edge above the menu
-  .border-top-radius(0);
-}
-
-// Default dropdown links
-// -------------------------
-// Make carets use linkColor to start
-.nav .dropdown-toggle .caret {
+// Make dropdown carets use link color in navs
+.nav .caret {
   border-top-color: $link-color;
   border-bottom-color: $link-color;
-  margin-top: 8px;
 }
-.nav .dropdown-toggle:hover .caret {
-  border-top-color: $link-color-hover;
-  border-bottom-color: $link-color-hover;
+.nav a:hover .caret {
+  border-top-color: $link-hover-color;
+  border-bottom-color: $link-hover-color;
 }
 
-// Active dropdown links
-// -------------------------
-.nav .active .dropdown-toggle .caret {
-  border-top-color: #fff;
-  border-bottom-color: #fff;
+// Specific dropdowns
+.nav-tabs .dropdown-menu {
+  // make dropdown border overlap tab border
+  margin-top: -1px;
+  // Remove the top rounded corners here since there is a hard edge above the menu
+  @include border-top-radius(0);
 }
-.nav-tabs .active .dropdown-toggle .caret {
-  border-top-color: $gray;
-  border-bottom-color: $gray;
-}
-
-// Active:hover dropdown links
-// -------------------------
-.nav > .dropdown.active > a:hover {
-  cursor: pointer;
-}
-
-// Open dropdowns
-// -------------------------
-.nav-tabs .open .dropdown-toggle,
-.nav-pills .open .dropdown-toggle,
-.nav > li.dropdown.open.active > a:hover {
-  color: #fff;
-  background-color: $grayLight;
-  border-color: $grayLight;
-}
-.nav li.dropdown.open .caret,
-.nav li.dropdown.open.active .caret,
-.nav li.dropdown.open a:hover .caret {
-  border-top-color: #fff;
-  border-bottom-color: #fff;
-  .opacity(1);
-}
-
-// Dropdowns in stacked tabs
-.tabs-stacked .open > a:hover {
-  border-color: $grayLight;
-}
-
-*/
diff --git a/vendor/assets/stylesheets/bootstrap/_pager.scss b/vendor/assets/stylesheets/bootstrap/_pager.scss
index b79ce13e..9b003ca9 100644
--- a/vendor/assets/stylesheets/bootstrap/_pager.scss
+++ b/vendor/assets/stylesheets/bootstrap/_pager.scss
@@ -7,37 +7,48 @@
   margin: $line-height-base 0;
   list-style: none;
   text-align: center;
-  @include clear_float();
-}
-.pager li {
-  display: inline;
-}
-.pager li > a,
-.pager li > span {
-  display: inline-block;
-  padding: 5px 14px;
-  background-color: #fff;
-  border: 1px solid #ddd;
-  border-radius: 15px;
-}
-.pager li > a:hover,
-.pager li > a:focus {
-  text-decoration: none;
-  background-color: #f5f5f5;
-}
-.pager .next > a,
-.pager .next > span {
-  float: right;
-}
-.pager .previous > a,
-.pager .previous > span {
-  float: left;
-}
-.pager .disabled > a,
-.pager .disabled > a:hover,
-.pager .disabled > a:focus,
-.pager .disabled > span {
-  color: $grayLight;
-  background-color: #fff;
-  cursor: default;
+  @include clearfix();
+  li {
+    display: inline;
+    > a,
+    > span {
+      display: inline-block;
+      padding: 5px 14px;
+      background-color: $pagination-bg;
+      border: 1px solid $pagination-border;
+      border-radius: 15px;
+    }
+
+    > a:hover,
+    > a:focus {
+      text-decoration: none;
+      background-color: $pagination-active-bg;
+    }
+  }
+
+  .next {
+    > a,
+    > span {
+      float: right;
+    }
+  }
+
+  .previous {
+    > a,
+    > span {
+      float: left;
+    }
+  }
+
+  .disabled {
+    > a,
+    > a:hover,
+    > a:focus,
+    > span {
+      color: $gray-light;
+      background-color: $pagination-bg;
+      cursor: default;
+    }
+  }
+
 }
diff --git a/vendor/assets/stylesheets/bootstrap/_pagination.scss b/vendor/assets/stylesheets/bootstrap/_pagination.scss
index d4ba652a..90bff5a4 100644
--- a/vendor/assets/stylesheets/bootstrap/_pagination.scss
+++ b/vendor/assets/stylesheets/bootstrap/_pagination.scss
@@ -3,7 +3,7 @@
 // --------------------------------------------------
 .pagination {
   display: inline-block;
-  margin: $line-height-base 0;
+  margin: $line-height-computed 0;
   border-radius: $border-radius-base;
 }
 .pagination > li {
@@ -15,7 +15,7 @@
   padding: 4px 12px;
   line-height: $line-height-base;
   text-decoration: none;
-  background-color: $pagination-background;
+  background-color: $pagination-bg;
   border: 1px solid $pagination-border;
   border-left-width: 0;
 }
@@ -23,19 +23,19 @@
 .pagination > li > a:focus,
 .pagination > .active > a,
 .pagination > .active > span {
-  background-color: $pagination-background-active;
+  background-color: $pagination-active-bg;
 }
 .pagination > .active > a,
 .pagination > .active > span {
-  color: $grayLight;
+  color: $gray-light;
   cursor: default;
 }
 .pagination > .disabled > span,
 .pagination > .disabled > a,
 .pagination > .disabled > a:hover,
 .pagination > .disabled > a:focus {
-  color: $grayLight;
-  background-color: $pagination-background;
+  color: $gray-light;
+  background-color: $pagination-bg;
   cursor: default;
 }
 .pagination > li:first-child > a,
diff --git a/vendor/assets/stylesheets/bootstrap/_panels.scss b/vendor/assets/stylesheets/bootstrap/_panels.scss
new file mode 100644
index 00000000..fd16b85d
--- /dev/null
+++ b/vendor/assets/stylesheets/bootstrap/_panels.scss
@@ -0,0 +1,86 @@
+//
+// Panels
+// --------------------------------------------------
+
+
+// Base class
+.panel {
+  padding: 15px;
+  margin-bottom: 20px;
+  background-color: $panel-bg;
+  border: 1px solid $panel-border;
+  border-radius: $panel-border-radius;
+  @include box-shadow(0 1px 1px rgba(0,0,0,.05));
+}
+
+// Optional heading
+.panel-heading {
+  margin: -15px -15px 15px;
+  padding: 10px 15px;
+  font-size: ($font-size-base * 1.25);
+  font-weight: 500;
+  background-color: $panel-heading-bg;
+  border-bottom: 1px solid $panel-border;
+  border-top-left-radius:  ($panel-border-radius - 1);
+  border-top-right-radius: ($panel-border-radius - 1);
+}
+
+// Contextual variations
+.panel-primary {
+  border-color: $panel-primary-border;
+  .panel-heading {
+    color: $panel-primary-text;
+    background-color: $panel-primary-heading-bg;
+    border-color: $panel-primary-border;
+  }
+}
+.panel-success {
+  border-color: $panel-success-border;
+  .panel-heading {
+    color: $panel-success-text;
+    background-color: $panel-success-heading-bg;
+    border-color: $panel-success-border;
+  }
+}
+.panel-warning {
+  border-color: $panel-warning-border;
+  .panel-heading {
+    color: $panel-warning-text;
+    background-color: $panel-warning-heading-bg;
+    border-color: $panel-warning-border;
+  }
+}
+.panel-danger {
+  border-color: $panel-danger-border;
+  .panel-heading {
+    color: $panel-danger-text;
+    background-color: $panel-danger-heading-bg;
+    border-color: $panel-danger-border;
+  }
+}
+.panel-info {
+  border-color: $panel-info-border;
+  .panel-heading {
+    color: $panel-info-text;
+    background-color: $panel-info-heading-bg;
+    border-color: $panel-info-border;
+  }
+}
+
+// List groups in panels
+.list-group-flush {
+  margin: 15px -15px -15px;
+
+  .list-group-item {
+    border-width: 1px 0;
+
+    // Remove border radius for top one
+    &:first-child {
+      @include border-top-radius(0);
+    }
+    // But keep it for the last one
+    &:last-child {
+      border-bottom: 0;
+    }
+  }
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_popovers.scss b/vendor/assets/stylesheets/bootstrap/_popovers.scss
index 8b717812..30caaad4 100644
--- a/vendor/assets/stylesheets/bootstrap/_popovers.scss
+++ b/vendor/assets/stylesheets/bootstrap/_popovers.scss
@@ -12,10 +12,10 @@
   max-width: 276px;
   padding: 1px;
   text-align: left; // Reset given new insertion method
-  background-color: $popover-background;
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding;
-          background-clip: padding-box;
+  background-color: $popover-bg;
+  -webkit-bg-clip: padding-box;
+     -moz-bg-clip: padding;
+  background-clip: padding-box;
   border: 1px solid #ccc;
   border: 1px solid rgba(0,0,0,.2);
   border-radius: 6px;
@@ -34,11 +34,11 @@
 .popover-title {
   margin: 0; // reset heading margin
   padding: 8px 14px;
-  font-size: 14px;
+  font-size: $font-size-base;
   font-weight: normal;
   line-height: 18px;
-  background-color: $popover-title-background;
-  border-bottom: 1px solid darken($popover-title-background, 5%);
+  background-color: $popover-title-bg;
+  border-bottom: 1px solid darken($popover-title-bg, 5%);
   border-radius: 5px 5px 0 0;
 
   &:empty {
diff --git a/vendor/assets/stylesheets/bootstrap/_print.scss b/vendor/assets/stylesheets/bootstrap/_print.scss
index db274920..55f98a80 100644
--- a/vendor/assets/stylesheets/bootstrap/_print.scss
+++ b/vendor/assets/stylesheets/bootstrap/_print.scss
@@ -52,7 +52,7 @@
   }
 
   @page {
-    margin: 0.5cm;
+    margin: 2cm 0.5cm;
   }
 
   p,
@@ -68,7 +68,7 @@
   }
 
   // Bootstrap components
-  .navbar-toggle {
+  .navbar {
     display: none;
   }
 }
diff --git a/vendor/assets/stylesheets/bootstrap/_progress-bars.scss b/vendor/assets/stylesheets/bootstrap/_progress-bars.scss
index 3941e587..f3173f1f 100644
--- a/vendor/assets/stylesheets/bootstrap/_progress-bars.scss
+++ b/vendor/assets/stylesheets/bootstrap/_progress-bars.scss
@@ -44,8 +44,8 @@
 // Outer container
 .progress {
   overflow: hidden;
-  height: $line-height-base;
-  margin-bottom: $line-height-base;
+  height: $line-height-computed;
+  margin-bottom: $line-height-computed;
   background-color: $progress-bg;
   border-radius: $border-radius-base;
   @include box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
@@ -56,7 +56,7 @@
   float: left;
   width: 0%;
   height: 100%;
-  font-size: 12px;
+  font-size: $font-size-small;
   color: #fff;
   text-align: center;
   text-shadow: 0 -1px 0 rgba(0,0,0,.25);
@@ -115,4 +115,4 @@
   .progress-striped & {
     @include gradient-striped($progress-bar-info-bg);
   }
-}
\ No newline at end of file
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss b/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss
index bf43e8ef..0ced66f7 100644
--- a/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss
+++ b/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss
@@ -5,11 +5,27 @@
 
 // IE10 Metro responsive
 // Required for Windows 8 Metro split-screen snapping with IE10
+//
 // Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
 @-ms-viewport{
   width: device-width;
 }
 
+// IE10 on Windows Phone 8
+// IE10 on WP8 doesn't report CSS pixels, but actual device pixels. In
+// other words, say on a Lumia, you'll get 768px as the device width,
+// meaning users will see the tablet styles and not phone styles.
+//
+// Alternatively you can override this with JS (see source below), but
+// we won't be doing that here given our limited scope.
+//
+// Source: http://timkadlec.com/2013/01/windows-phone-8-and-device-width/
+@media screen and (max-width: 400px) {
+  @-ms-viewport{
+    width: 320px;
+  }
+}
+
 // Hide from screenreaders and browsers
 // Credit: HTML5 Boilerplate
 .hidden {
@@ -17,36 +33,36 @@
   visibility: hidden;
 }
 
-// Visibility utilities
-
-// For desktops
-.visible-phone     { display: none !important; }
+// For Phones
+.visible-phone     { display: inherit !important; }
 .visible-tablet    { display: none !important; }
-.hidden-phone      { }
-.hidden-tablet     { }
-.hidden-desktop    { display: none !important; }
-.visible-desktop   { display: inherit !important; }
+.visible-desktop   { display: none !important; }
+
+.hidden-phone      { display: none !important; }
+.hidden-tablet     { display: inherit !important; }
+.hidden-desktop    { display: inherit !important; }
+
 
 // Tablets & small desktops only
-@media (min-width: 768px) and (max-width: 979px) {
-  // Hide everything else
-  .hidden-desktop    { display: inherit !important; }
-  .visible-desktop   { display: none !important ; }
-  // Show
+@media (min-width: $screen-tablet) and (max-width: $screen-tablet-max) {
+  .visible-phone    { display: none !important; }
   .visible-tablet    { display: inherit !important; }
-  // Hide
+  .visible-desktop   { display: none !important; }
+
+  .hidden-phone      { display: inherit !important; }
   .hidden-tablet     { display: none !important; }
+  .hidden-desktop    { display: inherit !important; }
 }
 
-// Phones only
-@media (max-width: 767px) {
-  // Hide everything else
-  .hidden-desktop    { display: inherit !important; }
-  .visible-desktop   { display: none !important; }
-  // Show
-  .visible-phone     { display: inherit !important; } // Use inherit to restore previous behavior
-  // Hide
-  .hidden-phone      { display: none !important; }
+// For desktops
+@media (min-width: $screen-desktop) {
+  .visible-phone     { display: none !important; }
+  .visible-tablet    { display: none !important; }
+  .visible-desktop   { display: inherit !important; }
+
+  .hidden-phone      { display: inherit !important; }
+  .hidden-tablet     { display: inherit !important; }
+  .hidden-desktop    { display: none !important; }
 }
 
 // Print utilities
diff --git a/vendor/assets/stylesheets/bootstrap/_scaffolding.scss b/vendor/assets/stylesheets/bootstrap/_scaffolding.scss
index e6889938..cce0c736 100644
--- a/vendor/assets/stylesheets/bootstrap/_scaffolding.scss
+++ b/vendor/assets/stylesheets/bootstrap/_scaffolding.scss
@@ -21,31 +21,24 @@ html {
   -webkit-tap-highlight-color: rgba(0,0,0,0);
 }
 
-// Disable iOS/WinMobile font size changes
-@media screen and (max-device-width: 480px) {
-  html {
-    -webkit-text-size-adjust: 100%;
-        -ms-text-size-adjust: 100%;
-  }
-}
-
 body {
+  font-family: $font-family-base;
+  font-size: $font-size-base;
+  line-height: $line-height-base;
   color: $text-color;
-  background-color: $body-background;
+  background-color: $body-bg;
 }
 
 // Reset fonts for revelant elements
-body,
 input,
 button,
 select,
 textarea {
-  font-family: $font-family-base;
-  @include font-size();
-  line-height: $line-height-base;
+  font-family: inherit;
+  font-size: inherit;
+  line-height: inherit;
 }
 
-
 // Links
 // -------------------------
 
@@ -55,7 +48,7 @@ a {
 }
 a:hover,
 a:focus {
-  color: $link-color-hover;
+  color: $link-hover-color;
   text-decoration: underline;
 }
 a:focus {
diff --git a/vendor/assets/stylesheets/bootstrap/_tables.scss b/vendor/assets/stylesheets/bootstrap/_tables.scss
index 681beb8a..7c7d6f4f 100644
--- a/vendor/assets/stylesheets/bootstrap/_tables.scss
+++ b/vendor/assets/stylesheets/bootstrap/_tables.scss
@@ -5,9 +5,7 @@
 
 table {
   max-width: 100%;
-  background-color: $table-background;
-  border-collapse: collapse;
-  border-spacing: 0;
+  background-color: $table-bg;
 }
 th {
   text-align: left;
@@ -19,17 +17,19 @@ th {
 
 .table {
   width: 100%;
-  margin-bottom: $line-height-base;
+  margin-bottom: $line-height-computed;
   // Cells
-  th,
-  td {
+  thead > tr > th,
+  tbody > tr > th,
+  thead > tr > td,
+  tbody > tr > td {
     padding: 8px;
     line-height: $line-height-base;
     vertical-align: top;
-    border-top: 1px solid $table-border;
+    border-top: 1px solid $table-border-color;
   }
   // Bottom align for column headings
-  thead th {
+  thead > tr > th {
     vertical-align: bottom;
   }
   // Remove top border from thead by default
@@ -43,12 +43,12 @@ th {
   }
   // Account for multiple tbody instances
   tbody + tbody {
-    border-top: 2px solid $table-border;
+    border-top: 2px solid $table-border-color;
   }
 
   // Nesting
   .table {
-    background-color: $body-background;
+    background-color: $body-bg;
   }
 }
 
@@ -58,90 +58,94 @@ th {
 // -------------------------------
 
 .table-condensed {
-  th,
-  td {
+  thead > tr > th,
+  tbody > tr > th,
+  thead > tr > td,
+  tbody > tr > td {
     padding: 4px 5px;
   }
 }
 
 
-
 // BORDERED VERSION
 // ----------------
 
 .table-bordered {
-  border: 1px solid $table-border;
+  border: 1px solid $table-border-color;
   border-collapse: separate; // Done so we can round those corners!
   border-left: 0;
   border-radius: $border-radius-base;
-  th,
-  td {
-    border-left: 1px solid $table-border;
+  
+  > thead > tr > th,
+  > tbody > tr > th,
+  > thead > tr > td,
+  > tbody > tr > td {
+    border-left: 1px solid $table-border-color;
   }
   // Prevent a double border
-  caption + thead tr:first-child th,
-  caption + tbody tr:first-child th,
-  caption + tbody tr:first-child td,
-  colgroup + thead tr:first-child th,
-  colgroup + tbody tr:first-child th,
-  colgroup + tbody tr:first-child td,
-  thead:first-child tr:first-child th,
-  tbody:first-child tr:first-child th,
-  tbody:first-child tr:first-child td {
+  > caption + thead > tr:first-child th,
+  > caption + tbody > tr:first-child th,
+  > caption + tbody > tr:first-child td,
+  > colgroup + thead > tr:first-child th,
+  > colgroup + tbody > tr:first-child th,
+  > colgroup + tbody > tr:first-child td,
+  > thead:first-child > tr:first-child th,
+  > tbody:first-child > tr:first-child th,
+  > tbody:first-child > tr:first-child td {
     border-top: 0;
   }
   // For first th/td in the first row in the first thead or tbody
-  thead:first-child tr:first-child > th:first-child,
-  tbody:first-child tr:first-child > td:first-child,
-  tbody:first-child tr:first-child > th:first-child {
+  > thead:first-child > tr:first-child > th:first-child,
+  > tbody:first-child > tr:first-child > td:first-child,
+  > tbody:first-child > tr:first-child > th:first-child {
     border-top-left-radius: $border-radius-base;
   }
   // For last th/td in the first row in the first thead or tbody
-  thead:first-child tr:first-child > th:last-child,
-  tbody:first-child tr:first-child > td:last-child,
-  tbody:first-child tr:first-child > th:last-child {
+  > thead:first-child > tr:first-child > th:last-child,
+  > tbody:first-child > tr:first-child > td:last-child,
+  > tbody:first-child > tr:first-child > th:last-child {
     border-top-right-radius: $border-radius-base;
   }
   // For first th/td (can be either) in the last row in the last thead, tbody, and tfoot
-  thead:last-child tr:last-child > th:first-child,
-  tbody:last-child tr:last-child > td:first-child,
-  tbody:last-child tr:last-child > th:first-child,
-  tfoot:last-child tr:last-child > td:first-child,
-  tfoot:last-child tr:last-child > th:first-child {
+  > thead:last-child > tr:last-child > th:first-child,
+  > tbody:last-child > tr:last-child > td:first-child,
+  > tbody:last-child > tr:last-child > th:first-child,
+  > tfoot:last-child > tr:last-child > td:first-child,
+  > tfoot:last-child > tr:last-child > th:first-child {
     border-bottom-left-radius: $border-radius-base;
   }
   // For last th/td (can be either) in the last row in the last thead, tbody, and tfoot
-  thead:last-child tr:last-child > th:last-child,
-  tbody:last-child tr:last-child > td:last-child,
-  tbody:last-child tr:last-child > th:last-child,
-  tfoot:last-child tr:last-child > td:last-child,
-  tfoot:last-child tr:last-child > th:last-child {
+  > thead:last-child > tr:last-child > th:last-child,
+  > tbody:last-child > tr:last-child > td:last-child,
+  > tbody:last-child > tr:last-child > th:last-child,
+  > tfoot:last-child > tr:last-child > td:last-child,
+  > tfoot:last-child > tr:last-child > th:last-child {
     border-bottom-right-radius: $border-radius-base;
   }
 
   // Clear border-radius for first and last td in the last row in the last tbody for table with tfoot
-  tfoot + tbody:last-child tr:last-child > td:first-child {
+  > tfoot + tbody:last-child > tr:last-child > td:first-child {
     border-bottom-left-radius: 0;
   }
-  tfoot + tbody:last-child tr:last-child > td:last-child {
+  > tfoot + tbody:last-child > tr:last-child > td:last-child {
     border-bottom-right-radius: 0;
   }
 
   // Special fixes to round the left border on the first td/th
-  caption + thead tr:first-child th:first-child,
-  caption + tbody tr:first-child td:first-child,
-  colgroup + thead tr:first-child th:first-child,
-  colgroup + tbody tr:first-child td:first-child {
+  > caption + thead > tr:first-child > th:first-child,
+  > caption + tbody > tr:first-child > td:first-child,
+  > colgroup + thead > tr:first-child > th:first-child,
+  > colgroup + tbody > tr:first-child > td:first-child {
     border-top-left-radius: $border-radius-base;
   }
-  caption + thead tr:first-child th:last-child,
-  caption + tbody tr:first-child td:last-child,
-  colgroup + thead tr:first-child th:last-child,
-  colgroup + tbody tr:first-child td:last-child {
+  > caption + thead > tr:first-child > th:last-child,
+  > caption + tbody > tr:first-child > td:last-child,
+  > colgroup + thead > tr:first-child > th:last-child,
+  > colgroup + tbody > tr:first-child > td:last-child {
     border-top-right-radius: $border-radius-base;
   }
 
-}
+}  
 
 
 
@@ -153,7 +157,7 @@ th {
   > tbody {
     > tr:nth-child(odd) > td,
     > tr:nth-child(odd) > th {
-      background-color: $table-background-accent;
+      background-color: $table-bg-accent;
     }
   }
 }
@@ -168,7 +172,7 @@ th {
   > tbody {
     > tr:hover > td,
     > tr:hover > th {
-      background-color: $table-background-hover;
+      background-color: $table-bg-hover;
     }
   }
 }
@@ -179,12 +183,12 @@ th {
 // -----------------
 
 // Reset default table behavior
-table col[class^="span"] {
+table col[class*="col-span-"] {
   float: none;
   display: table-column;
 }
-table td[class^="span"],
-table th[class^="span"] {
+table td[class*="col-span-"],
+table th[class*="col-span-"] {
   float: none;
   display: table-cell;
 }
@@ -197,17 +201,20 @@ table th[class^="span"] {
   > td.success,
   > th.success,
   &.success > td {
-    background-color: $state-success-background;
+    background-color: $state-success-bg;
+    border-color: $state-success-border;
   }
   > td.error,
   > th.error,
-  &.error > td {
-    background-color: $state-error-background;
+  &.danger > td {
+    background-color: $state-danger-bg;
+    border-color: $state-danger-border;
   }
   > td.warning,
   > th.warning,
   &.warning > td {
-    background-color: $state-warning-background;
+    background-color: $state-warning-bg;
+    border-color: $state-warning-border;
   }
 }
 
@@ -216,16 +223,19 @@ table th[class^="span"] {
   > td.success:hover,
   > th.success:hover,
   &.success:hover > td {
-    background-color: darken($state-success-background, 5%);
+    background-color: darken($state-success-bg, 5%);
+    border-color: darken($state-success-border, 5%);
   }
-  > td.error:hover,
-  > th.error:hover,
-  &.error:hover > td {
-    background-color: darken($state-error-background, 5%);
+  > td.danger:hover,
+  > th.danger:hover,
+  &.danger:hover > td {
+    background-color: darken($state-danger-bg, 5%);
+    border-color: darken($state-danger-border, 5%);
   }
   > td.warning:hover,
   > th.warning:hover,
   &.warning:hover > td {
-    background-color: darken($state-warning-background, 5%);
+    background-color: darken($state-warning-bg, 5%);
+    border-color: darken($state-warning-border, 5%);
   }
 }
diff --git a/vendor/assets/stylesheets/bootstrap/_thumbnails.scss b/vendor/assets/stylesheets/bootstrap/_thumbnails.scss
index c8e00ca0..ff46175a 100644
--- a/vendor/assets/stylesheets/bootstrap/_thumbnails.scss
+++ b/vendor/assets/stylesheets/bootstrap/_thumbnails.scss
@@ -12,8 +12,9 @@
 .img-thumbnail {
   padding: 4px;
   line-height: $line-height-base;
-  border: 1px solid #ddd;
-  border-radius: $border-radius-base;
+  background-color: $thumbnail-bg;
+  border: 1px solid $thumbnail-border;
+  border-radius: $thumbnail-border-radius;
   @include transition(all .2s ease-in-out);
 }
 .thumbnail {
@@ -38,5 +39,5 @@ a.thumbnail:focus {
 }
 .thumbnail .caption {
   padding: 9px;
-  color: $gray;
+  color: $thumbnail-caption-color;
 }
diff --git a/vendor/assets/stylesheets/bootstrap/_tooltip.scss b/vendor/assets/stylesheets/bootstrap/_tooltip.scss
index f20e4b21..803a3d78 100644
--- a/vendor/assets/stylesheets/bootstrap/_tooltip.scss
+++ b/vendor/assets/stylesheets/bootstrap/_tooltip.scss
@@ -9,7 +9,7 @@
   z-index: $zindex-tooltip;
   display: block;
   visibility: visible;
-  font-size: 11px;
+  font-size: $font-size-mini;
   line-height: 1.4;
   @include opacity(0);
 
@@ -27,7 +27,7 @@
   color: $tooltip-color;
   text-align: center;
   text-decoration: none;
-  background-color: $tooltip-background;
+  background-color: $tooltip-bg;
   border-radius: $border-radius-base;
 }
 
diff --git a/vendor/assets/stylesheets/bootstrap/_type.scss b/vendor/assets/stylesheets/bootstrap/_type.scss
index e0053510..72f584e2 100644
--- a/vendor/assets/stylesheets/bootstrap/_type.scss
+++ b/vendor/assets/stylesheets/bootstrap/_type.scss
@@ -7,13 +7,13 @@
 // -------------------------
 
 p {
-  margin: 0 0 ($line-height-base / 2);
+  margin: 0 0 ($line-height-computed / 2);
 }
 .lead {
-  margin-bottom: $line-height-base;
+  margin-bottom: $line-height-computed;
   @include font-size(($font-size-base * 1.5));
   font-weight: 200;
-  line-height: 1.25;
+  line-height: 1.4;
 }
 
 
@@ -28,17 +28,17 @@ em      { font-style: italic; }
 cite    { font-style: normal; }
 
 // Utility classes
-.muted               { color: $grayLight; }
-a.muted:hover,
-a.muted:focus        { color: darken($grayLight, 10%); }
+.text-muted               { color: $gray-light; }
+a.text-muted:hover,
+a.muted:focus        { color: darken($gray-light, 10%); }
 
 .text-warning        { color: $state-warning-text; }
 a.text-warning:hover,
 a.text-warning:focus { color: darken($state-warning-text, 10%); }
 
-.text-error          { color: $state-error-text; }
-a.text-error:hover,
-a.text-error:focus   { color: darken($state-error-text, 10%); }
+.text-danger          { color: $state-danger-text; }
+a.text-danger:hover,
+a.text-danger:focus   { color: darken($state-danger-text, 10%); }
 
 .text-success        { color: $state-success-text; }
 a.text-success:hover,
@@ -56,42 +56,37 @@ h1, h2, h3, h4, h5, h6,
 .h1, .h2, .h3, .h4, .h5, .h6 {
   font-family: $headings-font-family;
   font-weight: $headings-font-weight;
-  line-height: $line-height-base;
-  text-rendering: optimizelegibility; // Fix the character spacing for headings
+  line-height: $line-height-headings;
   small {
     font-weight: normal;
     line-height: 1;
-    color: $grayLight;
+    color: $gray-light;
   }
 }
 
 h1,
 h2,
 h3 {
-  margin-top: $line-height-base;
-  margin-bottom: ($line-height-base / 2);
-  line-height: ($line-height-base * 2);
-}
-h3 {
-  line-height: ($line-height-base * 1.5);
+  margin-top: $line-height-computed;
+  margin-bottom: ($line-height-computed / 2);
 }
 h4,
 h5,
 h6 {
-  margin-top: ($line-height-base / 2);
-  margin-bottom: ($line-height-base / 2);
+  margin-top: ($line-height-computed / 2);
+  margin-bottom: ($line-height-computed / 2);
 }
 
-h1, .h1 { font-size: ($font-size-base * 2.75); font-size: 4rem; } // ~38px
-h2, .h2 { font-size: ($font-size-base * 2.25); font-size: 3rem; } // ~32px
-h3, .h3 { font-size: ($font-size-base * 1.75); font-size: 2.5rem; } // ~24px
-h4, .h4 { font-size: ($font-size-base * 1.25); font-size: 2rem; } // ~18px
-h5, .h5 { font-size:  $font-size-base; font-size: 1.6rem; }
-h6, .h6 { font-size: ($font-size-base * 0.85); font-size: 1.2rem; } // ~12px
+h1, .h1 { font-size: ceil($font-size-base * 2.70); } // ~38px
+h2, .h2 { font-size: ceil($font-size-base * 2.25); } // ~32px
+h3, .h3 { font-size: ceil($font-size-base * 1.70); } // ~24px
+h4, .h4 { font-size: ceil($font-size-base * 1.25); } // ~18px
+h5, .h5 { font-size:  $font-size-base; }
+h6, .h6 { font-size: ceil($font-size-base * 0.85); } // ~12px
 
-h1 small, .h1 small { font-size: ($font-size-base * 1.75); } // ~24px
-h2 small, .h2 small { font-size: ($font-size-base * 1.25); } // ~18px
-h3 small, .h3 small { font-size: $font-size-base; }
+h1 small, .h1 small { font-size: ceil($font-size-base * 1.70); } // ~24px
+h2 small, .h2 small { font-size: ceil($font-size-base * 1.25); } // ~18px
+h3 small, .h3 small,
 h4 small, .h4 small { font-size: $font-size-base; }
 
 
@@ -99,9 +94,9 @@ h4 small, .h4 small { font-size: $font-size-base; }
 // -------------------------
 
 .page-header {
-  padding-bottom: (($line-height-base / 2) - 1);
-  margin: ($line-height-base * 2) 0 $line-height-base;
-  border-bottom: 1px solid $grayLighter;
+  padding-bottom: (($line-height-computed / 2) - 1);
+  margin: ($line-height-computed * 2) 0 $line-height-computed;
+  border-bottom: 1px solid $gray-lighter;
 }
 
 
@@ -113,7 +108,7 @@ h4 small, .h4 small { font-size: $font-size-base; }
 ul,
 ol {
   padding: 0;
-  margin: 0 0 ($line-height-base / 2) 25px;
+  margin: 0 0 ($line-height-computed / 2) 25px;
 }
 ul ul,
 ul ol,
@@ -126,23 +121,25 @@ li {
 }
 
 // List options
+
 // Unstyled keeps list items block level, just removes list-style
-.list-unstyled,
-// Inline turns list items into inline-block
-.list-inline {
+@mixin list-unstyled {
   margin-left: 0;
   list-style: none;
 }
-// Single-line list items
-.list-inline > li {
-  display: inline-block;
-  padding-left: 5px;
-  padding-right: 5px;
+// Inline turns list items into inline-block
+.list-inline {
+  @include list-unstyled();
+  > li {
+    display: inline-block;
+    padding-left: 5px;
+    padding-right: 5px;
+  }
 }
 
 // Description Lists
 dl {
-  margin-bottom: $line-height-base;
+  margin-bottom: $line-height-computed;
 }
 dt,
 dd {
@@ -156,7 +153,7 @@ dd {
 }
 // Horizontal layout (like forms)
 .dl-horizontal {
-  @include clear_float(); // Ensure dl clears floats if empty dd elements present
+  @include clearfix(); // Ensure dl clears floats if empty dd elements present
   dt {
     float: left;
     width: ($component-offset-horizontal - 20);
@@ -174,7 +171,7 @@ dd {
 
 // Horizontal rules
 hr {
-  margin: $line-height-base 0;
+  margin: $line-height-computed 0;
   border: 0;
   border-top: 1px solid $hr-border;
   border-bottom: 1px solid #fff;
@@ -186,7 +183,7 @@ abbr[title],
 // Added data-* attribute to help out our tooltip plugin, per https://github.com/twitter/bootstrap/issues/5257
 abbr[data-original-title] {
   cursor: help;
-  border-bottom: 1px dotted $grayLight;
+  border-bottom: 1px dotted $gray-light;
 }
 abbr.initialism {
   font-size: 90%;
@@ -195,19 +192,21 @@ abbr.initialism {
 
 // Blockquotes
 blockquote {
-  padding: 0 0 0 15px;
-  margin: 0 0 $line-height-base;
-  border-left: 5px solid $grayLighter;
+  padding: ($line-height-computed / 2) $line-height-computed;
+  margin: 0 0 $line-height-computed;
+  border-left: 5px solid $gray-lighter;
   p {
-    margin-bottom: 0;
     font-size: ($font-size-base * 1.25);
     font-weight: 300;
     line-height: 1.25;
   }
+  p:last-child {
+    margin-bottom: 0;
+  }
   small {
     display: block;
     line-height: $line-height-base;
-    color: $grayLight;
+    color: $gray-light;
     &:before {
       content: '\2014 \00A0';
     }
@@ -218,7 +217,7 @@ blockquote {
     float: right;
     padding-right: 15px;
     padding-left: 0;
-    border-right: 5px solid $grayLighter;
+    border-right: 5px solid $gray-lighter;
     border-left: 0;
     p,
     small {
@@ -246,7 +245,7 @@ blockquote:after {
 // Addresses
 address {
   display: block;
-  margin-bottom: $line-height-base;
+  margin-bottom: $line-height-computed;
   font-style: normal;
   line-height: $line-height-base;
 }
diff --git a/vendor/assets/stylesheets/bootstrap/_utilities.scss b/vendor/assets/stylesheets/bootstrap/_utilities.scss
index ffbc095e..955ab476 100644
--- a/vendor/assets/stylesheets/bootstrap/_utilities.scss
+++ b/vendor/assets/stylesheets/bootstrap/_utilities.scss
@@ -7,7 +7,7 @@
 // -------------------------
 
 .clearfix {
-  @include clear_float();
+  @include clearfix();
 }
 .pull-right {
   float: right;
diff --git a/vendor/assets/stylesheets/bootstrap/_variables.scss b/vendor/assets/stylesheets/bootstrap/_variables.scss
index 60269e9b..307b169b 100644
--- a/vendor/assets/stylesheets/bootstrap/_variables.scss
+++ b/vendor/assets/stylesheets/bootstrap/_variables.scss
@@ -10,11 +10,11 @@
 // Grays
 // -------------------------
 
-$grayDarker:            #222 !default;
-$grayDark:              #333 !default;
-$gray:                  #555 !default;
-$grayLight:             #999 !default;
-$grayLighter:           #eee !default;
+$gray-darker:            lighten(#000, 13.5%); // #222
+$gray-dark:              lighten(#000, 20%);   // #333
+$gray:                   lighten(#000, 33.5%); // #555
+$gray-light:             lighten(#000, 60%);   // #999
+$gray-lighter:           lighten(#000, 93.5%); // #eee
 
 // Brand colors
 // -------------------------
@@ -28,14 +28,14 @@ $brand-info:            #5bc0de !default;
 // Scaffolding
 // -------------------------
 
-$body-background:       #fff !default;
-$text-color:            $grayDark !default;
+$body-bg:               #fff !default;
+$text-color:            $gray-dark !default;
 
 // Links
 // -------------------------
 
 $link-color:            #428bca !default;
-$link-color-hover:      darken($link-color, 15%) !default;
+$link-hover-color:      darken($link-color, 15%) !default;
 
 // Typography
 // -------------------------
@@ -45,18 +45,20 @@ $font-family-serif:       Georgia, "Times New Roman", Times, serif !default;
 $font-family-monospace:   Monaco, Menlo, Consolas, "Courier New", monospace !default;
 $font-family-base:        $font-family-sans-serif !default;
 
-$font-size-base:          14 !default;
-$font-size-large:         ($font-size-base * 1.25) !default; // ~18px
-$font-size-small:         ($font-size-base * 0.85) !default; // ~12px
-$font-size-mini:          ($font-size-base * 0.75) !default; // ~11px
+$font-size-base:          14px !default;
+$font-size-large:         ceil($font-size-base * 1.25) !default; // ~18px
+$font-size-small:         ceil($font-size-base * 0.85) !default; // ~12px
+$font-size-mini:          ceil($font-size-base * 0.75) !default; // ~11px
 
-$line-height-base:        20px !default;
+$line-height-base:        1.428 !default; // 20/14
+$line-height-computed:    ceil($font-size-base * $line-height-base) !default; // ~20px
+$line-height-headings:    1.1 !default;
 
 $headings-font-family:    inherit !default; // empty to use BS default, $font-family-base
 $headings-font-weight:    500 !default;
 
 
-// Component sizing
+// Component
 // -------------------------
 // Based on 14px font-size and 1.5 line-height
 
@@ -68,78 +70,80 @@ $border-radius-base:      4px !default;
 $border-radius-large:     6px !default;
 $border-radius-small:     3px !default;
 
+$component-active-bg:     $brand-primary;
+
 
 // Tables
 // -------------------------
 
-$table-background:                   transparent !default; // overall background-color
-$table-background-accent:            #f9f9f9 !default; // for striping
-$table-background-hover:             #f5f5f5 !default; // for hover
+$table-bg:                           transparent !default; // overall background-color
+$table-bg-accent:                    #f9f9f9 !default; // for striping
+$table-bg-hover:                     #f5f5f5 !default; // for hover
 
-$table-border:                       #ddd !default; // table and cell border
+$table-border-color:                 #ddd !default; // table and cell border
 
 
 // Buttons
 // -------------------------
 
-$btn-color:                          #fff !default;
-$btn-background:                     #a7a9aa !default;
-$btn-border:                         $btn-background !default;
+$btn-default-color:              #fff !default;
+$btn-default-bg:                 #a7a9aa !default;
+$btn-default-border:             $btn-default-bg !default;
 
-$btn-background-primary:             $brand-primary !default;
-$btn-border-primary:                 $btn-background-primary !default;
+$btn-primary-color:              $btn-default-color !default;
+$btn-primary-bg:                 $brand-primary !default;
+$btn-primary-border:             $btn-primary-bg !default;
 
-$btn-background-success:             $brand-success !default;
-$btn-border-success:                 $btn-background-success !default;
+$btn-success-color:              $btn-default-color !default;
+$btn-success-bg:                 $brand-success !default;
+$btn-success-border:             $btn-success-bg !default;
 
-$btn-background-warning:             $brand-warning !default;
-$btn-border-warning:                 $btn-background-warning !default;
+$btn-warning-color:              $btn-default-color !default;
+$btn-warning-bg:                 $brand-warning !default;
+$btn-warning-border:             $btn-warning-bg !default;
 
-$btn-background-danger:              $brand-danger !default;
-$btn-border-danger:                  $btn-background-danger !default;
+$btn-danger-color:               $btn-default-color !default;
+$btn-danger-bg:                  $brand-danger !default;
+$btn-danger-border:              $btn-danger-bg !default;
 
-$btn-background-info:                $brand-info !default;
-$btn-border-info:                    $btn-background-info !default;
+$btn-info-color:                 $btn-default-color !default;
+$btn-info-bg:                    $brand-info !default;
+$btn-info-border:                $btn-info-bg !default;
 
 
 
 // Forms
 // -------------------------
 
-$input-background:               #fff !default;
-$input-background-disabled:      $grayLighter !default;
+$input-bg:                       #fff !default;
+$input-bg-disabled:              $gray-lighter !default;
 
 $input-border:                   #ccc !default;
 $input-border-radius:            $border-radius-base !default;
-$input-border-radius-search:     20px !default;
 
-$input-color-placeholder:        $grayLight !default;
+$input-color-placeholder:        $gray-light !default;
 
-$input-height-base:              ($line-height-base + 14px) !default; // base line-height + 12px vertical padding + 2px top/bottom border
-$input-height-large:             ($line-height-base + 24px) !default; // base line-height + 22px vertical padding + 2px top/bottom border
-$input-height-small:             ($line-height-base + 6px) !default;  // base line-height + 4px vertical padding + 2px top/bottom border
+$input-height-base:              ($line-height-computed + 14px) !default; // base line-height + 12px vertical padding + 2px top/bottom border
+$input-height-large:             ($line-height-computed + 24px) !default; // base line-height + 22px vertical padding + 2px top/bottom border
+$input-height-small:             ($line-height-computed + 6px) !default;  // base line-height + 4px vertical padding + 2px top/bottom border
 
-// adjust min-height on input sizes
-
-
-$form-actions-background:        #f5f5f5 !default;
+$form-actions-bg:                 #f5f5f5 !default;
 
 
 // Dropdowns
 // -------------------------
 
-$dropdown-background:            #fff !default;
+$dropdown-bg:                    #fff !default;
 $dropdown-border:                rgba(0,0,0,.15) !default;
 $dropdown-divider-top:           #e5e5e5 !default;
 $dropdown-divider-bottom:        #fff !default;
 
-$dropdown-link-color:            $grayDark !default;
-$dropdown-link-color-hover:      #fff !default;
-$dropdown-link-color-active:     #fff !default;
-
-$dropdown-link-background-active:  $link-color !default;
-$dropdown-link-background-hover:   $dropdown-link-background-active !default;
+$dropdown-link-active-color:     #fff !default;
+$dropdown-link-active-bg:        $component-active-bg !default;
 
+$dropdown-link-color:            $gray-dark !default;
+$dropdown-link-hover-color:      #fff !default;
+$dropdown-link-hover-bg:         $dropdown-link-active-bg !default;
 
 
 // COMPONENT VARIABLES
@@ -167,10 +171,6 @@ $glyphicons-font-path:          "../fonts" !default;
 // Navbar
 // -------------------------
 
-// Responsive collapsing
-// $navbar-collapse-width:            979px;
-// $navbar-collapse-width-desktop:    $navbar-collapse-width + 1;
-
 // Basics of a navbar
 $navbar-height:                    50px !default;
 $navbar-text:                      #777 !default;
@@ -178,59 +178,56 @@ $navbar-bg:                        #eee !default;
 
 // Navbar links
 $navbar-link-color:                #777 !default;
-$navbar-link-color-hover:          #333 !default;
-$navbar-link-bg-hover:             transparent !default;
-$navbar-link-color-active:         #555 !default;
-$navbar-link-bg-active:            darken($navbar-bg, 10%) !default;
-$navbar-link-color-disabled:       #ccc !default;
-$navbar-link-bg-disabled:          transparent !default;
+$navbar-link-hover-color:          #333 !default;
+$navbar-link-hover-bg:             transparent !default;
+$navbar-link-active-color:         #555 !default;
+$navbar-link-active-bg:            darken($navbar-bg, 10%) !default;
+$navbar-link-disabled-color:       #ccc !default;
+$navbar-link-disabled-bg:          transparent !default;
 
 // Navbar brand label
 $navbar-brand-color:               $navbar-link-color !default;
-$navbar-brand-color-hover:         darken($navbar-link-color, 10%) !default;
-$navbar-brand-bg-hover:            transparent !default;
-
+$navbar-brand-hover-color:         darken($navbar-link-color, 10%) !default;
+$navbar-brand-hover-bg:            transparent !default;
 
 // Inverted navbar
-$navbar-inverse-text:                       $grayLight !default;
+$navbar-inverse-color:                      $gray-light !default;
 $navbar-inverse-bg:                         #222 !default;
 
 // Inverted navbar links
-$navbar-inverse-link-color:                 $grayLight !default;
-$navbar-inverse-link-color-hover:           #fff !default;
-$navbar-inverse-link-bg-hover:              transparent !default;
-$navbar-inverse-link-color-active:          $navbar-inverse-link-color-hover !default;
-$navbar-inverse-link-bg-active:             darken($navbar-inverse-bg, 10%) !default;
-$navbar-inverse-link-color-disabled:        #444 !default;
-$navbar-inverse-link-bg-disabled:           transparent !default;
+$navbar-inverse-link-color:                 $gray-light !default;
+$navbar-inverse-link-hover-color:           #fff !default;
+$navbar-inverse-link-hover-bg:              transparent !default;
+$navbar-inverse-link-active-color:          $navbar-inverse-link-hover-color !default;
+$navbar-inverse-link-active-bg:             darken($navbar-inverse-bg, 10%) !default;
+$navbar-inverse-link-disabled-color:        #444 !default;
+$navbar-inverse-link-disabled-bg:           transparent !default;
 
 // Inverted navbar brand label
 $navbar-inverse-brand-color:                $navbar-inverse-link-color !default;
-$navbar-inverse-brand-color-hover:          #fff !default;
-$navbar-inverse-brand-bg-hover:             transparent !default;
-
+$navbar-inverse-brand-hover-color:          #fff !default;
+$navbar-inverse-brand-hover-bg:             transparent !default;
 
 // Inverted navbar search
 // Normal navbar needs no special styles or vars
-$navbar-inverse-search-background:          lighten($navbar-inverse-bg, 25%) !default;
-$navbar-inverse-search-background-focus:    #fff !default;
+$navbar-inverse-search-bg:                  lighten($navbar-inverse-bg, 25%) !default;
+$navbar-inverse-search-bg-focus:            #fff !default;
 $navbar-inverse-search-border:              $navbar-inverse-bg !default;
 $navbar-inverse-search-placeholder-color:   #ccc !default;
 
 
-
 // Pagination
 // -------------------------
 
-$pagination-background:                #fff !default;
-$pagination-background-active:         #f5f5f5 !default;
+$pagination-bg:                        #fff !default;
 $pagination-border:                    #ddd !default;
+$pagination-active-bg:                 #f5f5f5 !default;
 
 
 // Jumbotron
 // -------------------------
 
-$jumbotron-background:           $grayLighter !default;
+$jumbotron-bg:                   $gray-lighter !default;
 $jumbotron-heading-color:        inherit !default;
 $jumbotron-lead-color:           inherit !default;
 
@@ -239,33 +236,33 @@ $jumbotron-lead-color:           inherit !default;
 // -------------------------
 
 $state-warning-text:             #c09853 !default;
-$state-warning-background:       #fcf8e3 !default;
-$state-warning-border:           darken(adjust-hue($state-warning-background, -10), 3%) !default;
+$state-warning-bg:               #fcf8e3 !default;
+$state-warning-border:           darken(adjust-hue($state-warning-bg, -10), 3%) !default;
 
-$state-error-text:               #b94a48 !default;
-$state-error-background:         #f2dede !default;
-$state-error-border:             darken(adjust-hue($state-error-background, -10), 3%) !default;
+$state-danger-text:              #b94a48 !default;
+$state-danger-bg:                #f2dede !default;
+$state-danger-border:            darken(adjust-hue($state-danger-bg, -10), 3%) !default;
 
 $state-success-text:             #468847 !default;
-$state-success-background:       #dff0d8 !default;
-$state-success-border:           darken(adjust-hue($state-success-background, -10), 5%) !default;
+$state-success-bg:               #dff0d8 !default;
+$state-success-border:           darken(adjust-hue($state-success-bg, -10), 5%) !default;
 
 $state-info-text:                #3a87ad !default;
-$state-info-background:          #d9edf7 !default;
-$state-info-border:              darken(adjust-hue($state-info-background, -10), 7%) !default;
+$state-info-bg:                  #d9edf7 !default;
+$state-info-border:              darken(adjust-hue($state-info-bg, -10), 7%) !default;
 
 
 // Tooltips and popovers
 // -------------------------
 $tooltip-color:               #fff !default;
-$tooltip-background:          rgba(0,0,0,.9) !default;
+$tooltip-bg:                  rgba(0,0,0,.9) !default;
 $tooltip-arrow-width:         5px !default;
-$tooltip-arrow-color:         $tooltip-background !default;
+$tooltip-arrow-color:         $tooltip-bg !default;
 
-$popover-background:          #fff !default;
+$popover-bg:                  #fff !default;
 $popover-arrow-width:         10px !default;
 $popover-arrow-color:         #fff !default;
-$popover-title-background:    darken($popover-background, 3%) !default;
+$popover-title-bg:            darken($popover-bg, 3%) !default;
 
 // Special enhancement for popovers
 $popover-arrow-outer-width:   ($popover-arrow-width + 1) !default;
@@ -274,17 +271,38 @@ $popover-arrow-outer-color:   rgba(0,0,0,.25) !default;
 
 // Labels
 // -------------------------
-$label-success-background:    $brand-success !default;
-$label-info-background:       $brand-info !default;
-$label-warning-background:    $brand-warning !default;
-$label-danger-background:     $brand-danger !default;
+$label-success-bg:            $brand-success !default;
+$label-info-bg:               $brand-info !default;
+$label-warning-bg:            $brand-warning !default;
+$label-danger-bg:             $brand-danger !default;
 
 
 // Modals
 // -------------------------
-
 $modal-inner-padding:         20px !default;
 
+$modal-title-padding:         15px !default;
+$modal-title-line-height:     $line-height-base !default;
+
+// Alerts
+// -------------------------
+$alert-bg:                    $state-warning-bg !default;
+$alert-text:                  $state-warning-text !default;
+$alert-border:                $state-warning-border !default;
+$alert-border-radius:         $border-radius-base !default;
+
+$alert-success-bg:            $state-success-bg !default;
+$alert-success-text:          $state-success-text !default;
+$alert-success-border:        $state-success-border !default;
+
+$alert-danger-bg:             $state-danger-bg !default;
+$alert-danger-text:           $state-danger-text !default;
+$alert-danger-border:         $state-danger-border !default;
+
+$alert-info-bg:               $state-info-bg !default;
+$alert-info-text:             $state-info-text !default;
+$alert-info-border:           $state-info-border !default;
+
 
 // Progress bars
 // -------------------------
@@ -296,23 +314,98 @@ $progress-bar-danger-bg:      $brand-danger !default;
 $progress-bar-info-bg:        $brand-info !default;
 
 
+// List group
+// -------------------------
+$list-group-bg:               #fff !default;
+$list-group-border:           #ddd !default;
+$list-group-border-radius:    $border-radius-base !default;
+
+$list-group-hover-bg:         #f5f5f5 !default;
+$list-group-active-color:     #fff !default;
+$list-group-active-bg:        $component-active-bg !default;
+$list-group-active-border:    $list-group-active-bg !default;
+
+// Panels
+// -------------------------
+$panel-bg:                    #fff !default;
+$panel-border:                #ddd !default;
+$panel-border-radius:         $border-radius-base !default;
+$panel-heading-bg:            #f5f5f5 !default;
+
+$panel-primary-text:          #fff !default;
+$panel-primary-border:        $brand-primary !default;
+$panel-primary-heading-bg:    $brand-primary !default;
+
+$panel-success-text:          $state-success-text !default;
+$panel-success-border:        $state-success-border !default;
+$panel-success-heading-bg:    $state-success-bg !default;
+
+$panel-warning-text:          $state-warning-text !default;
+$panel-warning-border:        $state-warning-border !default;
+$panel-warning-heading-bg:    $state-warning-bg !default;
+
+$panel-danger-text:           $state-danger-text !default;
+$panel-danger-border:         $state-danger-border !default;
+$panel-danger-heading-bg:     $state-danger-bg !default;
+
+$panel-info-text:             $state-info-text !default;
+$panel-info-border:           $state-info-border !default;
+$panel-info-heading-bg:       $state-info-bg !default;
+
+
+// Thumbnails
+// -------------------------
+$thumbnail-caption-color:     $text-color !default;
+$thumbnail-bg:                $body-bg !default;
+$thumbnail-border:            #ddd !default;
+$thumbnail-border-radius:     $border-radius-base !default;
+
+
+// Wells
+// -------------------------
+$well-bg:                     #f5f5f5 !default;
+
+
 // Miscellaneous
 // -------------------------
 
 // Hr border color
-$hr-border:                   $grayLighter !default;
+$hr-border:                   $gray-lighter !default;
 
 // Horizontal forms & lists
 $component-offset-horizontal: 180px !default;
 
-// Wells
-$well-background:             #f5f5f5 !default;
 
+// Media queries breakpoints
+// --------------------------------------------------
+
+// Tiny screen / phone
+$screen-tiny:                480px;
+$screen-phone:               $screen-tiny;
+
+// Small screen / tablet
+$screen-small:               768px;
+$screen-tablet:              $screen-small;
+
+// Medium screen / desktop
+$screen-medium:              992px;
+$screen-desktop:             $screen-medium;
+
+// So media queries don't overlap when required, provide a maximum
+$screen-small-max:           ($screen-medium - 1);
+$screen-tablet-max:          $screen-small-max;
+
+// Large screen / wide desktop
+$screen-large:               1200px;
+$screen-large-desktop:       $screen-large;
 
 
 // Grid system
 // --------------------------------------------------
 
-$grid-columns:              12 !default;
-$grid-gutter-width:         30px !default;
-$grid-float-breakpoint:     768px !default;
+// Number of columns in the grid system
+$grid-columns:              12;
+// Padding, to be divided by two and applied to the left and right of all columns
+$grid-gutter-width:         30px;
+// Point at which the navbar stops collapsing
+$grid-float-breakpoint:     $screen-tablet;
diff --git a/vendor/assets/stylesheets/bootstrap/_wells.scss b/vendor/assets/stylesheets/bootstrap/_wells.scss
index 8fdf9d3c..3e9643c5 100644
--- a/vendor/assets/stylesheets/bootstrap/_wells.scss
+++ b/vendor/assets/stylesheets/bootstrap/_wells.scss
@@ -8,8 +8,8 @@
   min-height: 20px;
   padding: 19px;
   margin-bottom: 20px;
-  background-color: $well-background;
-  border: 1px solid darken($well-background, 7%);
+  background-color: $well-bg;
+  border: 1px solid darken($well-bg, 7%);
   border-radius: $border-radius-base;
   @include box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
   blockquote {
diff --git a/vendor/assets/stylesheets/bootstrap/bootstrap.scss b/vendor/assets/stylesheets/bootstrap/bootstrap.scss
index e6dc477d..d0b7a675 100644
--- a/vendor/assets/stylesheets/bootstrap/bootstrap.scss
+++ b/vendor/assets/stylesheets/bootstrap/bootstrap.scss
@@ -30,6 +30,8 @@
 @import "bootstrap/component-animations";
 @import "bootstrap/glyphicons";
 @import "bootstrap/dropdowns";
+@import "bootstrap/list-group";
+@import "bootstrap/panels";
 @import "bootstrap/wells";
 @import "bootstrap/close";