bootstrap 4.0.0.alpha6 → 4.0.0.beta

data/bootstrap.gemspec

@@ -11,6 +11,8 @@ Gem::Specification.new do |s|
   s.homepage = 'https://github.com/twbs/bootstrap-rubygem'
   s.license  = 'MIT'
 
+  s.add_runtime_dependency 'popper_js', '~> 1.11.1'
+
   s.add_runtime_dependency 'sass', '>= 3.4.19'
   s.add_runtime_dependency 'autoprefixer-rails', '>= 6.0.3'
 

data/lib/bootstrap.rb

@@ -1,4 +1,6 @@
 require 'bootstrap/version'
+require 'popper_js'
+
 module Bootstrap
   class << self
     # Inspired by Kaminari

data/lib/bootstrap/version.rb

@@ -1,4 +1,4 @@
 module Bootstrap
-  VERSION       = '4.0.0.alpha6'
-  BOOTSTRAP_SHA = '65ffb1c3b6e94440812a2e228cb8e8be512652ec'
+  VERSION       = '4.0.0.beta'
+  BOOTSTRAP_SHA = '35f80bb12e4e71fd777ee60ffa43711d8f84b1a6'
 end

data/tasks/updater/js.rb

@@ -3,13 +3,9 @@ class Updater
     def update_javascript_assets
       log_status 'Updating javascripts...'
       save_to  = @save_to[:js]
-      contents = {}
-      read_files('js/dist', bootstrap_js_files).each do |name, file|
-        contents[name] = file.
-            # Remove the source mapping URL comment as this gem does not bundle source maps.
-            sub!(%r(^//# sourceMappingURL=#{name}.map\n\z), '') or
-            fail "Cannot find source mapping URL to remove in #{name}. Last line: #{file.lines.last.inspect}"
-        save_file("#{save_to}/#{name}", file)
+      read_files('js/dist', bootstrap_js_files).each do |name, content|
+        content = content.sub(%r{^//# sourceMappingURL=.*\n?\z}, '')
+        save_file("#{save_to}/#{name}", content)
       end
       log_processed "#{bootstrap_js_files * ' '}"
 
@@ -32,8 +28,10 @@ class Updater
 
     def bootstrap_js_files
       @bootstrap_js_files ||= begin
-        gruntfile = get_file(file_url 'Gruntfile.js')
-        JSON.parse(/concat:.*?src: (\[[^\]]+\])/m.match(gruntfile)[1].tr("'", '"')).map { |p| p.sub %r(\Ajs/src/), '' }
+        package_json = get_file(file_url 'package.json')
+        JSON.parse(package_json)['scripts']['js-compile-bundle']
+            .match(/shx cat (.*?) \|/)[1].split(/\s+/)
+            .map { |p| p.sub %r(\Ajs/src/), '' }
       end
     end
   end

data/tasks/updater/scss.rb

@@ -28,12 +28,9 @@ class Updater
                     File.read("#{save_to}/_variables.scss").
                         # The instructions in the file header are replaced with the line above
                         lines[4..-1].
-                        # Remove the _assert-ascending mixin definition and usages
-                        reject { |line| line.start_with?('@include _assert-ascending') }.
                         join.
-                        gsub(/@mixin _assert-ascending.*?\n}\n/m, '').
                         # Comment out the assignments
-                        gsub(/^(?=\$|\)|[ ]{2})/, '// ').
+                        gsub(/^(?=[$@)}]|[ ]{2})/, '// ').
                         # Remove the !default modifier
                         gsub(/ !default/, '')
     end

data/templates/project/_bootstrap-variables.scss

@@ -1,9 +1,11 @@
-// Override Bootstrap variables here (defaults from bootstrap v4.0.0-alpha.6):
-
+// Override Bootstrap variables here (defaults from bootstrap v4.0.0-beta):
+//
+// Variables should follow the `$component-state-property-size` formula for
+// consistent naming. Ex: $nav-link-disabled-color and $modal-content-box-shadow-xs.
 
 // Table of Contents
 //
-// Colors
+// Color system
 // Options
 // Spacing
 // Body
@@ -18,8 +20,8 @@
 // Forms
 // Dropdowns
 // Z-index master list
-// Navbar
 // Navs
+// Navbar
 // Pagination
 // Jumbotron
 // Form states and alerts
@@ -39,66 +41,74 @@
 // Code
 
 
-// Replace `$search` with `$replace` in `$string`
-// @author Hugo Giraudel
-// @param {String} $string - Initial string
-// @param {String} $search - Substring to replace
-// @param {String} $replace ('') - New value
-// @return {String} - Updated string
-@function str-replace($string, $search, $replace: "") {
-//   $index: str-index($string, $search);
-
-//   @if $index {
-//     @return str-slice($string, 1, $index - 1) + $replace + str-replace(str-slice($string, $index + str-length($search)), $search, $replace);
-//   }
-
-//   @return $string;
-}
-
-@mixin _assert-starts-at-zero($map) {
-//   $values: map-values($map);
-//   $first-value: nth($values, 1);
-//   @if $first-value != 0 {
-//     @warn "First breakpoint in `$grid-breakpoints` must start at 0, but starts at #{$first-value}.";
-//   }
-}
-
-
-// General variable structure
 //
-// Variable format should follow the `$component-modifier-state-property` order.
-
-
-// Colors
+// Color system
 //
-// Grayscale and brand colors for use across Bootstrap.
 
-// Start with assigning color names to specific hex values.
 // $white:  #fff;
+// $gray-100: #f8f9fa;
+// $gray-200: #e9ecef;
+// $gray-300: #dee2e6;
+// $gray-400: #ced4da;
+// $gray-500: #adb5bd;
+// $gray-600: #868e96;
+// $gray-700: #495057;
+// $gray-800: #343a40;
+// $gray-900: #212529;
 // $black:  #000;
