From 7976e4793f436660513029bc7279c0ac948eb15c Mon Sep 17 00:00:00 2001 From: "M.Shibuya" Date: Sat, 4 Dec 2021 14:17:22 +0900 Subject: [PATCH] Reflect review - Use `yarn run`, instead of `./node_modules/.bin/` - Remove unnecessary .prettierignore entries - Apply async: true to javascript tags - Restore order changes in gemfiles/* - Change scripts task `prettier` to `format`, since it conflicts with the prettier command itself - Apply prettier to src/rails_admin/styles/themes/cerulean --- .github/workflows/test.yml | 2 +- .prettierignore | 2 - app/views/layouts/rails_admin/_head.html.erb | 4 +- gemfiles/rails_6.0.gemfile | 6 +- gemfiles/rails_6.1.gemfile | 6 +- gemfiles/rails_7.0.gemfile | 6 +- package.json | 2 +- .../styles/themes/cerulean/theming.scss | 44 +- .../styles/themes/cerulean/variables.scss | 791 +++++++++--------- 9 files changed, 418 insertions(+), 445 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4b94e9998c..0d2e92dc70 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -138,7 +138,7 @@ jobs: - name: Install dependencies run: yarn install - name: Run check - run: ./node_modules/.bin/prettier --check . + run: yarn run prettier --check . rubocop: name: RuboCop diff --git a/.prettierignore b/.prettierignore index 04e3d7139f..9f296e3fa2 100644 --- a/.prettierignore +++ b/.prettierignore @@ -3,6 +3,4 @@ lib/generators/rails_admin/templates spec/dummy_app/public spec/dummy_app/tmp spec/support/jquery.simulate.drag-sortable.js -src/rails_admin/styles/aristo -src/rails_admin/styles/themes/cerulean vendor diff --git a/app/views/layouts/rails_admin/_head.html.erb b/app/views/layouts/rails_admin/_head.html.erb index 121ff8afcf..1f6af614ed 100644 --- a/app/views/layouts/rails_admin/_head.html.erb +++ b/app/views/layouts/rails_admin/_head.html.erb @@ -6,11 +6,11 @@ <% case RailsAdmin::config.asset_source when :webpacker %> <%= stylesheet_pack_tag "rails_admin" %> - <%= javascript_pack_tag "rails_admin" %> + <%= javascript_pack_tag "rails_admin", async: true %> <% when :webpack, :sprockets %> <% handle_asset_dependency_error do %> <%= stylesheet_link_tag "rails_admin.css", media: :all %> - <%= javascript_include_tag "rails_admin.js", defer: true %> + <%= javascript_include_tag "rails_admin.js", async: true %> <% end %> <% else raise "Unknown asset_source: #{RailsAdmin::config.asset_source}" diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile index b687369193..a64c07cec7 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_6.0.gemfile @@ -3,8 +3,8 @@ source "https://rubygems.org" gem "appraisal", ">= 2.0" -gem "devise", "~> 4.7" gem "rails", "~> 6.0.0" +gem "devise", "~> 4.7" gem "webpacker", require: false gem "webrick", "~> 1.7" gem "sassc-rails", "~> 2.1" @@ -33,8 +33,8 @@ group :test do gem "cancancan", "~> 3.0" gem "carrierwave", [">= 2.0.0.rc", "< 3"] gem "cuprite" - gem "database_cleaner-active_record", ">= 2.0", require: false gem "database_cleaner-mongoid", ">= 2.0", require: false + gem "database_cleaner-active_record", ">= 2.0", require: false gem "dragonfly", "~> 1.0" gem "factory_bot", ">= 4.2" gem "generator_spec", ">= 0.8" @@ -42,8 +42,8 @@ group :test do gem "mini_magick", ">= 3.4" gem "pundit" gem "rack-cache", require: "rack/cache" - gem "rspec-expectations", "!= 3.8.3" gem "rspec-rails", ">= 4.0.0.beta2" + gem "rspec-expectations", "!= 3.8.3" gem "rspec-retry" gem "rubocop", ["~> 1.20", "!= 1.22.2"], require: false gem "rubocop-performance", require: false diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile index ceaf4b8f79..427445a8ee 100644 --- a/gemfiles/rails_6.1.gemfile +++ b/gemfiles/rails_6.1.gemfile @@ -3,8 +3,8 @@ source "https://rubygems.org" gem "appraisal", ">= 2.0" -gem "devise", "~> 4.7" gem "rails", "~> 6.1.0" +gem "devise", "~> 4.7" gem "webpacker", require: false gem "webrick", "~> 1.7" gem "sassc-rails", "~> 2.1" @@ -33,8 +33,8 @@ group :test do gem "cancancan", "~> 3.2" gem "carrierwave", [">= 2.0.0.rc", "< 3"] gem "cuprite" - gem "database_cleaner-active_record", ">= 2.0", require: false gem "database_cleaner-mongoid", ">= 2.0", require: false + gem "database_cleaner-active_record", ">= 2.0", require: false gem "dragonfly", "~> 1.0" gem "factory_bot", ">= 4.2" gem "generator_spec", ">= 0.8" @@ -42,8 +42,8 @@ group :test do gem "mini_magick", ">= 3.4" gem "pundit" gem "rack-cache", require: "rack/cache" - gem "rspec-expectations", "!= 3.8.3" gem "rspec-rails", ">= 4.0.0.beta2" + gem "rspec-expectations", "!= 3.8.3" gem "rspec-retry" gem "rubocop", ["~> 1.20", "!= 1.22.2"], require: false gem "rubocop-performance", require: false diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile index fbc949df45..f68527da4e 100644 --- a/gemfiles/rails_7.0.gemfile +++ b/gemfiles/rails_7.0.gemfile @@ -3,8 +3,8 @@ source "https://rubygems.org" gem "appraisal", ">= 2.0" -gem "devise", "~> 4.7", github: "strobilomyces/devise", branch: "patch-1" gem "rails", "~> 7.0.0.alpha2" +gem "devise", "~> 4.7", github: "strobilomyces/devise", branch: "patch-1" gem "webpacker", require: false gem "webrick", "~> 1.7" gem "sassc-rails", "~> 2.1" @@ -27,8 +27,8 @@ group :test do gem "cancancan", "~> 3.2" gem "carrierwave", [">= 2.0.0.rc", "< 3"] gem "cuprite" - gem "database_cleaner-active_record", ">= 2.0", require: false gem "database_cleaner-mongoid", ">= 2.0", require: false + gem "database_cleaner-active_record", ">= 2.0", require: false gem "dragonfly", "~> 1.0" gem "factory_bot", ">= 4.2" gem "generator_spec", ">= 0.8" @@ -36,8 +36,8 @@ group :test do gem "mini_magick", ">= 3.4" gem "pundit" gem "rack-cache", require: "rack/cache" - gem "rspec-expectations", "!= 3.8.3" gem "rspec-rails", ">= 4.0.0.beta2" + gem "rspec-expectations", "!= 3.8.3" gem "rspec-retry" gem "rubocop", ["~> 1.20", "!= 1.22.2"], require: false gem "rubocop-performance", require: false diff --git a/package.json b/package.json index 5324ca7a97..cde1284e1d 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "main": "src/rails_admin/base.js", "scripts": { "link": "yarn link && cd spec/dummy_app && yarn link rails_admin", - "prettier": "prettier -w ." + "format": "prettier -w ." }, "dependencies": { "@fortawesome/fontawesome-free": "^5.15.4", diff --git a/src/rails_admin/styles/themes/cerulean/theming.scss b/src/rails_admin/styles/themes/cerulean/theming.scss index b7bd500d78..1a5977591f 100644 --- a/src/rails_admin/styles/themes/cerulean/theming.scss +++ b/src/rails_admin/styles/themes/cerulean/theming.scss @@ -3,8 +3,13 @@ // .rails_admin .sidebar-nav added to prevent same link color // ------------------------------------------------------------------ -@mixin btn-shadow($color){ - @include gradient-vertical-three-colors(lighten($color, 8%), $color, 60%, darken($color, 4%)); +@mixin btn-shadow($color) { + @include gradient-vertical-three-colors( + lighten($color, 8%), + $color, + 60%, + darken($color, 4%) + ); filter: none; border-bottom: 1px solid darken($color, 10%); } @@ -18,16 +23,21 @@ } .navbar.navbar-default .badge { - background-color: #fff; - color: $navbar-default-bg; - } - -.navbar.navbar-inverse , .rails_admin .sidebar-nav { - @include gradient-vertical-three-colors(lighten($navbar-inverse-bg, 8%), lighten($navbar-inverse-bg, 4%), 60%, darken($navbar-inverse-bg, 2%)); - filter: none; - border-bottom: 1px solid darken($navbar-inverse-bg, 10%); - } + background-color: #fff; + color: $navbar-default-bg; +} +.navbar.navbar-inverse, +.rails_admin .sidebar-nav { + @include gradient-vertical-three-colors( + lighten($navbar-inverse-bg, 8%), + lighten($navbar-inverse-bg, 4%), + 60%, + darken($navbar-inverse-bg, 2%) + ); + filter: none; + border-bottom: 1px solid darken($navbar-inverse-bg, 10%); +} .navbar.navbar-inverse .badge { background-color: #fff; @@ -36,14 +46,11 @@ .navbar .navbar-nav > li > a, .navbar .navbar-brand { - text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1); - } - + text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1); +} @media (max-width: $grid-float-breakpoint-max) { - .navbar { - .dropdown-header { color: #fff; } @@ -53,7 +60,6 @@ // Buttons ==================================================================== .btn { - text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1); .caret { @@ -62,7 +68,6 @@ } .btn-default { - @include btn-shadow($btn-default-bg); &:hover { @@ -104,10 +109,8 @@ table, .table { > thead > tr > th { - color: $headings-color; } - } // Forms ====================================================================== @@ -125,7 +128,6 @@ table, .panel-warning, .panel-danger, .panel-info { - .panel-heading, .panel-title { color: #fff; diff --git a/src/rails_admin/styles/themes/cerulean/variables.scss b/src/rails_admin/styles/themes/cerulean/variables.scss index 5f4807394f..840475b983 100644 --- a/src/rails_admin/styles/themes/cerulean/variables.scss +++ b/src/rails_admin/styles/themes/cerulean/variables.scss @@ -3,256 +3,252 @@ // // -------------------------------------------------- - //== Colors // //## Gray and brand colors for use across Bootstrap. -$gray-base: #000; -$gray-darker: lighten($gray-base, 13.5%); // #222 -$gray-dark: lighten($gray-base, 20%); // #333 -$gray: lighten($gray-base, 33.5%); // #555 -$gray-light: lighten($gray-base, 60%); // #999 -$gray-lighter: lighten($gray-base, 93.5%); // #eee - -$brand-info: #2FA4E7; // default $brand-primary -$brand-success: #73A839; -$brand-primary: #033C73; // default $brand-info -$brand-warning: #DD5600; -$brand-danger: #C71C22; +$gray-base: #000; +$gray-darker: lighten($gray-base, 13.5%); // #222 +$gray-dark: lighten($gray-base, 20%); // #333 +$gray: lighten($gray-base, 33.5%); // #555 +$gray-light: lighten($gray-base, 60%); // #999 +$gray-lighter: lighten($gray-base, 93.5%); // #eee +$brand-info: #2fa4e7; // default $brand-primary +$brand-success: #73a839; +$brand-primary: #033c73; // default $brand-info +$brand-warning: #dd5600; +$brand-danger: #c71c22; //== Scaffolding // //## Settings for some of the most global styles. //** Background color for ``. -$body-bg: #fff; +$body-bg: #fff; //** Global text color on ``. -$text-color: $gray; +$text-color: $gray; //** Global textual link color. -$link-color: $brand-primary; +$link-color: $brand-primary; //** Link hover color set via `darken()` function. -$link-hover-color: darken($link-color, 15%); +$link-hover-color: darken($link-color, 15%); //** Link hover decoration. $link-hover-decoration: underline; - //== 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-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif; +$font-family-serif: Georgia, "Times New Roman", Times, serif; //** Default monospace fonts for ``, ``, and `
`.
-$font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;
-$font-family-base:        $font-family-sans-serif;
+$font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
+$font-family-base: $font-family-sans-serif;
 
-$font-size-base:          14px;
-$font-size-large:         ceil(($font-size-base * 1.25)); // ~18px
-$font-size-small:         ceil(($font-size-base * 0.85)); // ~12px
+$font-size-base: 14px;
+$font-size-large: ceil(($font-size-base * 1.25)); // ~18px
+$font-size-small: ceil(($font-size-base * 0.85)); // ~12px
 
-$font-size-h1:            floor(($font-size-base * 2.6)); // ~36px
-$font-size-h2:            floor(($font-size-base * 2.15)); // ~30px
-$font-size-h3:            ceil(($font-size-base * 1.7)); // ~24px
-$font-size-h4:            ceil(($font-size-base * 1.25)); // ~18px
-$font-size-h5:            $font-size-base;
-$font-size-h6:            ceil(($font-size-base * 0.85)); // ~12px
+$font-size-h1: floor(($font-size-base * 2.6)); // ~36px
+$font-size-h2: floor(($font-size-base * 2.15)); // ~30px
+$font-size-h3: ceil(($font-size-base * 1.7)); // ~24px
+$font-size-h4: ceil(($font-size-base * 1.25)); // ~18px
+$font-size-h5: $font-size-base;
+$font-size-h6: ceil(($font-size-base * 0.85)); // ~12px
 
 //** Unit-less `line-height` for use in components like buttons.
-$line-height-base:        1.428571429; // 20/14
+$line-height-base: 1.428571429; // 20/14
 //** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
-$line-height-computed:    floor(($font-size-base * $line-height-base)); // ~20px
+$line-height-computed: floor(($font-size-base * $line-height-base)); // ~20px
 
 //** By default, this inherits from the ``.
-$headings-font-family:    $font-family-base;
-$headings-font-weight:    500;
-$headings-line-height:    1.1;
-$headings-color:          #317EAC;
-
+$headings-font-family: $font-family-base;
+$headings-font-weight: 500;
+$headings-line-height: 1.1;
+$headings-color: #317eac;
 
 //== Iconography
 //
 //## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
 
 //** Load fonts from this directory.
-$icon-font-path:          "../fonts/";
+$icon-font-path: "../fonts/";
 //** File name for all font files.
-$icon-font-name:          "glyphicons-halflings-regular";
+$icon-font-name: "glyphicons-halflings-regular";
 //** Element ID within SVG icon file.
-$icon-font-svg-id:        "glyphicons_halflingsregular";
-
+$icon-font-svg-id: "glyphicons_halflingsregular";
 
 //== Components
 //
 //## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
 
-$padding-base-vertical:     8px;
-$padding-base-horizontal:   12px;
+$padding-base-vertical: 8px;
+$padding-base-horizontal: 12px;
 
-$padding-large-vertical:    14px;
-$padding-large-horizontal:  16px;
+$padding-large-vertical: 14px;
+$padding-large-horizontal: 16px;
 
-$padding-small-vertical:    5px;
-$padding-small-horizontal:  10px;
+$padding-small-vertical: 5px;
+$padding-small-horizontal: 10px;
 
-$padding-xs-vertical:       1px;
-$padding-xs-horizontal:     5px;
+$padding-xs-vertical: 1px;
+$padding-xs-horizontal: 5px;
 
-$line-height-large:         1.33;
-$line-height-small:         1.5;
+$line-height-large: 1.33;
+$line-height-small: 1.5;
 
-$border-radius-base:        0px;
-$border-radius-large:       0px;
-$border-radius-small:       0px;
+$border-radius-base: 0px;
+$border-radius-large: 0px;
+$border-radius-small: 0px;
 
 //** Global color for active items (e.g., navs or dropdowns).
-$component-active-color:    #fff;
+$component-active-color: #fff;
 //** Global background color for active items (e.g., navs or dropdowns).
-$component-active-bg:       $brand-primary;
+$component-active-bg: $brand-primary;
 
 //** Width of the `border` for generating carets that indicator dropdowns.
-$caret-width-base:          4px;
+$caret-width-base: 4px;
 //** Carets increase slightly in size for larger components.
-$caret-width-large:         5px;
-
+$caret-width-large: 5px;
 
 //== Tables
 //
 //## Customizes the `.table` component with basic values, each used across all table variations.
 
 //** Padding for ``s and ``s.
-$table-cell-padding:            8px;
+$table-cell-padding: 8px;
 //** Padding for cells in `.table-condensed`.
-$table-condensed-cell-padding:  5px;
+$table-condensed-cell-padding: 5px;
 
 //** Default background color used for all tables.
-$table-bg:                      transparent;
+$table-bg: transparent;
 //** Background color used for `.table-striped`.
-$table-bg-accent:               #f9f9f9;
+$table-bg-accent: #f9f9f9;
 //** Background color used for `.table-hover`.
-$table-bg-hover:                #f5f5f5;
-$table-bg-active:               $table-bg-hover;
+$table-bg-hover: #f5f5f5;
+$table-bg-active: $table-bg-hover;
 
 //** Border color for table and cell borders.
-$table-border-color:            #ddd;
-
+$table-border-color: #ddd;
 
 //== Buttons
 //
 //## For each of Bootstrap's buttons, define text, background and border color.
 
-$btn-font-weight:                normal;
+$btn-font-weight: normal;
 
-$btn-default-color:              $text-color;
-$btn-default-bg:                 #fff;
-$btn-default-border:             rgba(0, 0, 0, 0.1);
+$btn-default-color: $text-color;
+$btn-default-bg: #fff;
+$btn-default-border: rgba(0, 0, 0, 0.1);
 
-$btn-primary-color:              #fff;
-$btn-primary-bg:                 $brand-primary;
-$btn-primary-border:             $btn-primary-bg;
+$btn-primary-color: #fff;
+$btn-primary-bg: $brand-primary;
+$btn-primary-border: $btn-primary-bg;
 
-$btn-success-color:              #fff;
-$btn-success-bg:                 $brand-success;
-$btn-success-border:             $btn-success-bg;
+$btn-success-color: #fff;
+$btn-success-bg: $brand-success;
+$btn-success-border: $btn-success-bg;
 
-$btn-info-color:                 #fff;
-$btn-info-bg:                    $brand-info;
-$btn-info-border:                $btn-info-bg;
+$btn-info-color: #fff;
+$btn-info-bg: $brand-info;
+$btn-info-border: $btn-info-bg;
 
-$btn-warning-color:              #fff;
-$btn-warning-bg:                 $brand-warning;
-$btn-warning-border:             $btn-warning-bg;
+$btn-warning-color: #fff;
+$btn-warning-bg: $brand-warning;
+$btn-warning-border: $btn-warning-bg;
 
-$btn-danger-color:               #fff;
-$btn-danger-bg:                  $brand-danger;
-$btn-danger-border:              $btn-danger-bg;
-
-$btn-link-disabled-color:        $gray-light;
+$btn-danger-color: #fff;
+$btn-danger-bg: $brand-danger;
+$btn-danger-border: $btn-danger-bg;
 
+$btn-link-disabled-color: $gray-light;
 
 //== Forms
 //
 //##
 
 //** `` background color
-$input-bg:                       #fff;
+$input-bg: #fff;
 //** `` background color
-$input-bg-disabled:              $gray-lighter;
+$input-bg-disabled: $gray-lighter;
 
 //** Text color for ``s
-$input-color:                    $text-color;
+$input-color: $text-color;
 //** `` border color
-$input-border:                   #ccc;
+$input-border: #ccc;
 
 // TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
 //** Default `.form-control` border radius
-$input-border-radius:            $border-radius-base;
+$input-border-radius: $border-radius-base;
 //** Large `.form-control` border radius
-$input-border-radius-large:      $border-radius-large;
+$input-border-radius-large: $border-radius-large;
 //** Small `.form-control` border radius
-$input-border-radius-small:      $border-radius-small;
+$input-border-radius-small: $border-radius-small;
 
 //** Border color for inputs on focus
-$input-border-focus:             #66afe9;
+$input-border-focus: #66afe9;
 
 //** Placeholder text color
-$input-color-placeholder:        $gray-light;
+$input-color-placeholder: $gray-light;
 
 //** Default `.form-control` height
-$input-height-base:              ($line-height-computed + ($padding-base-vertical * 2) + 2);
+$input-height-base: ($line-height-computed + ($padding-base-vertical * 2) + 2);
 //** Large `.form-control` height
-$input-height-large:             (ceil($font-size-large * $line-height-large) + ($padding-large-vertical * 2) + 2);
+$input-height-large: (
+  ceil($font-size-large * $line-height-large) + ($padding-large-vertical * 2) +
+    2
+);
 //** Small `.form-control` height
-$input-height-small:             (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2);
+$input-height-small: (
+  floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) +
+    2
+);
 
-$legend-color:                   $text-color;
-$legend-border-color:            #e5e5e5;
+$legend-color: $text-color;
+$legend-border-color: #e5e5e5;
 
 //** Background color for textual input addons
-$input-group-addon-bg:           $gray-lighter;
+$input-group-addon-bg: $gray-lighter;
 //** Border color for textual input addons
 $input-group-addon-border-color: $input-border;
 
 //** Disabled cursor for form controls and buttons.
-$cursor-disabled:                not-allowed;
-
+$cursor-disabled: not-allowed;
 
 //== Dropdowns
 //
 //## Dropdown menu container and contents.
 
 //** Background for the dropdown menu.
-$dropdown-bg:                    #fff;
+$dropdown-bg: #fff;
 //** Dropdown menu `border-color`.
-$dropdown-border:                rgba(0,0,0,.15);
+$dropdown-border: rgba(0, 0, 0, 0.15);
 //** Dropdown menu `border-color` **for IE8**.
-$dropdown-fallback-border:       #ccc;
+$dropdown-fallback-border: #ccc;
 //** Divider color for between dropdown items.
-$dropdown-divider-bg:            #e5e5e5;
+$dropdown-divider-bg: #e5e5e5;
 
 //** Dropdown link text color.
-$dropdown-link-color:            $gray-dark;
+$dropdown-link-color: $gray-dark;
 //** Hover color for dropdown links.
-$dropdown-link-hover-color:      #fff;
+$dropdown-link-hover-color: #fff;
 //** Hover background for dropdown links.
-$dropdown-link-hover-bg:         $component-active-bg;
+$dropdown-link-hover-bg: $component-active-bg;
 
 //** Active dropdown menu item text color.
-$dropdown-link-active-color:     #fff;
+$dropdown-link-active-color: #fff;
 //** Active dropdown menu item background color.
-$dropdown-link-active-bg:        $component-active-bg;
+$dropdown-link-active-bg: $component-active-bg;
 
 //** Disabled dropdown menu item background color.
-$dropdown-link-disabled-color:   $gray-light;
+$dropdown-link-disabled-color: $gray-light;
 
 //** Text color for headers within dropdown menus.
-$dropdown-header-color:          $gray-light;
+$dropdown-header-color: $gray-light;
 
 //** Deprecated `$dropdown-caret-color` as of v3.1.0
-$dropdown-caret-color:           #000;
-
+$dropdown-caret-color: #000;
 
 //-- Z-index master list
 //
@@ -261,13 +257,12 @@ $dropdown-caret-color:           #000;
 //
 // Note: These variables are not generated into the Customizer.
 
-$zindex-navbar:            1000;
-$zindex-dropdown:          1000;
-$zindex-popover:           1060;
-$zindex-tooltip:           1070;
-$zindex-navbar-fixed:      1030;
-$zindex-modal:             1040;
-
+$zindex-navbar: 1000;
+$zindex-dropdown: 1000;
+$zindex-popover: 1060;
+$zindex-tooltip: 1070;
+$zindex-navbar-fixed: 1030;
+$zindex-modal: 1040;
 
 //== Media queries breakpoints
 //
@@ -275,561 +270,539 @@ $zindex-modal:             1040;
 
 // Extra small screen / phone
 //** Deprecated `$screen-xs` as of v3.0.1
-$screen-xs:                  480px;
+$screen-xs: 480px;
 //** Deprecated `$screen-xs-min` as of v3.2.0
-$screen-xs-min:              $screen-xs;
+$screen-xs-min: $screen-xs;
 //** Deprecated `$screen-phone` as of v3.0.1
-$screen-phone:               $screen-xs-min;
+$screen-phone: $screen-xs-min;
 
 // Small screen / tablet
 //** Deprecated `$screen-sm` as of v3.0.1
-$screen-sm:                  768px;
-$screen-sm-min:              $screen-sm;
+$screen-sm: 768px;
+$screen-sm-min: $screen-sm;
 //** Deprecated `$screen-tablet` as of v3.0.1
-$screen-tablet:              $screen-sm-min;
+$screen-tablet: $screen-sm-min;
 
 // Medium screen / desktop
 //** Deprecated `$screen-md` as of v3.0.1
-$screen-md:                  992px;
-$screen-md-min:              $screen-md;
+$screen-md: 992px;
+$screen-md-min: $screen-md;
 //** Deprecated `$screen-desktop` as of v3.0.1
-$screen-desktop:             $screen-md-min;
+$screen-desktop: $screen-md-min;
 
 // Large screen / wide desktop
 //** Deprecated `$screen-lg` as of v3.0.1
-$screen-lg:                  1200px;
-$screen-lg-min:              $screen-lg;
+$screen-lg: 1200px;
+$screen-lg-min: $screen-lg;
 //** Deprecated `$screen-lg-desktop` as of v3.0.1
-$screen-lg-desktop:          $screen-lg-min;
+$screen-lg-desktop: $screen-lg-min;
 
 // So media queries don't overlap when required, provide a maximum
-$screen-xs-max:              ($screen-sm-min - 1);
-$screen-sm-max:              ($screen-md-min - 1);
-$screen-md-max:              ($screen-lg-min - 1);
-
+$screen-xs-max: ($screen-sm-min - 1);
+$screen-sm-max: ($screen-md-min - 1);
+$screen-md-max: ($screen-lg-min - 1);
 
 //== Grid system
 //
 //## Define your custom responsive grid.
 
 //** Number of columns in the grid.
-$grid-columns:              12;
+$grid-columns: 12;
 //** Padding between columns. Gets divided in half for the left and right.
-$grid-gutter-width:         30px;
+$grid-gutter-width: 30px;
 // Navbar collapse
 //** Point at which the navbar becomes uncollapsed.
-$grid-float-breakpoint:     $screen-sm-min;
+$grid-float-breakpoint: $screen-sm-min;
 //** Point at which the navbar begins collapsing.
 $grid-float-breakpoint-max: ($grid-float-breakpoint - 1);
 
-
 //== Container sizes
 //
 //## Define the maximum width of `.container` for different screen sizes.
 
 // Small screen / tablet
-$container-tablet:             (720px + $grid-gutter-width);
+$container-tablet: (720px + $grid-gutter-width);
 //** For `$screen-sm-min` and up.
-$container-sm:                 $container-tablet;
+$container-sm: $container-tablet;
 
 // Medium screen / desktop
-$container-desktop:            (940px + $grid-gutter-width);
+$container-desktop: (940px + $grid-gutter-width);
 //** For `$screen-md-min` and up.
-$container-md:                 $container-desktop;
+$container-md: $container-desktop;
 
 // Large screen / wide desktop
-$container-large-desktop:      (1140px + $grid-gutter-width);
+$container-large-desktop: (1140px + $grid-gutter-width);
 //** For `$screen-lg-min` and up.
-$container-lg:                 $container-large-desktop;
-
+$container-lg: $container-large-desktop;
 
 //== Navbar
 //
 //##
 
 // Basics of a navbar
-$navbar-height:                    50px;
-$navbar-margin-bottom:             $line-height-computed;
-$navbar-border-radius:             $border-radius-base;
-$navbar-padding-horizontal:        floor(($grid-gutter-width / 2));
-$navbar-padding-vertical:          (($navbar-height - $line-height-computed) / 2);
-$navbar-collapse-max-height:       340px;
+$navbar-height: 50px;
+$navbar-margin-bottom: $line-height-computed;
+$navbar-border-radius: $border-radius-base;
+$navbar-padding-horizontal: floor(($grid-gutter-width / 2));
+$navbar-padding-vertical: (($navbar-height - $line-height-computed) / 2);
+$navbar-collapse-max-height: 340px;
 
-$navbar-default-color:             #ddd;
-$navbar-default-bg:                $brand-primary;
-$navbar-default-border:            darken($navbar-default-bg, 6.5%);
+$navbar-default-color: #ddd;
+$navbar-default-bg: $brand-primary;
+$navbar-default-border: darken($navbar-default-bg, 6.5%);
 
 // Navbar links
-$navbar-default-link-color:                #fff;
-$navbar-default-link-hover-color:          #fff;
-$navbar-default-link-hover-bg:             darken($navbar-default-bg, 10%);
-$navbar-default-link-active-color:         #fff;
-$navbar-default-link-active-bg:            darken($navbar-default-bg, 10%);
-$navbar-default-link-disabled-color:       #ddd;
-$navbar-default-link-disabled-bg:          transparent;
+$navbar-default-link-color: #fff;
+$navbar-default-link-hover-color: #fff;
+$navbar-default-link-hover-bg: darken($navbar-default-bg, 10%);
+$navbar-default-link-active-color: #fff;
+$navbar-default-link-active-bg: darken($navbar-default-bg, 10%);
+$navbar-default-link-disabled-color: #ddd;
+$navbar-default-link-disabled-bg: transparent;
 
 // Navbar brand label
-$navbar-default-brand-color:               $navbar-default-link-color;
-$navbar-default-brand-hover-color:         #fff;
-$navbar-default-brand-hover-bg:            none;
+$navbar-default-brand-color: $navbar-default-link-color;
+$navbar-default-brand-hover-color: #fff;
+$navbar-default-brand-hover-bg: none;
 
 // Navbar toggle
-$navbar-default-toggle-hover-bg:           darken($navbar-default-bg, 10%);
-$navbar-default-toggle-icon-bar-bg:        #fff;
-$navbar-default-toggle-border-color:       darken($navbar-default-bg, 10%);
-
+$navbar-default-toggle-hover-bg: darken($navbar-default-bg, 10%);
+$navbar-default-toggle-icon-bar-bg: #fff;
+$navbar-default-toggle-border-color: darken($navbar-default-bg, 10%);
 
 // Inverted navbar
 // Reset inverted navbar basics
-$navbar-inverse-color:                      #fff;
-$navbar-inverse-bg:                         $brand-info;
-$navbar-inverse-border:                     darken($navbar-inverse-bg, 5%);
+$navbar-inverse-color: #fff;
+$navbar-inverse-bg: $brand-info;
+$navbar-inverse-border: darken($navbar-inverse-bg, 5%);
 
 // Inverted navbar links
-$navbar-inverse-link-color:                 #fff;
-$navbar-inverse-link-hover-color:           #fff;
-$navbar-inverse-link-hover-bg:              darken($navbar-inverse-bg, 5%);
-$navbar-inverse-link-active-color:          #fff;
-$navbar-inverse-link-active-bg:             darken($navbar-inverse-bg, 5%);
-$navbar-inverse-link-disabled-color:        #ccc;
-$navbar-inverse-link-disabled-bg:           transparent;
+$navbar-inverse-link-color: #fff;
+$navbar-inverse-link-hover-color: #fff;
+$navbar-inverse-link-hover-bg: darken($navbar-inverse-bg, 5%);
+$navbar-inverse-link-active-color: #fff;
+$navbar-inverse-link-active-bg: darken($navbar-inverse-bg, 5%);
+$navbar-inverse-link-disabled-color: #ccc;
+$navbar-inverse-link-disabled-bg: transparent;
 
 // Inverted navbar brand label
-$navbar-inverse-brand-color:                $navbar-inverse-link-color;
-$navbar-inverse-brand-hover-color:          #fff;
-$navbar-inverse-brand-hover-bg:             none;
+$navbar-inverse-brand-color: $navbar-inverse-link-color;
+$navbar-inverse-brand-hover-color: #fff;
+$navbar-inverse-brand-hover-bg: none;
 
 // Inverted navbar toggle
-$navbar-inverse-toggle-hover-bg:            darken($navbar-inverse-bg, 5%);
-$navbar-inverse-toggle-icon-bar-bg:         #fff;
-$navbar-inverse-toggle-border-color:        darken($navbar-inverse-bg, 5%);
-
+$navbar-inverse-toggle-hover-bg: darken($navbar-inverse-bg, 5%);
+$navbar-inverse-toggle-icon-bar-bg: #fff;
+$navbar-inverse-toggle-border-color: darken($navbar-inverse-bg, 5%);
 
 //== Navs
 //
 //##
 
 //=== Shared nav styles
-$nav-link-padding:                          10px 15px;
-$nav-link-hover-bg:                         $gray-lighter;
+$nav-link-padding: 10px 15px;
+$nav-link-hover-bg: $gray-lighter;
 
-$nav-disabled-link-color:                   $gray-light;
-$nav-disabled-link-hover-color:             $gray-light;
+$nav-disabled-link-color: $gray-light;
+$nav-disabled-link-hover-color: $gray-light;
 
 //== Tabs
-$nav-tabs-border-color:                     #ddd;
+$nav-tabs-border-color: #ddd;
 
-$nav-tabs-link-hover-border-color:          $gray-lighter;
+$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-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-tabs-justified-link-border-color: #ddd;
+$nav-tabs-justified-active-link-border-color: $body-bg;
 
 //== Pills
-$nav-pills-border-radius:                   $border-radius-base;
-$nav-pills-active-link-hover-bg:            $component-active-bg;
-$nav-pills-active-link-hover-color:         $component-active-color;
-
+$nav-pills-border-radius: $border-radius-base;
+$nav-pills-active-link-hover-bg: $component-active-bg;
+$nav-pills-active-link-hover-color: $component-active-color;
 
 //== Pagination
 //
 //##
 
-$pagination-color:                     $link-color;
-$pagination-bg:                        #fff;
-$pagination-border:                    #ddd;
-
-$pagination-hover-color:               $link-hover-color;
-$pagination-hover-bg:                  $gray-lighter;
-$pagination-hover-border:              #ddd;
+$pagination-color: $link-color;
+$pagination-bg: #fff;
+$pagination-border: #ddd;
 
-$pagination-active-color:              $gray-light;
-$pagination-active-bg:                 #f5f5f5;
-$pagination-active-border:             $pagination-hover-border;
+$pagination-hover-color: $link-hover-color;
+$pagination-hover-bg: $gray-lighter;
+$pagination-hover-border: #ddd;
 
-$pagination-disabled-color:            $gray-light;
-$pagination-disabled-bg:               #fff;
-$pagination-disabled-border:           #ddd;
+$pagination-active-color: $gray-light;
+$pagination-active-bg: #f5f5f5;
+$pagination-active-border: $pagination-hover-border;
 
+$pagination-disabled-color: $gray-light;
+$pagination-disabled-bg: #fff;
+$pagination-disabled-border: #ddd;
 
 //== Pager
 //
 //##
 
-$pager-bg:                             $pagination-bg;
-$pager-border:                         $pagination-border;
-$pager-border-radius:                  15px;
+$pager-bg: $pagination-bg;
+$pager-border: $pagination-border;
+$pager-border-radius: 15px;
 
-$pager-hover-bg:                       $pagination-hover-bg;
+$pager-hover-bg: $pagination-hover-bg;
 
-$pager-active-bg:                      $pagination-active-bg;
-$pager-active-color:                   $pagination-active-color;
-
-$pager-disabled-color:                 $gray-light;
+$pager-active-bg: $pagination-active-bg;
+$pager-active-color: $pagination-active-color;
 
+$pager-disabled-color: $gray-light;
 
 //== Jumbotron
 //
 //##
 
-$jumbotron-padding:              30px;
-$jumbotron-color:                inherit;
-$jumbotron-bg:                   $gray-lighter;
-$jumbotron-heading-color:        inherit;
-$jumbotron-font-size:            ceil(($font-size-base * 1.5));
-
+$jumbotron-padding: 30px;
+$jumbotron-color: inherit;
+$jumbotron-bg: $gray-lighter;
+$jumbotron-heading-color: inherit;
+$jumbotron-font-size: ceil(($font-size-base * 1.5));
 
 //== Form states and alerts
 //
 //## Define colors for form feedback states and, by default, alerts.
 
-$state-success-text:             #468847;
-$state-success-bg:               #dff0d8;
-$state-success-border:           darken(adjust-hue($state-success-bg, -10), 5%);
-
-$state-info-text:                #3a87ad;
-$state-info-bg:                  #d9edf7;
-$state-info-border:              darken(adjust-hue($state-info-bg, -10), 7%);
+$state-success-text: #468847;
+$state-success-bg: #dff0d8;
+$state-success-border: darken(adjust-hue($state-success-bg, -10), 5%);
 
-$state-warning-text:             #c09853;
-$state-warning-bg:               #fcf8e3;
-$state-warning-border:           darken(adjust-hue($state-warning-bg, -10), 3%);
+$state-info-text: #3a87ad;
+$state-info-bg: #d9edf7;
+$state-info-border: darken(adjust-hue($state-info-bg, -10), 7%);
 
-$state-danger-text:              #b94a48;
-$state-danger-bg:                #f2dede;
-$state-danger-border:            darken(adjust-hue($state-danger-bg, -10), 3%);
+$state-warning-text: #c09853;
+$state-warning-bg: #fcf8e3;
+$state-warning-border: darken(adjust-hue($state-warning-bg, -10), 3%);
 
+$state-danger-text: #b94a48;
+$state-danger-bg: #f2dede;
+$state-danger-border: darken(adjust-hue($state-danger-bg, -10), 3%);
 
 //== Tooltips
 //
 //##
 
 //** Tooltip max width
-$tooltip-max-width:           200px;
+$tooltip-max-width: 200px;
 //** Tooltip text color
-$tooltip-color:               #fff;
+$tooltip-color: #fff;
 //** Tooltip background color
-$tooltip-bg:                  rgba(0,0,0,.9);
-$tooltip-opacity:             .9;
+$tooltip-bg: rgba(0, 0, 0, 0.9);
+$tooltip-opacity: 0.9;
 
 //** Tooltip arrow width
-$tooltip-arrow-width:         5px;
+$tooltip-arrow-width: 5px;
 //** Tooltip arrow color
-$tooltip-arrow-color:         $tooltip-bg;
-
+$tooltip-arrow-color: $tooltip-bg;
 
 //== Popovers
 //
 //##
 
 //** Popover body background color
-$popover-bg:                          #fff;
+$popover-bg: #fff;
 //** Popover maximum width
-$popover-max-width:                   276px;
+$popover-max-width: 276px;
 //** Popover border color
-$popover-border-color:                rgba(0,0,0,.2);
+$popover-border-color: rgba(0, 0, 0, 0.2);
 //** Popover fallback border color
-$popover-fallback-border-color:       #ccc;
+$popover-fallback-border-color: #ccc;
 
 //** Popover title background color
-$popover-title-bg:                    darken($popover-bg, 3%);
+$popover-title-bg: darken($popover-bg, 3%);
 
 //** Popover arrow width
-$popover-arrow-width:                 10px;
+$popover-arrow-width: 10px;
 //** Popover arrow color
-$popover-arrow-color:                 $popover-bg;
+$popover-arrow-color: $popover-bg;
 
 //** Popover outer arrow width
-$popover-arrow-outer-width:           ($popover-arrow-width + 1);
+$popover-arrow-outer-width: ($popover-arrow-width + 1);
 //** Popover outer arrow color
-$popover-arrow-outer-color:           fadein($popover-border-color, 5%);
+$popover-arrow-outer-color: fadein($popover-border-color, 5%);
 //** Popover outer arrow fallback color
-$popover-arrow-outer-fallback-color:  darken($popover-fallback-border-color, 20%);
-
+$popover-arrow-outer-fallback-color: darken(
+  $popover-fallback-border-color,
+  20%
+);
 
 //== Labels
 //
 //##
 
 //** Default label background color
-$label-default-bg:            $gray-light;
+$label-default-bg: $gray-light;
 //** Primary label background color
-$label-primary-bg:            $brand-primary;
+$label-primary-bg: $brand-primary;
 //** Success label background color
-$label-success-bg:            $brand-success;
+$label-success-bg: $brand-success;
 //** Info label background color
-$label-info-bg:               $brand-info;
+$label-info-bg: $brand-info;
 //** Warning label background color
-$label-warning-bg:            $brand-warning;
+$label-warning-bg: $brand-warning;
 //** Danger label background color
-$label-danger-bg:             $brand-danger;
+$label-danger-bg: $brand-danger;
 
 //** Default label text color
-$label-color:                 #fff;
+$label-color: #fff;
 //** Default text color of a linked label
-$label-link-hover-color:      #fff;
-
+$label-link-hover-color: #fff;
 
 //== Modals
 //
 //##
 
 //** Padding applied to the modal body
-$modal-inner-padding:         20px;
+$modal-inner-padding: 20px;
 
 //** Padding applied to the modal title
-$modal-title-padding:         15px;
+$modal-title-padding: 15px;
 //** Modal title line-height
-$modal-title-line-height:     $line-height-base;
+$modal-title-line-height: $line-height-base;
 
 //** Background color of modal content area
-$modal-content-bg:                             #fff;
+$modal-content-bg: #fff;
 //** Modal content border color
-$modal-content-border-color:                   rgba(0,0,0,.2);
+$modal-content-border-color: rgba(0, 0, 0, 0.2);
 //** Modal content border color **for IE8**
-$modal-content-fallback-border-color:          #999;
+$modal-content-fallback-border-color: #999;
 
 //** Modal backdrop background color
-$modal-backdrop-bg:           #000;
+$modal-backdrop-bg: #000;
 //** Modal backdrop opacity
-$modal-backdrop-opacity:      .5;
+$modal-backdrop-opacity: 0.5;
 //** Modal header border color
-$modal-header-border-color:   #e5e5e5;
+$modal-header-border-color: #e5e5e5;
 //** Modal footer border color
-$modal-footer-border-color:   $modal-header-border-color;
-
-$modal-lg:                    900px;
-$modal-md:                    600px;
-$modal-sm:                    300px;
+$modal-footer-border-color: $modal-header-border-color;
 
+$modal-lg: 900px;
+$modal-md: 600px;
+$modal-sm: 300px;
 
 //== Alerts
 //
 //## Define alert colors, border radius, and padding.
 
-$alert-padding:               15px;
-$alert-border-radius:         $border-radius-base;
-$alert-link-font-weight:      bold;
+$alert-padding: 15px;
+$alert-border-radius: $border-radius-base;
+$alert-link-font-weight: bold;
 
-$alert-success-bg:            $state-success-bg;
-$alert-success-text:          $state-success-text;
-$alert-success-border:        $state-success-border;
+$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-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;
+$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
 //
 //##
 
 //** Background color of the whole progress component
-$progress-bg:                 #f5f5f5;
+$progress-bg: #f5f5f5;
 //** Progress bar text color
-$progress-bar-color:          #fff;
+$progress-bar-color: #fff;
 //** Variable for setting rounded corners on progress bar.
-$progress-border-radius:      $border-radius-base;
+$progress-border-radius: $border-radius-base;
 
 //** Default progress bar color
-$progress-bar-bg:             $brand-primary;
+$progress-bar-bg: $brand-primary;
 //** Success progress bar color
-$progress-bar-success-bg:     $brand-success;
+$progress-bar-success-bg: $brand-success;
 //** Warning progress bar color
-$progress-bar-warning-bg:     $brand-warning;
+$progress-bar-warning-bg: $brand-warning;
 //** Danger progress bar color
-$progress-bar-danger-bg:      $brand-danger;
+$progress-bar-danger-bg: $brand-danger;
 //** Info progress bar color
-$progress-bar-info-bg:        $brand-info;
-
+$progress-bar-info-bg: $brand-info;
 
 //== List group
 //
 //##
 
 //** Background color on `.list-group-item`
-$list-group-bg:                 #fff;
+$list-group-bg: #fff;
 //** `.list-group-item` border color
-$list-group-border:             #ddd;
+$list-group-border: #ddd;
 //** List group border radius
-$list-group-border-radius:      $border-radius-base;
+$list-group-border-radius: $border-radius-base;
 
 //** Background color of single list items on hover
-$list-group-hover-bg:           #f5f5f5;
+$list-group-hover-bg: #f5f5f5;
 //** Text color of active list items
-$list-group-active-color:       $component-active-color;
+$list-group-active-color: $component-active-color;
 //** Background color of active list items
-$list-group-active-bg:          $component-active-bg;
+$list-group-active-bg: $component-active-bg;
 //** Border color of active list elements
-$list-group-active-border:      $list-group-active-bg;
+$list-group-active-border: $list-group-active-bg;
 //** Text color for content within active list items
-$list-group-active-text-color:  lighten($list-group-active-bg, 40%);
+$list-group-active-text-color: lighten($list-group-active-bg, 40%);
 
 //** Text color of disabled list items
-$list-group-disabled-color:      $gray-light;
+$list-group-disabled-color: $gray-light;
 //** Background color of disabled list items
-$list-group-disabled-bg:         $gray-lighter;
+$list-group-disabled-bg: $gray-lighter;
 //** Text color for content within disabled list items
 $list-group-disabled-text-color: $list-group-disabled-color;
 
-$list-group-link-color:         #555;
-$list-group-link-hover-color:   $list-group-link-color;
+$list-group-link-color: #555;
+$list-group-link-hover-color: $list-group-link-color;
 $list-group-link-heading-color: #333;
 
-
 //== Panels
 //
 //##
 
-$panel-bg:                    #fff;
-$panel-body-padding:          15px;
-$panel-heading-padding:       10px 15px;
-$panel-footer-padding:        $panel-heading-padding;
-$panel-border-radius:         $border-radius-base;
+$panel-bg: #fff;
+$panel-body-padding: 15px;
+$panel-heading-padding: 10px 15px;
+$panel-footer-padding: $panel-heading-padding;
+$panel-border-radius: $border-radius-base;
 
 //** Border color for elements within panels
-$panel-inner-border:          #ddd;
-$panel-footer-bg:             #f5f5f5;
-
-$panel-default-text:          $text-color;
-$panel-default-border:        #ddd;
-$panel-default-heading-bg:    #f5f5f5;
+$panel-inner-border: #ddd;
+$panel-footer-bg: #f5f5f5;
 
-$panel-primary-text:          #fff;
-$panel-primary-border:        $panel-default-border;
-$panel-primary-heading-bg:    $brand-primary;
+$panel-default-text: $text-color;
+$panel-default-border: #ddd;
+$panel-default-heading-bg: #f5f5f5;
 
-$panel-success-text:          $state-success-text;
-$panel-success-border:        $panel-default-border;
-$panel-success-heading-bg:    $brand-success;
+$panel-primary-text: #fff;
+$panel-primary-border: $panel-default-border;
+$panel-primary-heading-bg: $brand-primary;
 
-$panel-info-text:             $state-info-text;
-$panel-info-border:           $panel-default-border;
-$panel-info-heading-bg:       $brand-info;
+$panel-success-text: $state-success-text;
+$panel-success-border: $panel-default-border;
+$panel-success-heading-bg: $brand-success;
 
-$panel-warning-text:          $state-warning-text;
-$panel-warning-border:        $panel-default-border;
-$panel-warning-heading-bg:    $brand-warning;
+$panel-info-text: $state-info-text;
+$panel-info-border: $panel-default-border;
+$panel-info-heading-bg: $brand-info;
 
-$panel-danger-text:           $state-danger-text;
-$panel-danger-border:         $panel-default-border;
-$panel-danger-heading-bg:     $brand-danger;
+$panel-warning-text: $state-warning-text;
+$panel-warning-border: $panel-default-border;
+$panel-warning-heading-bg: $brand-warning;
 
+$panel-danger-text: $state-danger-text;
+$panel-danger-border: $panel-default-border;
+$panel-danger-heading-bg: $brand-danger;
 
 //== Thumbnails
 //
 //##
 
 //** Padding around the thumbnail image
-$thumbnail-padding:           4px;
+$thumbnail-padding: 4px;
 //** Thumbnail background color
-$thumbnail-bg:                $body-bg;
+$thumbnail-bg: $body-bg;
 //** Thumbnail border color
-$thumbnail-border:            #ddd;
+$thumbnail-border: #ddd;
 //** Thumbnail border radius
-$thumbnail-border-radius:     $border-radius-base;
+$thumbnail-border-radius: $border-radius-base;
 
 //** Custom text color for thumbnail captions
-$thumbnail-caption-color:     $text-color;
+$thumbnail-caption-color: $text-color;
 //** Padding around the thumbnail caption
-$thumbnail-caption-padding:   9px;
-
+$thumbnail-caption-padding: 9px;
 
 //== Wells
 //
 //##
 
-$well-bg:                     #f5f5f5;
-$well-border:                 darken($well-bg, 7%);
-
+$well-bg: #f5f5f5;
+$well-border: darken($well-bg, 7%);
 
 //== Badges
 //
 //##
 
-$badge-color:                 #fff;
+$badge-color: #fff;
 //** Linked badge text color on hover
-$badge-link-hover-color:      #fff;
-$badge-bg:                    $brand-primary;
+$badge-link-hover-color: #fff;
+$badge-bg: $brand-primary;
 
 //** Badge text color in active nav link
-$badge-active-color:          $link-color;
+$badge-active-color: $link-color;
 //** Badge background color in active nav link
-$badge-active-bg:             #fff;
-
-$badge-font-weight:           bold;
-$badge-line-height:           1;
-$badge-border-radius:         10px;
+$badge-active-bg: #fff;
 
+$badge-font-weight: bold;
+$badge-line-height: 1;
+$badge-border-radius: 10px;
 
 //== Breadcrumbs
 //
 //##
 
-$breadcrumb-padding-vertical:   8px;
+$breadcrumb-padding-vertical: 8px;
 $breadcrumb-padding-horizontal: 15px;
 //** Breadcrumb background color
-$breadcrumb-bg:                 #f5f5f5;
+$breadcrumb-bg: #f5f5f5;
 //** Breadcrumb text color
-$breadcrumb-color:              #ccc;
+$breadcrumb-color: #ccc;
 //** Text color of current page in the breadcrumb
-$breadcrumb-active-color:       $gray-light;
+$breadcrumb-active-color: $gray-light;
 //** Textual separator for between breadcrumb elements
-$breadcrumb-separator:          "/";
-
+$breadcrumb-separator: "/";
 
 //== Carousel
 //
 //##
 
-$carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6);
-
-$carousel-control-color:                      #fff;
-$carousel-control-width:                      15%;
-$carousel-control-opacity:                    .5;
-$carousel-control-font-size:                  20px;
+$carousel-text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
 
-$carousel-indicator-active-bg:                #fff;
-$carousel-indicator-border-color:             #fff;
+$carousel-control-color: #fff;
+$carousel-control-width: 15%;
+$carousel-control-opacity: 0.5;
+$carousel-control-font-size: 20px;
 
-$carousel-caption-color:                      #fff;
+$carousel-indicator-active-bg: #fff;
+$carousel-indicator-border-color: #fff;
 
+$carousel-caption-color: #fff;
 
 //== Close
 //
 //##
 
-$close-font-weight:           bold;
-$close-color:                 #000;
-$close-text-shadow:           0 1px 0 #fff;
-
+$close-font-weight: bold;
+$close-color: #000;
+$close-text-shadow: 0 1px 0 #fff;
 
 //== Code
 //
 //##
 
-$code-color:                  #c7254e;
-$code-bg:                     #f9f2f4;
-
-$kbd-color:                   #fff;
-$kbd-bg:                      #333;
+$code-color: #c7254e;
+$code-bg: #f9f2f4;
 
-$pre-bg:                      #f5f5f5;
-$pre-color:                   $gray-dark;
-$pre-border-color:            #ccc;
-$pre-scrollable-max-height:   340px;
+$kbd-color: #fff;
+$kbd-bg: #333;
 
+$pre-bg: #f5f5f5;
+$pre-color: $gray-dark;
+$pre-border-color: #ccc;
+$pre-scrollable-max-height: 340px;
 
 //== Type
 //
@@ -838,20 +811,20 @@ $pre-scrollable-max-height:   340px;
 //** Horizontal offset for forms and lists.
 $component-offset-horizontal: 180px;
 //** Text muted color
-$text-muted:                  $gray-light;
+$text-muted: $gray-light;
 //** Abbreviations and acronyms border color
-$abbr-border-color:           $gray-light;
+$abbr-border-color: $gray-light;
 //** Headings small color
-$headings-small-color:        $gray-light;
+$headings-small-color: $gray-light;
 //** Blockquote small color
-$blockquote-small-color:      $gray-light;
+$blockquote-small-color: $gray-light;
 //** Blockquote font size
-$blockquote-font-size:        ($font-size-base * 1.25);
+$blockquote-font-size: ($font-size-base * 1.25);
 //** Blockquote border color
-$blockquote-border-color:     $gray-lighter;
+$blockquote-border-color: $gray-lighter;
 //** Page header border color
-$page-header-border-color:    $gray-lighter;
+$page-header-border-color: $gray-lighter;
 //** Width of horizontal description list titles
-$dl-horizontal-offset:        $component-offset-horizontal;
+$dl-horizontal-offset: $component-offset-horizontal;
 //** Horizontal line color.
-$hr-border:                   $gray-lighter;
+$hr-border: $gray-lighter;