bootstrap 4.0.0.alpha3 → 4.0.0.alpha3.1

data/assets/stylesheets/bootstrap/utilities/_flex.scss

@@ -0,0 +1,37 @@
+// Flex variation
+//
+// Custom styles for additional flex alignment options.
+
+@if $enable-flex {
+  @each $breakpoint in map-keys($grid-breakpoints) {
+    // Flex column reordering
+    @include media-breakpoint-up($breakpoint) {
+      .flex-#{$breakpoint}-first { order: -1; }
+      .flex-#{$breakpoint}-last { order: 1; }
+      .flex-#{$breakpoint}-unordered { order: 0; }
+    }
+
+    // Alignment for every item
+    @include media-breakpoint-up($breakpoint) {
+      .flex-items-#{$breakpoint}-top { align-items: flex-start; }
+      .flex-items-#{$breakpoint}-middle { align-items: center; }
+      .flex-items-#{$breakpoint}-bottom { align-items: flex-end; }
+    }
+
+    // Alignment per item
+    @include media-breakpoint-up($breakpoint) {
+      .flex-#{$breakpoint}-top   { align-self: flex-start; }
+      .flex-#{$breakpoint}-middle { align-self: center; }
+      .flex-#{$breakpoint}-bottom { align-self: flex-end; }
+    }
+
+    // Horizontal alignment of item
+    @include media-breakpoint-up($breakpoint) {
+      .flex-items-#{$breakpoint}-left { justify-content: flex-start; }
+      .flex-items-#{$breakpoint}-center { justify-content: center; }
+      .flex-items-#{$breakpoint}-right { justify-content: flex-end; }
+      .flex-items-#{$breakpoint}-around { justify-content: space-around; }
+      .flex-items-#{$breakpoint}-between { justify-content: space-between; }
+    }
+  }
+}

data/assets/stylesheets/bootstrap/utilities/_pulls.scss

@@ -0,0 +1,13 @@
+@each $breakpoint in map-keys($grid-breakpoints) {
+  @include media-breakpoint-up($breakpoint) {
+    .pull-#{$breakpoint}-left {
+      @include pull-left();
+    }
+    .pull-#{$breakpoint}-right {
+      @include pull-right();
+    }
+    .pull-#{$breakpoint}-none {
+      float: none !important;
+    }
+  }
+}

data/assets/stylesheets/bootstrap/utilities/_screenreaders.scss

@@ -0,0 +1,11 @@
+//
+// Screenreaders
+//
+
+.sr-only {
+  @include sr-only();
+}
+
+.sr-only-focusable {
+  @include sr-only-focusable();
+}

data/assets/stylesheets/bootstrap/{_utilities-spacing.scss → utilities/_spacing.scss}