-// $red:    #d9534f;
-// $orange: #f0ad4e;
-// $yellow: #ffd500;
-// $green:  #5cb85c;
-// $blue:   #0275d8;
-// $teal:   #5bc0de;
-// $pink:   #ff5b77;
-// $purple: #613d7c;
-
-// Create grayscale
-// $gray-dark:                 #292b2c;
-// $gray:                      #464a4c;
-// $gray-light:                #636c72;
-// $gray-lighter:              #eceeef;
-// $gray-lightest:             #f7f7f9;
-
-// Reassign color vars to semantic color scheme
-// $brand-primary:             $blue;
-// $brand-success:             $green;
-// $brand-info:                $teal;
-// $brand-warning:             $orange;
-// $brand-danger:              $red;
-// $brand-inverse:             $gray-dark;
+
+// $grays: (
+//   100: $gray-100,
+//   200: $gray-200,
+//   300: $gray-300,
+//   400: $gray-400,
+//   500: $gray-500,
+//   600: $gray-600,
+//   700: $gray-700,
+//   800: $gray-800,
+//   900: $gray-900
+// );
+
+// $blue:    #007bff;
+// $indigo:  #6610f2;
+// $purple:  #6f42c1;
+// $pink:    #e83e8c;
+// $red:     #dc3545;
+// $orange:  #fd7e14;
+// $yellow:  #ffc107;
+// $green:   #28a745;
+// $teal:    #20c997;
+// $cyan:    #17a2b8;
+
+// $colors: (
+//   blue: $blue,
+//   indigo: $indigo,
+//   purple: $purple,
+//   pink: $pink,
+//   red: $red,
+//   orange: $orange,
+//   yellow: $yellow,
+//   green: $green,
+//   teal: $teal,
+//   cyan: $cyan,
+//   white: $white,
+//   gray: $gray-600,
+//   gray-dark: $gray-800
+// );
+
+// $theme-colors: (
+//   primary: $blue,
+//   secondary: $gray-600,
+//   success: $green,
+//   info: $cyan,
+//   warning: $yellow,
+//   danger: $red,
+//   light: $gray-100,
+//   dark: $gray-800
+// );
+
+// Set a specific jump point for requesting color jumps
+// $theme-color-interval: 8%;
 
 
 // Options
@@ -120,36 +130,15 @@
 // 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;
 // $spacers: (
-//   0: (
-//     x: 0,
-//     y: 0
-//   ),
-//   1: (
-//     x: ($spacer-x * .25),
-//     y: ($spacer-y * .25)
-//   ),
-//   2: (
-//     x: ($spacer-x * .5),
-//     y: ($spacer-y * .5)
-//   ),
-//   3: (
-//     x: $spacer-x,
-//     y: $spacer-y
-//   ),
-//   4: (
-//     x: ($spacer-x * 1.5),
-//     y: ($spacer-y * 1.5)
-//   ),
-//   5: (
-//     x: ($spacer-x * 3),
-//     y: ($spacer-y * 3)
-//   )
+//   0: 0,
+//   1: ($spacer * .25),
+//   2: ($spacer * .5),
+//   3: $spacer,
+//   4: ($spacer * 1.5),
+//   5: ($spacer * 3)
 // );
-// $border-width: 1px;
 
 // This variable affects the `.h-*` and `.w-*` classes.
 // $sizes: (
@@ -164,16 +153,13 @@
 // Settings for the `<body>` element.
 
 // $body-bg:       $white;
-// $body-color:    $gray-dark;
-// $inverse-bg:    $gray-dark;
-// $inverse-color: $gray-lighter;
-
+// $body-color:    $gray-900;
 
 // Links
 //
 // Style anchor elements.
 
-// $link-color:            $brand-primary;
+// $link-color:            theme-color("primary");
 // $link-decoration:       none;
 // $link-hover-color:      darken($link-color, 15%);
 // $link-hover-decoration: underline;
@@ -191,7 +177,8 @@
 //   lg: 992px,
 //   xl: 1200px
 // );
-@include _assert-starts-at-zero($grid-breakpoints);
+// @include _assert-ascending($grid-breakpoints, "$grid-breakpoints");
+// @include _assert-starts-at-zero($grid-breakpoints);
 
 
 // Grid containers
@@ -204,35 +191,50 @@
 //   lg: 960px,
 //   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-base:     30px;
-// $grid-gutter-widths: (
-//   xs: $grid-gutter-width-base,
-//   sm: $grid-gutter-width-base,
-//   md: $grid-gutter-width-base,
-//   lg: $grid-gutter-width-base,
-//   xl: $grid-gutter-width-base
-// );
+// $grid-columns: 12;
+// $grid-gutter-width: 30px;
+
+// Components
+//
+// Define common padding and border radius sizes and more.
+
+// $line-height-lg:         1.5;
+// $line-height-sm:         1.5;
+
+// $border-width: 1px;
+
+// $border-radius:          .25rem;
+// $border-radius-lg:       .3rem;
+// $border-radius-sm:       .2rem;
+
+// $component-active-color: $white;
+// $component-active-bg:    theme-color("primary");
+
+// $caret-width:            .3em;
+
+// $transition-base:        all .2s ease-in-out;
+// $transition-fade:        opacity .15s linear;
+// $transition-collapse:    height .35s ease;
+
 
 // Fonts
 //
 // Font, line-height, and color for body text, headings, and more.
 
-// $font-family-sans-serif: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
-// $font-family-serif:      Georgia, "Times New Roman", Times, serif;
+// $font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
 // $font-family-monospace:  Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
 // $font-family-base:       $font-family-sans-serif;
 
 // $font-size-base: 1rem; // Assumes the browser default, typically `16px`
 // $font-size-lg:   1.25rem;
 // $font-size-sm:   .875rem;
-// $font-size-xs:   .75rem;
 
 // $font-weight-normal: normal;
 // $font-weight-bold: bold;
@@ -240,12 +242,12 @@
 // $font-weight-base: $font-weight-normal;
 // $line-height-base: 1.5;
 
-// $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;
+// $h1-font-size: 2.5rem;
+// $h2-font-size: 2rem;
+// $h3-font-size: 1.75rem;
+// $h4-font-size: 1.5rem;
+// $h5-font-size: 1.25rem;
+// $h6-font-size: 1rem;
 
 // $headings-margin-bottom: ($spacer / 2);
 // $headings-font-family:   inherit;
@@ -269,14 +271,10 @@
 
 // $small-font-size: 80%;
 
-// $text-muted: $gray-light;
-
-// $abbr-border-color: $gray-light;
+// $text-muted: $gray-600;
 
-// $blockquote-small-color:  $gray-light;
+// $blockquote-small-color:  $gray-600;
 // $blockquote-font-size:    ($font-size-base * 1.25);
-// $blockquote-border-color: $gray-lighter;
-// $blockquote-border-width: .25rem;
 
 // $hr-border-color: rgba($black,.1);
 // $hr-border-width: $border-width;
@@ -290,26 +288,7 @@
 
 // $list-inline-padding: 5px;
 
-
-// Components
-//
-// Define common padding and border radius sizes and more.
-
-// $line-height-lg:         (4 / 3);
-// $line-height-sm:         1.5;
-
-// $border-radius:          .25rem;
-// $border-radius-lg:       .3rem;
-// $border-radius-sm:       .2rem;
-
-// $component-active-color: $white;
-// $component-active-bg:    $brand-primary;
-
-// $caret-width:            .3em;
-
-// $transition-base:        all .2s ease-in-out;
-// $transition-fade:        opacity .15s linear;
-// $transition-collapse:    height .35s ease;
+// $mark-bg: #fcf8e3;
 
 
 // Tables
@@ -317,89 +296,65 @@
 // Customizes the `.table` component with basic values, each used across all table variations.
 
 // $table-cell-padding:            .75rem;
-// $table-sm-cell-padding:         .3rem;
+// $table-cell-padding-sm:         .3rem;
 
 // $table-bg:                      transparent;
+// $table-accent-bg:               rgba($black,.05);
+// $table-hover-bg:                rgba($black,.075);
+// $table-active-bg:               $table-hover-bg;
 
-// $table-inverse-bg:              $gray-dark;
-// $table-inverse-color:           $body-bg;
-
-// $table-bg-accent:               rgba($black,.05);
-// $table-bg-hover:                rgba($black,.075);
-// $table-bg-active:               $table-bg-hover;
+// $table-border-width:            $border-width;
+// $table-border-color:            $gray-200;
 
-// $table-head-bg:                 $gray-lighter;
-// $table-head-color:              $gray;
+// $table-head-bg:                 $gray-200;
+// $table-head-color:              $gray-700;
 
-// $table-border-width:            $border-width;
-// $table-border-color:            $gray-lighter;
+// $table-inverse-bg:              $gray-900;
+// $table-inverse-accent-bg:       rgba($white, .05);
+// $table-inverse-hover-bg:        rgba($white, .075);
+// $table-inverse-border-color:    lighten($gray-900, 7.5%);
+// $table-inverse-color:           $body-bg;
 
 
 // Buttons
 //
 // For each of Bootstrap's buttons, define text, background and border color.
 
-// $btn-padding-x:                  1rem;
-// $btn-padding-y:                  .5rem;
-// $btn-line-height:                1.25;
-// $btn-font-weight:                $font-weight-normal;
-// $btn-box-shadow:                 inset 0 1px 0 rgba($white,.15), 0 1px 1px rgba($black,.075);
-// $btn-focus-box-shadow:           0 0 0 2px rgba($brand-primary, .25);
-// $btn-active-box-shadow:          inset 0 3px 5px rgba($black,.125);
-
-// $btn-primary-color:              $white;
-// $btn-primary-bg:                 $brand-primary;
-// $btn-primary-border:             $btn-primary-bg;
-
-// $btn-secondary-color:            $gray-dark;
-// $btn-secondary-bg:               $white;
-// $btn-secondary-border:           #ccc;
-
-// $btn-info-color:                 $white;
-// $btn-info-bg:                    $brand-info;
-// $btn-info-border:                $btn-info-bg;
-
-// $btn-success-color:              $white;
-// $btn-success-bg:                 $brand-success;
-// $btn-success-border:             $btn-success-bg;
+// $input-btn-padding-y:       .5rem;
+// $input-btn-padding-x:       .75rem;
+// $input-btn-line-height:     1.25;
 
-// $btn-warning-color:              $white;
-// $btn-warning-bg:                 $brand-warning;
-// $btn-warning-border:             $btn-warning-bg;
+// $input-btn-padding-y-sm:    .25rem;
+// $input-btn-padding-x-sm:    .5rem;
+// $input-btn-line-height-sm:  1.5;
 
-// $btn-danger-color:               $white;
-// $btn-danger-bg:                  $brand-danger;
-// $btn-danger-border:              $btn-danger-bg;
+// $input-btn-padding-y-lg:    .5rem;
+// $input-btn-padding-x-lg:    1rem;
+// $input-btn-line-height-lg:  1.5;
 
-// $btn-link-disabled-color:        $gray-light;
-
-// $btn-padding-x-sm:               .5rem;
-// $btn-padding-y-sm:               .25rem;
+// $btn-font-weight:                $font-weight-normal;
+// $btn-box-shadow:                 inset 0 1px 0 rgba($white,.15), 0 1px 1px rgba($black,.075);
+// $btn-focus-box-shadow:           0 0 0 3px rgba(theme-color("primary"), .25);
+// $btn-active-box-shadow:          inset 0 3px 5px rgba($black,.125);
 