@@ -1,3 +1,7 @@
+// Width
+
+.w-100 { width: 100% !important; }
+
 // Margin and Padding
 
 .m-x-auto {

data/assets/stylesheets/bootstrap/utilities/_text.scss

@@ -0,0 +1,51 @@
+//
+// Text
+//
+
+// Alignment
+
+.text-justify        { text-align: justify !important; }
+.text-nowrap         { white-space: nowrap !important; }
+.text-truncate       { @include text-truncate; }
+
+// Responsive alignment
+
+@each $breakpoint in map-keys($grid-breakpoints) {
+  @include media-breakpoint-up($breakpoint) {
+    .text-#{$breakpoint}-left   { text-align: left !important; }
+    .text-#{$breakpoint}-right  { text-align: right !important; }
+    .text-#{$breakpoint}-center { text-align: center !important; }
+  }
+}
+
+// Transformation
+
+.text-lowercase      { text-transform: lowercase !important; }
+.text-uppercase      { text-transform: uppercase !important; }
+.text-capitalize     { text-transform: capitalize !important; }
+
+// Weight and italics
+
+.font-weight-normal  { font-weight: normal; }
+.font-weight-bold    { font-weight: bold; }
+.font-italic         { font-style: italic; }
+
+// Contextual colors
+
+@include text-emphasis-variant('.text-muted', $text-muted);
+
+@include text-emphasis-variant('.text-primary', $brand-primary);
+
+@include text-emphasis-variant('.text-success', $brand-success);
+
+@include text-emphasis-variant('.text-info', $brand-info);
+
+@include text-emphasis-variant('.text-warning', $brand-warning);
+
+@include text-emphasis-variant('.text-danger', $brand-danger);
+
+// Misc
+
+.text-hide {
+  @include text-hide();
+}

data/assets/stylesheets/bootstrap/{_utilities-responsive.scss → utilities/_visibility.scss}

@@ -1,7 +1,15 @@
+// scss-lint:disable ImportantRule
+
 //
-// Responsive utilities
+// Visibility utilities
 //
 
+.invisible {
+  visibility: hidden !important;
+}
+
+// Responsive visibility utilities
+
 @each $bp in map-keys($grid-breakpoints) {
   .hidden-#{$bp}-up {
     @include media-breakpoint-up($bp) {

data/bootstrap.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'compass', '~> 1.0.3'
   s.add_development_dependency 'term-ansicolor'
   # Integration testing
-  s.add_development_dependency 'capybara'
+  s.add_development_dependency 'capybara', '>= 2.6.0'
   s.add_development_dependency 'poltergeist'
   # Dummy Rails app dependencies
   s.add_development_dependency 'actionpack', '>= 4.1.5'

data/lib/bootstrap.rb

@@ -7,8 +7,8 @@ module Bootstrap
 
       if rails?
         register_rails_engine
-      elsif lotus?
-        register_lotus
+      elsif hanami?
+        register_hanami
       elsif sprockets?
         register_sprockets
       end
@@ -46,8 +46,8 @@ module Bootstrap
       defined?(::Rails)
     end
 
-    def lotus?
-      defined?(::Lotus)
+    def hanami?
+      defined?(::Hanami)
     end
 
     private
@@ -77,8 +77,8 @@ module Bootstrap
       Sprockets.append_path(javascripts_path)
     end
 
-    def register_lotus
-      Lotus::Assets.sources << assets_path
+    def register_hanami
+      Hanami::Assets.sources << assets_path
     end
   end
 end

data/lib/bootstrap/engine.rb

@@ -1,3 +1,5 @@
+require 'autoprefixer-rails'
+
 module Bootstrap
   module Rails
     class Engine < ::Rails::Engine

data/lib/bootstrap/version.rb

@@ -1,4 +1,4 @@
 module Bootstrap
-  VERSION       = '4.0.0.alpha3'
-  BOOTSTRAP_SHA = '48938155eb24b4ccdde09426066869504c6dab3c'
+  VERSION       = '4.0.0.alpha3.1'
+  BOOTSTRAP_SHA = 'c7de6107a86ebe65a6f5d5b88884256e5094ca92'
 end

data/tasks/updater/network.rb

@@ -3,6 +3,8 @@ class Updater
   module Network
     protected
 
+    WRITE_FILES_MUTEX = Mutex.new
+
     def get_paths_by_type(dir, file_re, recursive = true)
       get_file_paths(dir, recursive).select { |path| path =~ file_re }
     end
@@ -24,7 +26,7 @@ class Updater
       files.map do |name|
         Thread.start {
           contents[name] = open("#{path_url}/#{name}").read
-          Thread.exclusive { write_cached_files path, name => contents[name] }
+          WRITE_FILES_MUTEX.synchronize { write_cached_files path, name => contents[name] }
         }
       end.each(&:join)
       contents

data/templates/project/_bootstrap-variables.scss

@@ -1,4 +1,4 @@
-// Override Bootstrap variables here (defaults from bootstrap v4.0.0-alpha.2):
+// Override Bootstrap variables here (defaults from bootstrap v4.0.0-alpha.3):
 
 //
 // Copy settings from this file into the provided `_custom.scss` to override
@@ -18,6 +18,22 @@
 // Fonts
 // Components
 
+@mixin _assert-ascending($map, $map-name) {
+//   $prev-key: null;
+//   $prev-num: null;
+//   @each $key, $num in $map {
+//     @if $prev-num == null {
+//       // Do nothing
+//     } @else if not comparable($prev-num, $num) {
+//       @warn "Potentially invalid value for #{$map-name}: This map must be in ascending order, but key '#{$key}' has value #{$num} whose unit makes it incomparable to #{$prev-num}, the value of the previous key '#{$prev-key}' !";
+//     } @else if $prev-num >= $num {
+//       @warn "Invalid value for #{$map-name}: This map must be in ascending order, but key '#{$key}' has value #{$num} which isn't greater than #{$prev-num}, the value of the previous key '#{$prev-key}' !";
+//     }
+//     $prev-key: $key;
+//     $prev-num: $num;
+//   }
+}
+
 // General variable structure
 //
 // Variable format should follow the `$component-modifier-state-property` order.
@@ -38,6 +54,7 @@
 // $brand-info:                #5bc0de;
 // $brand-warning:             #f0ad4e;
 // $brand-danger:              #d9534f;
+// $brand-inverse:             $gray-dark;
 
 
 // Options
@@ -51,72 +68,70 @@
 // $enable-transitions:        false;
 // $enable-hover-media-query:  false;
 // $enable-grid-classes:       true;
+// $enable-print-styles:       true;
 
 
 // Spacing
 //
 // Control the default styling of most Bootstrap elements by modifying these
 // variables. Mostly focused on spacing.
+// You can add more entries to the $spacers map, should you need more variation.
 
-// $spacer:                     1rem;
-// $spacer-x:                   $spacer;
-// $spacer-y:                   $spacer;
+// $spacer:   1rem;
+// $spacer-x: $spacer;
+// $spacer-y: $spacer;
 // $spacers: (
 //   0: (
-//     x:   0,
-//     y:   0
+//     x: 0,
+//     y: 0
 //   ),
 //   1: (
-//     x:   $spacer-x,
-//     y:   $spacer-y
+//     x: $spacer-x,
+//     y: $spacer-y
 //   ),
 //   2: (
-//     x:   ($spacer-x * 1.5),
-//     y:   ($spacer-y * 1.5)
+//     x: ($spacer-x * 1.5),
+//     y: ($spacer-y * 1.5)
 //   ),
 //   3: (
-//     x:   ($spacer-x * 3),
-//     y:   ($spacer-y * 3)
+//     x: ($spacer-x * 3),
+//     y: ($spacer-y * 3)
 //   )
 // );
-// $border-width:               1px;
+// $border-width: 1px;
 
 
 // Body
 //
 // Settings for the `<body>` element.
 
-// $body-bg:                    #fff;
-// $body-color:                 $gray-dark;
+// $body-bg:    #fff;
+// $body-color: $gray-dark;
 
 
 // Links
 //
 // Style anchor elements.
 
-// $link-color:                 $brand-primary;
-// $link-decoration:            none;
-// $link-hover-color:           darken($link-color, 15%);
-// $link-hover-decoration:      underline;
+// $link-color:            $brand-primary;
+// $link-decoration:       none;
+// $link-hover-color:      darken($link-color, 15%);
+// $link-hover-decoration: underline;
 
 
 // Grid breakpoints
 //
-// Define the minimum and maximum dimensions at which your layout will change,
+// Define the minimum dimensions at which your layout will change,
 // adapting to different screen sizes, for use in media queries.
 
 // $grid-breakpoints: (
-//   // Extra small screen / phone
 //   xs: 0,
-//   // Small screen / phone
 //   sm: 544px,
-//   // Medium screen / tablet
 //   md: 768px,
-//   // Large screen / desktop
 //   lg: 992px,
-//   // Extra large screen / wide desktop
 //   xl: 1200px
 // );
+@include _assert-ascending($grid-breakpoints, "$grid-breakpoints");
 
 
 // Grid containers
@@ -129,77 +144,84 @@
 //   lg: 940px,
 //   xl: 1140px
 // );
+@include _assert-ascending($container-max-widths, "$container-max-widths");
 
 
 // Grid columns
 //
 // Set the number of columns and specify the width of the gutters.
 
-// $grid-columns:               12;
-// $grid-gutter-width:          1.875rem; // 30px
+// $grid-columns:      12;
+// $grid-gutter-width: 30px;
 
 
 // Typography
 //
 // Font, line-height, and color for body text, headings, and more.
 
-// $font-family-sans-serif:     "Helvetica Neue", Helvetica, Arial, sans-serif;
-// $font-family-serif:          Georgia, "Times New Roman", Times, serif;
-// $font-family-monospace:      Menlo, Monaco, Consolas, "Courier New", monospace;
-// $font-family-base:           $font-family-sans-serif;
+// $font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+// $font-family-serif:      Georgia, "Times New Roman", Times, serif;
+// $font-family-monospace:  Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+// $font-family-base:       $font-family-sans-serif;
 
 // Pixel value used to responsively scale all typography. Applied to the `<html>` element.
-// $font-size-root:             16px;
+// $font-size-root: 16px;
+
+// $font-size-base: 1rem;
+// $font-size-lg:   1.25rem;
+// $font-size-sm:   .875rem;
+// $font-size-xs:   .75rem;
+
+// $line-height-base: 1.5;
 
-// $font-size-base:             1rem;
-// $font-size-lg:               1.25rem;
-// $font-size-sm:               .875rem;
-// $font-size-xs:               .75rem;
+// $font-size-h1: 2.5rem;
+// $font-size-h2: 2rem;
+// $font-size-h3: 1.75rem;
+// $font-size-h4: 1.5rem;
+// $font-size-h5: 1.25rem;
+// $font-size-h6: 1rem;
 
-// $font-size-h1:               2.5rem;
-// $font-size-h2:               2rem;
-// $font-size-h3:               1.75rem;
-// $font-size-h4:               1.5rem;
-// $font-size-h5:               1.25rem;
-// $font-size-h6:               1rem;
+// $display1-size: 6rem;
+// $display2-size: 5.5rem;
+// $display3-size: 4.5rem;
+// $display4-size: 3.5rem;
 
-// $display1-size:               6rem;
-// $display2-size:               5.5rem;
-// $display3-size:               4.5rem;
-// $display4-size:               3.5rem;
+// $display1-weight: 300;
+// $display2-weight: 300;
+// $display3-weight: 300;
+// $display4-weight: 300;
 
-// $display1-weight:             300;
-// $display2-weight:             300;
-// $display3-weight:             300;
-// $display4-weight:             300;
+// $headings-margin-bottom: ($spacer / 2);
+// $headings-font-family:   inherit;
+// $headings-font-weight:   500;
+// $headings-line-height:   1.1;
+// $headings-color:         inherit;
 
-// $line-height:                1.5;
+// $lead-font-size:   1.25rem;
+// $lead-font-weight: 300;
 
-// $headings-margin-bottom:     ($spacer / 2);
-// $headings-font-family:       inherit;
-// $headings-font-weight:       500;
-// $headings-line-height:       1.1;
-// $headings-color:             inherit;
+// $small-font-size: 80%;
 
-// $lead-font-size:             1.25rem;
-// $lead-font-weight:           300;
+// $text-muted: $gray-light;
 
-// $text-muted:                  $gray-light;
+// $abbr-border-color: $gray-light;
 
-// $abbr-border-color:           $gray-light;
+// $blockquote-small-color:  $gray-light;
+// $blockquote-font-size:    ($font-size-base * 1.25);
+// $blockquote-border-color: $gray-lighter;
+// $blockquote-border-width: .25rem;
 
-// $blockquote-small-color:      $gray-light;
-// $blockquote-font-size:        ($font-size-base * 1.25);
-// $blockquote-border-color:     $gray-lighter;
+// $hr-border-color: rgba(0,0,0,.1);
+// $hr-border-width: $border-width;
 
-// $hr-border-color:             rgba(0,0,0,.1);
-// $hr-border-width:             $border-width;
+// $mark-padding: .2em;
 
-// $dt-font-weight:              bold;
+// $dt-font-weight: bold;
 
-// $nested-kbd-font-weight:      bold;
+// $kbd-box-shadow:         inset 0 -.1rem 0 rgba(0,0,0,.25);
+// $nested-kbd-font-weight: bold;
 
-// $list-inline-padding:         5px;
+// $list-inline-padding: 5px;
 
 
 // Components
@@ -228,8 +250,8 @@
 // $table-sm-cell-padding:         .3rem;
 
 // $table-bg:                      transparent;
-// $table-bg-accent:               #f9f9f9;
-// $table-bg-hover:                #f5f5f5;
+// $table-bg-accent:               rgba(0,0,0,.05);
+// $table-bg-hover:                rgba(0,0,0,.075);
 // $table-bg-active:               $table-bg-hover;
 
 // $table-border-width:            $border-width;
@@ -241,8 +263,11 @@
 // For each of Bootstrap's buttons, define text, background and border color.
 
 // $btn-padding-x:                  1rem;
-// $btn-padding-y:                  .375rem;
+// $btn-padding-y:                  .5rem;
+// $btn-line-height:                1.25;
 // $btn-font-weight:                normal;
+// $btn-box-shadow:                 inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075);
+// $btn-active-box-shadow:          inset 0 3px 5px rgba(0,0,0,.125);
 
 // $btn-primary-color:              #fff;
 // $btn-primary-bg:                 $brand-primary;
@@ -270,12 +295,15 @@
 
 // $btn-link-disabled-color:        $gray-light;
 
-// $btn-padding-x-sm:               .75rem;
+// $btn-padding-x-sm:               .5rem;
 // $btn-padding-y-sm:               .25rem;
 
-// $btn-padding-x-lg:               1.25rem;
+// $btn-padding-x-lg:               1.5rem;
 // $btn-padding-y-lg:               .75rem;
 
+// $btn-block-spacing-y:            .5rem;
+// $btn-toolbar-margin:             .5rem;
+
 // Allows for customizing button radius independently from global border radius
 // $btn-border-radius:              $border-radius;
 // $btn-border-radius-lg:           $border-radius-lg;
@@ -285,13 +313,14 @@
 // Forms
 
 // $input-padding-x:                .75rem;
-// $input-padding-y:                .375rem;
+// $input-padding-y:                .5rem;
+// $input-line-height:              1.25;
 
 // $input-bg:                       #fff;
 // $input-bg-disabled:              $gray-lighter;
 
 // $input-color:                    $gray;
-// $input-border-color:             #ccc;
+// $input-border-color:             rgba(0,0,0,.15);
 // $input-btn-border-width:         $border-width; // For form controls and buttons
 // $input-box-shadow:               inset 0 1px 1px rgba(0,0,0,.075);
 
@@ -299,18 +328,20 @@
 // $input-border-radius-lg:         $border-radius-lg;
 // $input-border-radius-sm:         $border-radius-sm;
 
+// $input-bg-focus:                 $input-bg;
 // $input-border-focus:             #66afe9;
 // $input-box-shadow-focus:         rgba(102,175,233,.6);
+// $input-color-focus:              $input-color;
 
 // $input-color-placeholder:        #999;
 
-// $input-padding-x-sm:             .75rem;
-// $input-padding-y-sm:             .275rem;
+// $input-padding-x-sm:             .5rem;
+// $input-padding-y-sm:             .25rem;
 
-// $input-padding-x-lg:             1.25rem;
+// $input-padding-x-lg:             1.5rem;
 // $input-padding-y-lg:             .75rem;
 
-// $input-height:                   (($font-size-base * $line-height) + ($input-padding-y * 2));
+// $input-height:                   (($font-size-base * $line-height-base) + ($input-padding-y * 2));
 // $input-height-lg:                (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2));
 // $input-height-sm:                (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2));
 
@@ -321,20 +352,100 @@
 
 // $cursor-disabled:                not-allowed;
 
+// $custom-control-gutter:   1.5rem;
+// $custom-control-spacer-x: 1rem;
+// $custom-control-spacer-y: .25rem;
+
+// $custom-control-indicator-size:       1rem;
+// $custom-control-indicator-bg:         #ddd;
+// $custom-control-indicator-bg-size:    50% 50%;
+// $custom-control-indicator-box-shadow: inset 0 .25rem .25rem rgba(0,0,0,.1);
+
+// $custom-control-disabled-cursor:             $cursor-disabled;
+// $custom-control-disabled-indicator-bg:       #eee;
+// $custom-control-disabled-description-color:  #767676;
+
+// $custom-control-checked-indicator-color:      #fff;
+// $custom-control-checked-indicator-bg:         #0074d9;
+// $custom-control-checked-indicator-box-shadow: none;
+
+// $custom-control-focus-indicator-box-shadow: 0 0 0 .075rem #fff, 0 0 0 .2rem #0074d9;
+
+// $custom-control-active-indicator-color:      #fff;
+// $custom-control-active-indicator-bg:         #84c6ff;
+// $custom-control-active-indicator-box-shadow: none;
+
+// $custom-checkbox-radius: $border-radius;
+// $custom-checkbox-checked-icon: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E");
+// $custom-checkbox-indeterminate-bg: #0074d9;
+// $custom-checkbox-indeterminate-icon: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='%23fff' d='M0 2h4'/%3E%3C/svg%3E");
+// $custom-checkbox-indeterminate-box-shadow: none;
+
+// $custom-radio-radius: 50%;
+// $custom-radio-checked-icon: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='%23fff'/%3E%3C/svg%3E");
+
+// $custom-select-padding-x:          .75rem ;
+// $custom-select-padding-y:          .375rem;
+// $custom-select-indicator-padding:  1rem; // Extra padding to account for the presence of the background-image based indicator
+// $custom-select-color:          $input-color;
+// $custom-select-disabled-color: $gray-light;
+// $custom-select-bg:            #fff;
+// $custom-select-disabled-bg:   $gray-lighter;
+// $custom-select-bg-size:       8px 10px; // In pixels because image dimensions
+// $custom-select-indicator:     url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='%23333' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E");
+// $custom-select-border-width:  $input-btn-border-width;
+// $custom-select-border-color:  $input-border-color;
+// $custom-select-border-radius: $border-radius;
+
+// $custom-select-focus-border-color: #51a7e8;
+// $custom-select-focus-box-shadow:   inset 0 1px 2px rgba(0, 0, 0, .075), 0 0 5px rgba(81, 167, 232, .5);
+
+// $custom-select-sm-padding-y: .2rem;
+// $custom-select-sm-font-size: 75%;
+
+// $custom-file-height:           2.5rem;
+// $custom-file-width:            14rem;
+// $custom-file-focus-box-shadow: 0 0 0 .075rem #fff, 0 0 0 .2rem #0074d9;
+
+// $custom-file-padding-x:     .5rem;
+// $custom-file-padding-y:     1rem;
+// $custom-file-line-height:   1.5;
+// $custom-file-color:         #555;
+// $custom-file-bg:            #fff;
+// $custom-file-border-width:  $border-width;
+// $custom-file-border-color:  #ddd;
+// $custom-file-border-radius: $border-radius;
+// $custom-file-box-shadow:    inset 0 .2rem .4rem rgba(0,0,0,.05);
+// $custom-file-button-color:  $custom-file-color;
+// $custom-file-button-bg:     #eee;
+// $custom-file-text: (
+//   placeholder: (
+//     en: "Choose file..."
+//   ),
+//   button-label: (
+//     en: "Browse"
+//   )
+// );
+
+
 // Form validation icons
-// $form-icon-success: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2MTIgNzkyIj48cGF0aCBmaWxsPSIjNWNiODVjIiBkPSJNMjMzLjggNjEwYy0xMy4zIDAtMjYtNi0zNC0xNi44TDkwLjUgNDQ4LjhDNzYuMyA0MzAgODAgNDAzLjMgOTguOCAzODljMTguOC0xNC4yIDQ1LjUtMTAuNCA1OS44IDguNGw3MiA5NUw0NTEuMyAyNDJjMTIuNS0yMCAzOC44LTI2LjIgNTguOC0xMy43IDIwIDEyLjQgMjYgMzguNyAxMy43IDU4LjhMMjcwIDU5MGMtNy40IDEyLTIwLjIgMTkuNC0zNC4zIDIwaC0yeiIvPjwvc3ZnPg==";
-// $form-icon-warning: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2MTIgNzkyIj48cGF0aCBmaWxsPSIjZjBhZDRlIiBkPSJNNjAzIDY0MC4ybC0yNzguNS01MDljLTMuOC02LjYtMTAuOC0xMC42LTE4LjUtMTAuNnMtMTQuNyA0LTE4LjUgMTAuNkw5IDY0MC4yYy0zLjcgNi41LTMuNiAxNC40LjIgMjAuOCAzLjggNi41IDEwLjggMTAuNCAxOC4zIDEwLjRoNTU3YzcuNiAwIDE0LjYtNCAxOC40LTEwLjQgMy41LTYuNCAzLjYtMTQuNCAwLTIwLjh6bS0yNjYuNC0zMGgtNjEuMlY1NDloNjEuMnY2MS4yem0wLTEwN2gtNjEuMlYzMDRoNjEuMnYxOTl6Ii8+PC9zdmc+";
-// $form-icon-danger: "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2MTIgNzkyIj48cGF0aCBmaWxsPSIjZDk1MzRmIiBkPSJNNDQ3IDU0NC40Yy0xNC40IDE0LjQtMzcuNiAxNC40LTUyIDBsLTg5LTkyLjctODkgOTIuN2MtMTQuNSAxNC40LTM3LjcgMTQuNC01MiAwLTE0LjQtMTQuNC0xNC40LTM3LjYgMC01Mmw5Mi40LTk2LjMtOTIuNC05Ni4zYy0xNC40LTE0LjQtMTQuNC0zNy42IDAtNTJzMzcuNi0xNC4zIDUyIDBsODkgOTIuOCA4OS4yLTkyLjdjMTQuNC0xNC40IDM3LjYtMTQuNCA1MiAwIDE0LjMgMTQuNCAxNC4zIDM3LjYgMCA1MkwzNTQuNiAzOTZsOTIuNCA5Ni40YzE0LjQgMTQuNCAxNC40IDM3LjYgMCA1MnoiLz48L3N2Zz4=";
+// $form-icon-success: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%235cb85c' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3E%3C/svg%3E");
+// $form-icon-warning: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%23f0ad4e' d='M4.4 5.324h-.8v-2.46h.8zm0 1.42h-.8V5.89h.8zM3.76.63L.04 7.075c-.115.2.016.425.26.426h7.397c.242 0 .372-.226.258-.426C6.726 4.924 5.47 2.79 4.253.63c-.113-.174-.39-.174-.494 0z'/%3E%3C/svg%3E");
+// $form-icon-danger: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23d9534f' viewBox='-2 -2 7 7'%3E%3Cpath stroke='%23d9534f' d='M0 0l3 3m0-3L0 3'/%3E%3Ccircle r='.5'/%3E%3Ccircle cx='3' r='.5'/%3E%3Ccircle cy='3' r='.5'/%3E%3Ccircle cx='3' cy='3' r='.5'/%3E%3C/svg%3E");
 
 
 // Dropdowns
 //
 // Dropdown menu container and contents.
 
+// $dropdown-min-width:             160px;
+// $dropdown-padding-y:             5px;
+// $dropdown-margin-top:            2px;
 // $dropdown-bg:                    #fff;
 // $dropdown-border-color:          rgba(0,0,0,.15);
 // $dropdown-border-width:          $border-width;
 // $dropdown-divider-bg:            #e5e5e5;
+// $dropdown-box-shadow:            0 6px 12px rgba(0,0,0,.175);
 
 // $dropdown-link-color:            $gray-dark;
 // $dropdown-link-hover-color:      darken($gray-dark, 5%);
@@ -345,6 +456,8 @@
 
 // $dropdown-link-disabled-color:   $gray-light;
 
+// $dropdown-item-padding-x:        20px;
+
 // $dropdown-header-color:          $gray-light;
 
 
@@ -353,6 +466,7 @@
 // Warning: Avoid customizing these values. They're used for a bird's eye view
 // of components dependent on the z-axis and are designed to all work together.
 
+// $zindex-dropdown-backdrop:  990;
 // $zindex-navbar:            1000;
 // $zindex-dropdown:          1000;
 // $zindex-popover:           1060;
@@ -366,8 +480,9 @@
 // Navbar
 
 // $navbar-border-radius:              $border-radius;
-// $navbar-padding-horizontal:         $spacer;
-// $navbar-padding-vertical:           ($spacer / 2);
+// $navbar-padding-x:                  $spacer;
+// $navbar-padding-y:                  ($spacer / 2);
+// $navbar-brand-padding-y:            .25rem;
 
 // $navbar-dark-color:                 rgba(255,255,255,.5);
 // $navbar-dark-hover-color:           rgba(255,255,255,.75);
@@ -382,27 +497,27 @@
 
 // Navs
 
-// $nav-link-padding:                          .5em 1em;
-// $nav-link-hover-bg:                         $gray-lighter;
-
-// $nav-disabled-link-color:                   $gray-light;
-// $nav-disabled-link-hover-color:             $gray-light;
-
-// $nav-tabs-border-color:                     #ddd;
-
-// $nav-tabs-link-border-width:                $border-width;
-// $nav-tabs-link-hover-border-color:          $gray-lighter;
-
-// $nav-tabs-active-link-hover-bg:             $body-bg;
-// $nav-tabs-active-link-hover-color:          $gray;
-// $nav-tabs-active-link-hover-border-color:   #ddd;
-
-// $nav-tabs-justified-link-border-color:            #ddd;
-// $nav-tabs-justified-active-link-border-color:     $body-bg;
-
-// $nav-pills-border-radius:                   $border-radius;
-// $nav-pills-active-link-hover-bg:            $component-active-bg;
-// $nav-pills-active-link-hover-color:         $component-active-color;
+// $nav-item-margin:               .2rem;
+// $nav-item-inline-spacer:        1rem;
+// $nav-link-padding:              .5em 1em;
+// $nav-link-hover-bg:             $gray-lighter;
+// $nav-disabled-link-color:       $gray-light;
+// $nav-disabled-link-hover-color: $gray-light;
+// $nav-disabled-link-hover-bg:    transparent;
+
+// $nav-tabs-border-color:                       #ddd;
+// $nav-tabs-border-width:                       $border-width;
+// $nav-tabs-border-radius:                      $border-radius;
+// $nav-tabs-link-hover-border-color:            $gray-lighter;
+// $nav-tabs-active-link-hover-color:            $gray;
+// $nav-tabs-active-link-hover-bg:               $body-bg;
+// $nav-tabs-active-link-hover-border-color:     #ddd;
+// $nav-tabs-justified-link-border-color:        #ddd;
+// $nav-tabs-justified-active-link-border-color: $body-bg;
+
+// $nav-pills-border-radius:     $border-radius;
+// $nav-pills-active-link-color: $component-active-color;
+// $nav-pills-active-link-bg:    $component-active-bg;
 
 
 // Pagination
@@ -433,21 +548,6 @@
 // $pagination-disabled-border:           #ddd;
 
 
-// Pager
-
-// $pager-bg:                             $pagination-bg;
-// $pager-border-width:                   $border-width;
-// $pager-border-color:                   $pagination-border-color;
-// $pager-border-radius:                  15px;
-
-// $pager-hover-bg:                       $pagination-hover-bg;
-
-// $pager-active-bg:                      $pagination-active-bg;
-// $pager-active-color:                   $pagination-active-color;
-
-// $pager-disabled-color:                 $pagination-disabled-color;
-
-
 // Jumbotron
 
 // $jumbotron-padding:              2rem;
@@ -468,6 +568,7 @@
 
 // $state-warning-text:             #8a6d3b;
 // $state-warning-bg:               #fcf8e3;
+// $mark-bg:                        $state-warning-bg;
 // $state-warning-border:           darken($state-warning-bg, 5%);
 
 // $state-danger-text:              #a94442;
@@ -480,13 +581,19 @@
 // $card-spacer-y:            .75rem;
 // $card-border-width:        1px;
 // $card-border-radius:       $border-radius;
-// $card-border-color:        #e5e5e5;
+// $card-border-color:        rgba(0,0,0,.125);
 // $card-border-radius-inner: $card-border-radius;
 // $card-cap-bg:              #f5f5f5;
 // $card-bg:                  #fff;
 
 // $card-link-hover-color:    #fff;
 
+// $card-img-overlay-padding: 1.25rem;
+
+// $card-deck-margin:         .625rem;
+
+// $card-columns-sm-up-column-gap: 1.25rem;
+
 
 // Tooltips
 
@@ -494,6 +601,9 @@
 // $tooltip-color:               #fff;
 // $tooltip-bg:                  #000;
 // $tooltip-opacity:             .9;
+// $tooltip-padding-y:           3px;
+// $tooltip-padding-x:           8px;
+// $tooltip-margin:              3px;
 
 // $tooltip-arrow-width:         5px;
 // $tooltip-arrow-color:         $tooltip-bg;
@@ -501,49 +611,71 @@
 
 // Popovers
 
+// $popover-inner-padding:               1px;
 // $popover-bg:                          #fff;
 // $popover-max-width:                   276px;
 // $popover-border-width:                $border-width;
 // $popover-border-color:                rgba(0,0,0,.2);
+// $popover-box-shadow:                  0 5px 10px rgba(0,0,0,.2);
 
 // $popover-title-bg:                    darken($popover-bg, 3%);
+// $popover-title-padding-x:             14px;
+// $popover-title-padding-y:             8px;
+
+// $popover-content-padding-x:           14px;
+// $popover-content-padding-y:           9px;
 
 // $popover-arrow-width:                 10px;
 // $popover-arrow-color:                 $popover-bg;
 
-// $popover-arrow-outer-width:           ($popover-arrow-width + 1);
-// $popover-arrow-outer-color:           fade-in($popover-border-color, 0.05);
+// $popover-arrow-outer-width:           ($popover-arrow-width + 1px);
+// $popover-arrow-outer-color:           fade-in($popover-border-color, .05);
 
 
-// Labels
+// Tags
 
-// $label-default-bg:            $gray-light;
-// $label-primary-bg:            $brand-primary;
-// $label-success-bg:            $brand-success;
-// $label-info-bg:               $brand-info;
-// $label-warning-bg:            $brand-warning;
-// $label-danger-bg:             $brand-danger;
+// $tag-default-bg:            $gray-light;
+// $tag-primary-bg:            $brand-primary;
+// $tag-success-bg:            $brand-success;
+// $tag-info-bg:               $brand-info;
+// $tag-warning-bg:            $brand-warning;
+// $tag-danger-bg:             $brand-danger;
 
-// $label-color:                 #fff;
-// $label-link-hover-color:      #fff;
-// $label-font-weight:           bold;
+// $tag-color:                 #fff;
+// $tag-link-hover-color:      #fff;
+// $tag-font-size:             75%;
+// $tag-font-weight:           bold;
+// $tag-padding-x:             .4em;
+// $tag-padding-y:             .25em;
 
+// $tag-pill-padding-x:        .6em;
+// Use a higher than normal value to ensure completely rounded edges when
+// customizing padding or font-size on labels.
+// $tag-pill-border-radius:    10rem;
 
 // Modals
 
 // Padding applied to the modal body
 // $modal-inner-padding:         15px;
 
+// $modal-dialog-margin:         10px;
+// $modal-dialog-sm-up-margin-y: 30px;
+
 // $modal-title-padding:         15px;
-// $modal-title-line-height:     $line-height;
+// $modal-title-line-height:     $line-height-base;
 
-// $modal-content-bg:                             #fff;
-// $modal-content-border-color:                   rgba(0,0,0,.2);
+// $modal-content-bg:               #fff;
+// $modal-content-border-color:     rgba(0,0,0,.2);
+// $modal-content-border-width:     $border-width;
+// $modal-content-xs-box-shadow:    0 3px 9px rgba(0,0,0,.5);
+// $modal-content-sm-up-box-shadow: 0 5px 15px rgba(0,0,0,.5);
 
 // $modal-backdrop-bg:           #000;
 // $modal-backdrop-opacity:      .5;
 // $modal-header-border-color:   #e5e5e5;
 // $modal-footer-border-color:   $modal-header-border-color;
+// $modal-header-border-width:   $modal-content-border-width;
+// $modal-footer-border-width:   $modal-header-border-width;
 
 // $modal-lg:                    900px;
 // $modal-md:                    600px;
@@ -578,9 +710,10 @@
 
 // Progress bars
 
-// $progress-bg:                 #f5f5f5;
-// $progress-bar-color:          #fff;
+// $progress-bg:                 #eee;
+// $progress-bar-color:          #0074d9;
 // $progress-border-radius:      $border-radius;
+// $progress-box-shadow:         inset 0 .1rem .1rem rgba(0,0,0,.1);
 
 // $progress-bar-bg:             $brand-primary;
 // $progress-bar-success-bg:     $brand-success;
@@ -610,6 +743,10 @@
 // $list-group-link-hover-color:   $list-group-link-color;
 // $list-group-link-heading-color: #333;
 
+// $list-group-item-padding-x:             1.25rem;
+// $list-group-item-padding-y:             .75rem;
+// $list-group-item-heading-margin-bottom: 5px;
+
 
 // Image thumbnails
 
@@ -618,12 +755,19 @@
 // $thumbnail-border-width:      $border-width;
 // $thumbnail-border-color:      #ddd;
 // $thumbnail-border-radius:     $border-radius;
+// $thumbnail-box-shadow:        0 1px 2px rgba(0,0,0,.075);
+
+
+// Figures
+
+// $figure-caption-font-size: 90%;
 
 
 // Breadcrumbs
 
-// $breadcrumb-padding-vertical:   .75rem;
-// $breadcrumb-padding-horizontal: 1rem;
+// $breadcrumb-padding-y:          .75rem;
+// $breadcrumb-padding-x:          1rem;
+// $breadcrumb-item-padding:       .5rem;
 
 // $breadcrumb-bg:                 $gray-lighter;
 // $breadcrumb-divider-color:      $gray-light;
@@ -631,20 +775,36 @@
 // $breadcrumb-divider:            "/";
 
 
+// Media objects
+
+// $media-margin-top:            15px;
+// $media-heading-margin-bottom:  5px;
+// $media-alignment-padding-x:   10px;
+
+
 // Carousel
 
 // $carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6);
 
 // $carousel-control-color:                      #fff;
 // $carousel-control-width:                      15%;
+// $carousel-control-sm-up-size:                 30px;
 // $carousel-control-opacity:                    .5;
 // $carousel-control-font-size:                  20px;
 
+// $carousel-indicators-width:                   60%;
+
+// $carousel-indicator-size:                     10px;
+// $carousel-indicator-active-size:              12px;
 // $carousel-indicator-active-bg:                #fff;
 // $carousel-indicator-border-color:             #fff;
 
+// $carousel-caption-width:                      70%;
+// $carousel-caption-sm-up-width:                60%;
 // $carousel-caption-color:                      #fff;
 
+// $carousel-icon-width:                         20px;
+
 
 // Close
 
@@ -655,6 +815,9 @@
 
 // Code
 
+// $code-font-size:              90%;
+// $code-padding-x:              .4rem;
+// $code-padding-y:              .2rem;
 // $code-color:                  #bd4147;
 // $code-bg:                     #f7f7f9;