-// $btn-padding-x-lg:               1.5rem;
-// $btn-padding-y-lg:               .75rem;
+// $btn-link-disabled-color:        $gray-600;
 
 // $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;
 // $btn-border-radius-sm:           $border-radius-sm;
 
-// $btn-transition:                 all .2s ease-in-out;
+// $btn-transition:                 all .15s ease-in-out;
 
 
 // Forms
 
-// $input-padding-x:                .75rem;
-// $input-padding-y:                .5rem;
-// $input-line-height:              1.25;
-
 // $input-bg:                       $white;
-// $input-bg-disabled:              $gray-lighter;
+// $input-disabled-bg:              $gray-200;
 
-// $input-color:                    $gray;
+// $input-color:                    $gray-700;
 // $input-border-color:             rgba($black,.15);
 // $input-btn-border-width:         $border-width; // For form controls and buttons
 // $input-box-shadow:               inset 0 1px 1px rgba($black,.075);
@@ -408,27 +363,27 @@
 // $input-border-radius-lg:         $border-radius-lg;
 // $input-border-radius-sm:         $border-radius-sm;
 
-// $input-bg-focus:                 $input-bg;
-// $input-border-focus:             lighten($brand-primary, 25%);
-// $input-box-shadow-focus:         $input-box-shadow, rgba($input-border-focus, .6);
-// $input-color-focus:              $input-color;
+// $input-focus-bg:                 $input-bg;
+// $input-focus-border-color:       lighten(theme-color("primary"), 25%);
+// $input-focus-box-shadow:         $input-box-shadow, $btn-focus-box-shadow;
+// $input-focus-color:              $input-color;
 
-// $input-color-placeholder:        $gray-light;
+// $input-placeholder-color:        $gray-600;
 
-// $input-padding-x-sm:             .5rem;
-// $input-padding-y-sm:             .25rem;
+// $input-height-border:           $input-btn-border-width * 2;
 
-// $input-padding-x-lg:             1.5rem;
-// $input-padding-y-lg:             .75rem;
+// $input-height-inner:            ($font-size-base * $input-btn-line-height) + ($input-btn-padding-y * 2);
+// $input-height:                  calc(#{$input-height-inner} + #{$input-height-border});
 
-// $input-height:                   (($font-size-base * $input-line-height) + ($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));
+// $input-height-inner-sm:         ($font-size-sm * $input-btn-line-height-sm) + ($input-btn-padding-y-sm * 2);
+// $input-height-sm:               calc(#{$input-height-inner-sm} + #{$input-height-border});
+
+// $input-height-inner-lg:         ($font-size-sm * $input-btn-line-height-lg) + ($input-btn-padding-y-lg * 2);
+// $input-height-lg:               calc(#{$input-height-inner-lg} + #{$input-height-border});
 
 // $input-transition:               border-color ease-in-out .15s, box-shadow ease-in-out .15s;
 
 // $form-text-margin-top:     .25rem;
-// $form-feedback-margin-top: $form-text-margin-top;
 
 // $form-check-margin-bottom:  .5rem;
 // $form-check-input-gutter:   1.25rem;
@@ -437,56 +392,53 @@
 
 // $form-check-inline-margin-x: .75rem;
 
-// $form-group-margin-bottom:       $spacer-y;
+// $form-group-margin-bottom:       1rem;
 
-// $input-group-addon-bg:           $gray-lighter;
+// $input-group-addon-bg:           $gray-200;
 // $input-group-addon-border-color: $input-border-color;
 
-// $cursor-disabled:                not-allowed;
-
 // $custom-control-gutter:   1.5rem;
-// $custom-control-spacer-x: 1rem;
 // $custom-control-spacer-y: .25rem;
+// $custom-control-spacer-x: 1rem;
 
 // $custom-control-indicator-size:       1rem;
-// $custom-control-indicator-margin-y:   (($line-height-base * 1rem) - $custom-control-indicator-size) / -2;
 // $custom-control-indicator-bg:         #ddd;
 // $custom-control-indicator-bg-size:    50% 50%;
 // $custom-control-indicator-box-shadow: inset 0 .25rem .25rem rgba($black,.1);
 
-// $custom-control-disabled-cursor:             $cursor-disabled;
-// $custom-control-disabled-indicator-bg:       $gray-lighter;
-// $custom-control-disabled-description-color:  $gray-light;
+// $custom-control-indicator-disabled-bg:       $gray-200;
+// $custom-control-description-disabled-color:  $gray-600;
 
-// $custom-control-checked-indicator-color:      $white;
-// $custom-control-checked-indicator-bg:         $brand-primary;
-// $custom-control-checked-indicator-box-shadow: none;
+// $custom-control-indicator-checked-color:      $white;
+// $custom-control-indicator-checked-bg:         theme-color("primary");
+// $custom-control-indicator-checked-box-shadow: none;
 
-// $custom-control-focus-indicator-box-shadow: 0 0 0 1px $body-bg, 0 0 0 3px $brand-primary;
+// $custom-control-indicator-focus-box-shadow: 0 0 0 1px $body-bg, 0 0 0 3px theme-color("primary");
 
-// $custom-control-active-indicator-color:      $white;
-// $custom-control-active-indicator-bg:         lighten($brand-primary, 35%);
-// $custom-control-active-indicator-box-shadow: none;
+// $custom-control-indicator-active-color:      $white;
+// $custom-control-indicator-active-bg:         lighten(theme-color("primary"), 35%);
+// $custom-control-indicator-active-box-shadow: none;
 
-// $custom-checkbox-radius: $border-radius;
-// $custom-checkbox-checked-icon: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#{$custom-control-checked-indicator-color}' 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"), "#", "%23");
+// $custom-checkbox-indicator-border-radius: $border-radius;
+// $custom-checkbox-indicator-icon-checked: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#{$custom-control-indicator-checked-color}' 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"), "#", "%23");
 
-// $custom-checkbox-indeterminate-bg: $brand-primary;
-// $custom-checkbox-indeterminate-indicator-color: $custom-control-checked-indicator-color;
-// $custom-checkbox-indeterminate-icon: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='#{$custom-checkbox-indeterminate-indicator-color}' d='M0 2h4'/%3E%3C/svg%3E"), "#", "%23");
-// $custom-checkbox-indeterminate-box-shadow: none;
+// $custom-checkbox-indicator-indeterminate-bg: theme-color("primary");
+// $custom-checkbox-indicator-indeterminate-color: $custom-control-indicator-checked-color;
+// $custom-checkbox-indicator-icon-indeterminate: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='#{$custom-checkbox-indicator-indeterminate-color}' d='M0 2h4'/%3E%3C/svg%3E"), "#", "%23");
+// $custom-checkbox-indicator-indeterminate-box-shadow: none;
 
-// $custom-radio-radius: 50%;
-// $custom-radio-checked-icon: str-replace(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='#{$custom-control-checked-indicator-color}'/%3E%3C/svg%3E"), "#", "%23");
+// $custom-radio-indicator-border-radius: 50%;
+// $custom-radio-indicator-icon-checked: str-replace(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='#{$custom-control-indicator-checked-color}'/%3E%3C/svg%3E"), "#", "%23");
 
-// $custom-select-padding-x:          .75rem ;
 // $custom-select-padding-y:          .375rem;
+// $custom-select-padding-x:          .75rem ;
+// $custom-select-height:              $input-height ;
 // $custom-select-indicator-padding:   1rem; // Extra padding to account for the presence of the background-image based indicator
-// $custom-select-line-height:         $input-line-height;
+// $custom-select-line-height:         $input-btn-line-height;
 // $custom-select-color:               $input-color;
-// $custom-select-disabled-color:      $gray-light;
+// $custom-select-disabled-color:      $gray-600;
 // $custom-select-bg:            $white;
-// $custom-select-disabled-bg:   $gray-lighter;
+// $custom-select-disabled-bg:   $gray-200;
 // $custom-select-bg-size:       8px 10px; // In pixels because image dimensions
 // $custom-select-indicator-color: #333;
 // $custom-select-indicator:     str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 5'%3E%3Cpath fill='#{$custom-select-indicator-color}' d='M2 0L0 2h4zm0 5L0 3h4z'/%3E%3C/svg%3E"), "#", "%23");
@@ -494,27 +446,27 @@
 // $custom-select-border-color:  $input-border-color;
 // $custom-select-border-radius: $border-radius;
 
-// $custom-select-focus-border-color: lighten($brand-primary, 25%);
+// $custom-select-focus-border-color: lighten(theme-color("primary"), 25%);
 // $custom-select-focus-box-shadow:   inset 0 1px 2px rgba($black, .075), 0 0 5px rgba($custom-select-focus-border-color, .5);
 
-// $custom-select-sm-padding-y:  .2rem;
-// $custom-select-sm-font-size:  75%;
+// $custom-select-font-size-sm:  75%;
+// $custom-select-height-sm: $input-height-sm;
 
 // $custom-file-height:           2.5rem;
 // $custom-file-width:            14rem;
-// $custom-file-focus-box-shadow: 0 0 0 .075rem $white, 0 0 0 .2rem $brand-primary;
+// $custom-file-focus-box-shadow: 0 0 0 .075rem $white, 0 0 0 .2rem theme-color("primary");
 
-// $custom-file-padding-x:     .5rem;
 // $custom-file-padding-y:     1rem;
+// $custom-file-padding-x:     .5rem;
 // $custom-file-line-height:   1.5;
-// $custom-file-color:         $gray;
+// $custom-file-color:         $gray-700;
 // $custom-file-bg:            $white;
 // $custom-file-border-width:  $border-width;
 // $custom-file-border-color:  $input-border-color;
 // $custom-file-border-radius: $border-radius;
 // $custom-file-box-shadow:    inset 0 .2rem .4rem rgba($black,.05);
 // $custom-file-button-color:  $custom-file-color;
-// $custom-file-button-bg:     $gray-lighter;
+// $custom-file-button-bg:     $gray-200;
 // $custom-file-text: (
 //   placeholder: (
 //     en: "Choose file..."
@@ -525,15 +477,9 @@
 // );
 
 
-// Form validation icons
-// $form-icon-success-color: $brand-success;
-// $form-icon-success: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#{$form-icon-success-color}' 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"), "#", "%23");
-
-// $form-icon-warning-color: $brand-warning;
-// $form-icon-warning: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#{$form-icon-warning-color}' 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"), "#", "%23");
-
-// $form-icon-danger-color: $brand-danger;
-// $form-icon-danger: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='#{$form-icon-danger-color}' 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"), "#", "%23");
+// Form validation
+// $form-feedback-valid-color:   theme-color("success");
+// $form-feedback-invalid-color: theme-color("danger");
 
 
 // Dropdowns
@@ -542,25 +488,26 @@
 
 // $dropdown-min-width:             10rem;
 // $dropdown-padding-y:             .5rem;
-// $dropdown-margin-top:            .125rem;
+// $dropdown-spacer:                .125rem;
 // $dropdown-bg:                    $white;
 // $dropdown-border-color:          rgba($black,.15);
 // $dropdown-border-width:          $border-width;
-// $dropdown-divider-bg:            $gray-lighter;
+// $dropdown-divider-bg:            $gray-200;
 // $dropdown-box-shadow:            0 .5rem 1rem rgba($black,.175);
 
-// $dropdown-link-color:            $gray-dark;
-// $dropdown-link-hover-color:      darken($gray-dark, 5%);
-// $dropdown-link-hover-bg:         $gray-lightest;
+// $dropdown-link-color:            $gray-900;
+// $dropdown-link-hover-color:      darken($gray-900, 5%);
+// $dropdown-link-hover-bg:         $gray-100;
 
 // $dropdown-link-active-color:     $component-active-color;
 // $dropdown-link-active-bg:        $component-active-bg;
 
-// $dropdown-link-disabled-color:   $gray-light;
+// $dropdown-link-disabled-color:   $gray-600;
 
+// $dropdown-item-padding-y:        .25rem;
 // $dropdown-item-padding-x:        1.5rem;
 
-// $dropdown-header-color:          $gray-light;
+// $dropdown-header-color:          $gray-600;
 
 
 // Z-index master list
@@ -568,75 +515,70 @@
 // 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-sticky:             1020;
 // $zindex-fixed:              1030;
-// $zindex-sticky:             1030;
 // $zindex-modal-backdrop:     1040;
 // $zindex-modal:              1050;
 // $zindex-popover:            1060;
 // $zindex-tooltip:            1070;
 
+// Navs
+
+// $nav-link-padding-y:            .5rem;
+// $nav-link-padding-x:            1rem;
+// $nav-link-disabled-color:       $gray-600;
+
+// $nav-tabs-border-color:                       #ddd;
+// $nav-tabs-border-width:                       $border-width;
+// $nav-tabs-border-radius:                      $border-radius;
+// $nav-tabs-link-hover-border-color:            $gray-200;
+// $nav-tabs-link-active-color:                  $gray-700;
+// $nav-tabs-link-active-bg:                     $body-bg;
+// $nav-tabs-link-active-border-color:           #ddd;
+
+// $nav-pills-border-radius:     $border-radius;
+// $nav-pills-link-active-color: $component-active-color;
+// $nav-pills-link-active-bg:    $component-active-bg;
 
 // Navbar
 
-// $navbar-border-radius:              $border-radius;
-// $navbar-padding-x:                  $spacer;
 // $navbar-padding-y:                  ($spacer / 2);
+// $navbar-padding-x:                  $spacer;
 
-// $navbar-brand-padding-y:            .25rem;
+// $navbar-brand-font-size:            $font-size-lg;
+// Compute the navbar-brand padding-y so the navbar-brand will have the same height as navbar-text and nav-link
+// $nav-link-height:                   $navbar-brand-font-size * $line-height-base;
+// $navbar-brand-height:               ($font-size-base * $line-height-base + $nav-link-padding-y * 2);
+// $navbar-brand-padding-y:            ($navbar-brand-height - $nav-link-height) / 2;
 
-// $navbar-toggler-padding-x:           .75rem;
 // $navbar-toggler-padding-y:           .25rem;
+// $navbar-toggler-padding-x:           .75rem;
 // $navbar-toggler-font-size:           $font-size-lg;
 // $navbar-toggler-border-radius:       $btn-border-radius;
 
-// $navbar-inverse-color:                 rgba($white,.5);
-// $navbar-inverse-hover-color:           rgba($white,.75);
-// $navbar-inverse-active-color:          rgba($white,1);
-// $navbar-inverse-disabled-color:        rgba($white,.25);
-// $navbar-inverse-toggler-bg: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-inverse-color}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 8h24M4 16h24M4 24h24'/%3E%3C/svg%3E"), "#", "%23");
-// $navbar-inverse-toggler-border:        rgba($white,.1);
+// $navbar-dark-color:                 rgba($white,.5);
+// $navbar-dark-hover-color:           rgba($white,.75);
+// $navbar-dark-active-color:          rgba($white,1);
+// $navbar-dark-disabled-color:        rgba($white,.25);
+// $navbar-dark-toggler-icon-bg: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-dark-color}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E"), "#", "%23");
+// $navbar-dark-toggler-border-color:  rgba($white,.1);
 
 // $navbar-light-color:                rgba($black,.5);
 // $navbar-light-hover-color:          rgba($black,.7);
 // $navbar-light-active-color:         rgba($black,.9);
 // $navbar-light-disabled-color:       rgba($black,.3);
-// $navbar-light-toggler-bg: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-light-color}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 8h24M4 16h24M4 24h24'/%3E%3C/svg%3E"), "#", "%23");
-// $navbar-light-toggler-border:       rgba($black,.1);
-
-// Navs
-
-// $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-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;
-
+// $navbar-light-toggler-icon-bg: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='#{$navbar-light-color}' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E"), "#", "%23");
+// $navbar-light-toggler-border-color: rgba($black,.1);
 
 // Pagination
 
-// $pagination-padding-x:                .75rem;
 // $pagination-padding-y:                .5rem;
-// $pagination-padding-x-sm:             .5rem;
+// $pagination-padding-x:                .75rem;
 // $pagination-padding-y-sm:             .25rem;
-// $pagination-padding-x-lg:             1.5rem;
+// $pagination-padding-x-sm:             .5rem;
 // $pagination-padding-y-lg:             .75rem;
+// $pagination-padding-x-lg:             1.5rem;
 // $pagination-line-height:              1.25;
 
 // $pagination-color:                     $link-color;
@@ -645,62 +587,38 @@
 // $pagination-border-color:              #ddd;
 
 // $pagination-hover-color:               $link-hover-color;
-// $pagination-hover-bg:                  $gray-lighter;
-// $pagination-hover-border:              #ddd;
+// $pagination-hover-bg:                  $gray-200;
+// $pagination-hover-border-color:        #ddd;
 
 // $pagination-active-color:              $white;
-// $pagination-active-bg:                 $brand-primary;
-// $pagination-active-border:             $brand-primary;
+// $pagination-active-bg:                 theme-color("primary");
+// $pagination-active-border-color:       theme-color("primary");
 
-// $pagination-disabled-color:            $gray-light;
+// $pagination-disabled-color:            $gray-600;
 // $pagination-disabled-bg:               $white;
-// $pagination-disabled-border:           #ddd;
+// $pagination-disabled-border-color:     #ddd;
 
 
 // Jumbotron
 
 // $jumbotron-padding:              2rem;
-// $jumbotron-bg:                   $gray-lighter;
-
-
-// Form states and alerts
-//
-// Define colors for form feedback states and, by default, alerts.
-
-// $state-success-text:             #3c763d;
-// $state-success-bg:               #dff0d8;
-// $state-success-border:           darken($state-success-bg, 5%);
-
-// $state-info-text:                #31708f;
-// $state-info-bg:                  #d9edf7;
-// $state-info-border:              darken($state-info-bg, 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;
-// $state-danger-bg:                #f2dede;
-// $state-danger-border:            darken($state-danger-bg, 5%);
+// $jumbotron-bg:                   $gray-200;
 
 
 // Cards
 
-// $card-spacer-x:            1.25rem;
 // $card-spacer-y:            .75rem;
+// $card-spacer-x:            1.25rem;
 // $card-border-width:        1px;
 // $card-border-radius:       $border-radius;
 // $card-border-color:        rgba($black,.125);
-// $card-border-radius-inner: calc(#{$card-border-radius} - #{$card-border-width});
-// $card-cap-bg:              $gray-lightest;
+// $card-inner-border-radius: calc(#{$card-border-radius} - #{$card-border-width});
+// $card-cap-bg:              rgba($black, .03);
 // $card-bg:                  $white;
 
-// $card-link-hover-color:    $white;
-
 // $card-img-overlay-padding: 1.25rem;
 
-// $card-deck-margin:          ($grid-gutter-width-base / 2);
+// $card-deck-margin:          ($grid-gutter-width / 2);
 
 // $card-columns-count:        3;
 // $card-columns-gap:          1.25rem;
@@ -715,9 +633,11 @@
 // $tooltip-opacity:             .9;
 // $tooltip-padding-y:           3px;
 // $tooltip-padding-x:           8px;
-// $tooltip-margin:              3px;
+// $tooltip-margin:              0;
+
 
 // $tooltip-arrow-width:         5px;
+// $tooltip-arrow-height:        5px;
 // $tooltip-arrow-color:         $tooltip-bg;
 
 
@@ -730,14 +650,17 @@
 // $popover-border-color:                rgba($black,.2);
 // $popover-box-shadow:                  0 5px 10px rgba($black,.2);
 
-// $popover-title-bg:                    darken($popover-bg, 3%);
-// $popover-title-padding-x:             14px;
-// $popover-title-padding-y:             8px;
+// $popover-header-bg:                    darken($popover-bg, 3%);
+// $popover-header-color:                 $headings-color;
+// $popover-header-padding-y:             8px;
+// $popover-header-padding-x:             14px;
 
-// $popover-content-padding-x:           14px;
-// $popover-content-padding-y:           9px;
+// $popover-body-color:               $body-color;
+// $popover-body-padding-y:           9px;
+// $popover-body-padding-x:           14px;
 
 // $popover-arrow-width:                 10px;
+// $popover-arrow-height:                5px;
 // $popover-arrow-color:                 $popover-bg;
 
 // $popover-arrow-outer-width:           ($popover-arrow-width + 1px);
@@ -746,19 +669,11 @@
 
 // Badges
 
-// $badge-default-bg:            $gray-light;
-// $badge-primary-bg:            $brand-primary;
-// $badge-success-bg:            $brand-success;
-// $badge-info-bg:               $brand-info;
-// $badge-warning-bg:            $brand-warning;
-// $badge-danger-bg:             $brand-danger;
-
 // $badge-color:                 $white;
-// $badge-link-hover-color:      $white;
 // $badge-font-size:             75%;
 // $badge-font-weight:           $font-weight-bold;
-// $badge-padding-x:             .4em;
 // $badge-padding-y:             .25em;
+// $badge-padding-x:             .4em;
 
 // $badge-pill-padding-x:        .6em;
 // Use a higher than normal value to ensure completely rounded edges when
@@ -772,19 +687,19 @@
 // $modal-inner-padding:         15px;
 
 // $modal-dialog-margin:         10px;
-// $modal-dialog-sm-up-margin-y: 30px;
+// $modal-dialog-margin-y-sm-up: 30px;
 
 // $modal-title-line-height:     $line-height-base;
 
 // $modal-content-bg:               $white;
 // $modal-content-border-color:     rgba($black,.2);
 // $modal-content-border-width:     $border-width;
-// $modal-content-xs-box-shadow:    0 3px 9px rgba($black,.5);
-// $modal-content-sm-up-box-shadow: 0 5px 15px rgba($black,.5);
+// $modal-content-box-shadow-xs:    0 3px 9px rgba($black,.5);
+// $modal-content-box-shadow-sm-up: 0 5px 15px rgba($black,.5);
 
 // $modal-backdrop-bg:           $black;
 // $modal-backdrop-opacity:      .5;
-// $modal-header-border-color:   $gray-lighter;
+// $modal-header-border-color:   $gray-200;
 // $modal-footer-border-color:   $modal-header-border-color;
 // $modal-header-border-width:   $modal-content-border-width;
 // $modal-footer-border-width:   $modal-header-border-width;
@@ -801,68 +716,49 @@
 //
 // Define alert colors, border radius, and padding.
 
-// $alert-padding-x:             1.25rem;
 // $alert-padding-y:             .75rem;
-// $alert-margin-bottom:         $spacer-y;
+// $alert-padding-x:             1.25rem;
+// $alert-margin-bottom:         1rem;
 // $alert-border-radius:         $border-radius;
 // $alert-link-font-weight:      $font-weight-bold;
 // $alert-border-width:          $border-width;
 
-// $alert-success-bg:            $state-success-bg;
-// $alert-success-text:          $state-success-text;
-// $alert-success-border:        $state-success-border;
-
-// $alert-info-bg:               $state-info-bg;
-// $alert-info-text:             $state-info-text;
-// $alert-info-border:           $state-info-border;
-
-// $alert-warning-bg:            $state-warning-bg;
-// $alert-warning-text:          $state-warning-text;
-// $alert-warning-border:        $state-warning-border;
-
-// $alert-danger-bg:             $state-danger-bg;
-// $alert-danger-text:           $state-danger-text;
-// $alert-danger-border:         $state-danger-border;
-
 
 // Progress bars
 
 // $progress-height:               1rem;
 // $progress-font-size:            .75rem;
-// $progress-bg:                   $gray-lighter;
+// $progress-bg:                   $gray-200;
 // $progress-border-radius:        $border-radius;
 // $progress-box-shadow:           inset 0 .1rem .1rem rgba($black,.1);
 // $progress-bar-color:            $white;
-// $progress-bar-bg:               $brand-primary;
+// $progress-bar-bg:               theme-color("primary");
 // $progress-bar-animation-timing: 1s linear infinite;
+// $progress-bar-transition:       width .6s ease;
 
 // List group
 
-// $list-group-color:               $body-color;
 // $list-group-bg:                  $white;
 // $list-group-border-color:        rgba($black,.125);
 // $list-group-border-width:        $border-width;
 // $list-group-border-radius:       $border-radius;
 
-// $list-group-item-padding-x:      1.25rem;
 // $list-group-item-padding-y:      .75rem;
+// $list-group-item-padding-x:      1.25rem;
 
-// $list-group-hover-bg:            $gray-lightest;
-// $list-group-active-color:        $component-active-color;
-// $list-group-active-bg:           $component-active-bg;
-// $list-group-active-border:       $list-group-active-bg;
-// $list-group-active-text-color:   lighten($list-group-active-bg, 50%);
+// $list-group-hover-bg:                 $gray-100;
+// $list-group-active-color:             $component-active-color;
+// $list-group-active-bg:                $component-active-bg;
+// $list-group-active-border-color:      $list-group-active-bg;
 
-// $list-group-disabled-color:      $gray-light;
+// $list-group-disabled-color:      $gray-600;
 // $list-group-disabled-bg:         $list-group-bg;
-// $list-group-disabled-text-color: $list-group-disabled-color;
 
-// $list-group-link-color:          $gray;
-// $list-group-link-heading-color:  $gray-dark;
-// $list-group-link-hover-color:    $list-group-link-color;
+// $list-group-action-color:             $gray-700;
+// $list-group-action-hover-color:       $list-group-action-color;
 
-// $list-group-link-active-color:   $list-group-color;
-// $list-group-link-active-bg:      $gray-lighter;
+// $list-group-action-active-color:      $body-color;
+// $list-group-action-active-bg:         $gray-200;
 
 
 // Image thumbnails
@@ -879,7 +775,7 @@
 // Figures
 
 // $figure-caption-font-size: 90%;
-// $figure-caption-color:     $gray-light;
+// $figure-caption-color:     $gray-600;
 
 
 // Breadcrumbs
@@ -888,9 +784,9 @@
 // $breadcrumb-padding-x:          1rem;
 // $breadcrumb-item-padding:       .5rem;
 
-// $breadcrumb-bg:                 $gray-lighter;
-// $breadcrumb-divider-color:      $gray-light;
-// $breadcrumb-active-color:       $gray-light;
+// $breadcrumb-bg:                 $gray-200;
+// $breadcrumb-divider-color:      $gray-600;
+// $breadcrumb-active-color:       $gray-600;
 // $breadcrumb-divider:            "/";
 
 
@@ -913,7 +809,7 @@
 // $carousel-control-prev-icon-bg: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='#{$carousel-control-color}' viewBox='0 0 8 8'%3E%3Cpath d='M4 0l-4 4 4 4 1.5-1.5-2.5-2.5 2.5-2.5-1.5-1.5z'/%3E%3C/svg%3E"), "#", "%23");
 // $carousel-control-next-icon-bg: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='#{$carousel-control-color}' viewBox='0 0 8 8'%3E%3Cpath d='M1.5 0l-1.5 1.5 2.5 2.5-2.5 2.5 1.5 1.5 4-4-4-4z'/%3E%3C/svg%3E"), "#", "%23");
 
-// $carousel-transition:           transform .6s ease-in-out;
+// $carousel-transition:           transform .6s ease;
 
 
 // Close
@@ -923,19 +819,16 @@
 // $close-color:                 $black;
 // $close-text-shadow:           0 1px 0 $white;
 
-
 // Code
 
 // $code-font-size:              90%;
-// $code-padding-x:              .4rem;
 // $code-padding-y:              .2rem;
+// $code-padding-x:              .4rem;
 // $code-color:                  #bd4147;
-// $code-bg:                     $gray-lightest;
+// $code-bg:                     $gray-100;
 
 // $kbd-color:                   $white;
-// $kbd-bg:                      $gray-dark;
+// $kbd-bg:                      $gray-900;
 
-// $pre-bg:                      $gray-lightest;
-// $pre-color:                   $gray-dark;
-// $pre-border-color:            #ccc;
+// $pre-color:                   $gray-900;
 // $pre-scrollable-max-height:   340px;