summaryrefslogtreecommitdiffstats
path: root/resources/scss/bootstrap
diff options
context:
space:
mode:
Diffstat (limited to 'resources/scss/bootstrap')
-rw-r--r--resources/scss/bootstrap/_normalize.scss2
-rw-r--r--resources/scss/bootstrap/_scaffolding.scss2
-rw-r--r--resources/scss/bootstrap/_variables.scss206
3 files changed, 105 insertions, 105 deletions
diff --git a/resources/scss/bootstrap/_normalize.scss b/resources/scss/bootstrap/_normalize.scss
index 9dddf73..3794158 100644
--- a/resources/scss/bootstrap/_normalize.scss
+++ b/resources/scss/bootstrap/_normalize.scss
@@ -7,7 +7,7 @@
//
html {
- font-family: sans-serif; // 1
+ font-family: $base-font-regular; // 1
-ms-text-size-adjust: 100%; // 2
-webkit-text-size-adjust: 100%; // 2
}
diff --git a/resources/scss/bootstrap/_scaffolding.scss b/resources/scss/bootstrap/_scaffolding.scss
index 910afd5..559216b 100644
--- a/resources/scss/bootstrap/_scaffolding.scss
+++ b/resources/scss/bootstrap/_scaffolding.scss
@@ -24,7 +24,7 @@ html {
}
body {
- font-family: $font-family-base;
+ font-family: $base-font-regular;
font-size: $font-size-base;
line-height: $line-height-base;
color: $text-color;
diff --git a/resources/scss/bootstrap/_variables.scss b/resources/scss/bootstrap/_variables.scss
index 50b8781..8be9076 100644
--- a/resources/scss/bootstrap/_variables.scss
+++ b/resources/scss/bootstrap/_variables.scss
@@ -7,7 +7,7 @@ $bootstrap-sass-asset-helper: false !default;
//
//## Gray and brand colors for use across Bootstrap.
-$gray-base: #000 !default;
+$gray-base: $darkest !default;
$gray-darker: lighten($gray-base, 13.5%) !default;
// #222
$gray-dark: lighten($gray-base, 20%) !default;
@@ -19,19 +19,19 @@ $gray-light: lighten($gray-base, 46.7%) !default;
$gray-lighter: lighten($gray-base, 93.5%) !default;
// #eee
-$brand-primary: darken(#428bca, 6.5%) !default;
+$brand-primary: darken($dark-blue, 6.5%) !default;
// #337ab7
-$brand-success: #5cb85c !default;
-$brand-info: #5bc0de !default;
-$brand-warning: #f0ad4e !default;
-$brand-danger: #d9534f !default;
+$brand-success: $lime-green !default;
+$brand-info: $light-green !default;
+$brand-warning: $amber !default;
+$brand-danger: $red !default;
//== Scaffolding
//
//## Settings for some of the most global styles.
//** Background color for `<body>`.
-$body-bg: #fff !default;
+$body-bg: $white !default;
//** Global text color on `<body>`.
$text-color: $gray-dark !default;
@@ -46,13 +46,13 @@ $link-hover-decoration: underline !default;
//
//## Font, line-height, and color for body text, headings, and more.
-$font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
-$font-family-serif: Georgia, "Times New Roman", Times, serif !default;
+$font-family-sans-serif: $base-font-regular !default;
+$font-family-serif: $base-font-regular !default;
//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
-$font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace !default;
+$font-family-monospace: $base-font-regular !default;
$font-family-base: $font-family-sans-serif !default;
-$font-size-base: 14px !default;
+$font-size-base: $body-font-2 !default;
$font-size-large: ceil(($font-size-base * 1.25)) !default;
// ~18px
$font-size-small: ceil(($font-size-base * 0.85)) !default;
@@ -123,7 +123,7 @@ $border-radius-large: 6px !default;
$border-radius-small: 3px !default;
//** Global color for active items (e.g., navs or dropdowns).
-$component-active-color: #fff !default;
+$component-active-color: $white !default;
//** Global background color for active items (e.g., navs or dropdowns).
$component-active-bg: $brand-primary !default;
@@ -144,13 +144,13 @@ $table-condensed-cell-padding: 5px !default;
//** Default background color used for all tables.
$table-bg: transparent !default;
//** Background color used for `.table-striped`.
-$table-bg-accent: #f9f9f9 !default;
+$table-bg-accent: $light-gray !default;
//** Background color used for `.table-hover`.
-$table-bg-hover: #f5f5f5 !default;
+$table-bg-hover: $neutral-gray !default;
$table-bg-active: $table-bg-hover !default;
//** Border color for table and cell borders.
-$table-border-color: #ddd !default;
+$table-border-color: $dark-gray !default;
//== Buttons
//
@@ -158,27 +158,27 @@ $table-border-color: #ddd !default;
$btn-font-weight: normal !default;
-$btn-default-color: #333 !default;
-$btn-default-bg: #fff !default;
-$btn-default-border: #ccc !default;
+$btn-default-color: $darkest !default;
+$btn-default-bg: $white !default;
+$btn-default-border: $neutral-gray !default;
-$btn-primary-color: #fff !default;
+$btn-primary-color: $white !default;
$btn-primary-bg: $brand-primary !default;
$btn-primary-border: darken($btn-primary-bg, 5%) !default;
-$btn-success-color: #fff !default;
+$btn-success-color: $white !default;
$btn-success-bg: $brand-success !default;
$btn-success-border: darken($btn-success-bg, 5%) !default;
-$btn-info-color: #fff !default;
+$btn-info-color: $white !default;
$btn-info-bg: $brand-info !default;
$btn-info-border: darken($btn-info-bg, 5%) !default;
-$btn-warning-color: #fff !default;
+$btn-warning-color: $white !default;
$btn-warning-bg: $brand-warning !default;
$btn-warning-border: darken($btn-warning-bg, 5%) !default;
-$btn-danger-color: #fff !default;
+$btn-danger-color: $white !default;
$btn-danger-bg: $brand-danger !default;
$btn-danger-border: darken($btn-danger-bg, 5%) !default;
@@ -194,14 +194,14 @@ $btn-border-radius-small: $border-radius-small !default;
//##
//** `<input>` background color
-$input-bg: #fff !default;
+$input-bg: $white !default;
//** `<input disabled>` background color
$input-bg-disabled: $gray-lighter !default;
//** Text color for `<input>`s
$input-color: $gray !default;
//** `<input>` border color
-$input-border: #ccc !default;
+$input-border: $neutral-gray !default;
// TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
//** Default `.form-control` border radius
@@ -213,10 +213,10 @@ $input-border-radius-large: $border-radius-large !default;
$input-border-radius-small: $border-radius-small !default;
//** Border color for inputs on focus
-$input-border-focus: #66afe9 !default;
+$input-border-focus: $t-blue-link !default;
//** Placeholder text color
-$input-color-placeholder: #999 !default;
+$input-color-placeholder: $neutral-gray !default;
//** Default `.form-control` height
$input-height-base: ($line-height-computed + ($padding-base-vertical * 2) + 2) !default;
@@ -229,7 +229,7 @@ $input-height-small: (floor($font-size-small * $line-height-small) + ($padding-s
$form-group-margin-bottom: 15px !default;
$legend-color: $gray-dark !default;
-$legend-border-color: #e5e5e5 !default;
+$legend-border-color: $light-gray !default;
//** Background color for textual input addons
$input-group-addon-bg: $gray-lighter !default;
@@ -244,20 +244,20 @@ $cursor-disabled: not-allowed !default;
//## Dropdown menu container and contents.
//** Background for the dropdown menu.
-$dropdown-bg: #fff !default;
+$dropdown-bg: $white !default;
//** Dropdown menu `border-color`.
$dropdown-border: rgba(0, 0, 0, .15) !default;
//** Dropdown menu `border-color` **for IE8**.
-$dropdown-fallback-border: #ccc !default;
+$dropdown-fallback-border: $neutral-gray !default;
//** Divider color for between dropdown items.
-$dropdown-divider-bg: #e5e5e5 !default;
+$dropdown-divider-bg: $light-gray !default;
//** Dropdown link text color.
$dropdown-link-color: $gray-dark !default;
//** Hover color for dropdown links.
$dropdown-link-hover-color: darken($gray-dark, 5%) !default;
//** Hover background for dropdown links.
-$dropdown-link-hover-bg: #f5f5f5 !default;
+$dropdown-link-hover-bg: $very-light-gray !default;
//** Active dropdown menu item text color.
$dropdown-link-active-color: $component-active-color !default;
@@ -271,7 +271,7 @@ $dropdown-link-disabled-color: $gray-light !default;
$dropdown-header-color: $gray-light !default;
//** Deprecated `$dropdown-caret-color` as of v3.1.0
-$dropdown-caret-color: #000 !default;
+$dropdown-caret-color: $darkest !default;
//-- Z-index master list
//
@@ -371,17 +371,17 @@ $navbar-padding-horizontal: floor(($grid-gutter-width / 2)) !default;
$navbar-padding-vertical: (($navbar-height - $line-height-computed) / 2) !default;
$navbar-collapse-max-height: 340px !default;
-$navbar-default-color: #777 !default;
+$navbar-default-color: $dark-gray !default;
$navbar-default-bg: #f8f8f8 !default;
$navbar-default-border: darken($navbar-default-bg, 6.5%) !default;
// Navbar links
-$navbar-default-link-color: #777 !default;
-$navbar-default-link-hover-color: #333 !default;
+$navbar-default-link-color: $dark-gray !default;
+$navbar-default-link-hover-color: $darkest !default;
$navbar-default-link-hover-bg: transparent !default;
-$navbar-default-link-active-color: #555 !default;
+$navbar-default-link-active-color: $dark-gray !default;
$navbar-default-link-active-bg: darken($navbar-default-bg, 6.5%) !default;
-$navbar-default-link-disabled-color: #ccc !default;
+$navbar-default-link-disabled-color: $neutral-gray !default;
$navbar-default-link-disabled-bg: transparent !default;
// Navbar brand label
@@ -390,14 +390,14 @@ $navbar-default-brand-hover-color: darken($navbar-default-brand-color, 10%) !def
$navbar-default-brand-hover-bg: transparent !default;
// Navbar toggle
-$navbar-default-toggle-hover-bg: #ddd !default;
-$navbar-default-toggle-icon-bar-bg: #888 !default;
-$navbar-default-toggle-border-color: #ddd !default;
+$navbar-default-toggle-hover-bg: $very-light-gray !default;
+$navbar-default-toggle-icon-bar-bg: $neutral-gray !default;
+$navbar-default-toggle-border-color: $very-light-gray !default;
//=== Inverted navbar
// Reset inverted navbar basics
$navbar-inverse-color: lighten($gray-light, 15%) !default;
-$navbar-inverse-bg: #222 !default;
+$navbar-inverse-bg: $darkest !default;
$navbar-inverse-border: darken($navbar-inverse-bg, 10%) !default;
// Inverted navbar links
@@ -406,7 +406,7 @@ $navbar-inverse-link-hover-color: #fff !default;
$navbar-inverse-link-hover-bg: transparent !default;
$navbar-inverse-link-active-color: $navbar-inverse-link-hover-color !default;
$navbar-inverse-link-active-bg: darken($navbar-inverse-bg, 10%) !default;
-$navbar-inverse-link-disabled-color: #444 !default;
+$navbar-inverse-link-disabled-color: $neutral-gray !default;
$navbar-inverse-link-disabled-bg: transparent !default;
// Inverted navbar brand label
@@ -415,9 +415,9 @@ $navbar-inverse-brand-hover-color: #fff !default;
$navbar-inverse-brand-hover-bg: transparent !default;
// Inverted navbar toggle
-$navbar-inverse-toggle-hover-bg: #333 !default;
-$navbar-inverse-toggle-icon-bar-bg: #fff !default;
-$navbar-inverse-toggle-border-color: #333 !default;
+$navbar-inverse-toggle-hover-bg: $darkest !default;
+$navbar-inverse-toggle-icon-bar-bg: $white !default;
+$navbar-inverse-toggle-border-color: $darkest !default;
//== Navs
//
@@ -431,7 +431,7 @@ $nav-disabled-link-color: $gray-light !default;
$nav-disabled-link-hover-color: $gray-light !default;
//== Tabs
-$nav-tabs-border-color: #ddd !default;
+$nav-tabs-border-color: $neutral-gray !default;
$nav-tabs-link-hover-border-color: $gray-lighter !default;
@@ -439,7 +439,7 @@ $nav-tabs-active-link-hover-bg: $body-bg !default;
$nav-tabs-active-link-hover-color: $gray !default;
$nav-tabs-active-link-hover-border-color: #ddd !default;
-$nav-tabs-justified-link-border-color: #ddd !default;
+$nav-tabs-justified-link-border-color: $neutral-gray !default;
$nav-tabs-justified-active-link-border-color: $body-bg !default;
//== Pills
@@ -452,20 +452,20 @@ $nav-pills-active-link-hover-color: $component-active-color !default;
//##
$pagination-color: $link-color !default;
-$pagination-bg: #fff !default;
-$pagination-border: #ddd !default;
+$pagination-bg: $white !default;
+$pagination-border: $neutral-gray !default;
$pagination-hover-color: $link-hover-color !default;
$pagination-hover-bg: $gray-lighter !default;
-$pagination-hover-border: #ddd !default;
+$pagination-hover-border: $neutral-gray !default;
-$pagination-active-color: #fff !default;
+$pagination-active-color: $white !default;
$pagination-active-bg: $brand-primary !default;
$pagination-active-border: $brand-primary !default;
$pagination-disabled-color: $gray-light !default;
-$pagination-disabled-bg: #fff !default;
-$pagination-disabled-border: #ddd !default;
+$pagination-disabled-bg: $white !default;
+$pagination-disabled-border: $neutral-gray !default;
//== Pager
//
@@ -497,20 +497,20 @@ $jumbotron-heading-font-size: ceil(($font-size-base * 4.5)) !default;
//
//## Define colors for form feedback states and, by default, alerts.
-$state-success-text: #3c763d !default;
-$state-success-bg: #dff0d8 !default;
+$state-success-text: $fern-green !default;
+$state-success-bg: $hint-of-green !default;
$state-success-border: darken(adjust-hue($state-success-bg, -10), 5%) !default;
-$state-info-text: #31708f !default;
-$state-info-bg: #d9edf7 !default;
+$state-info-text: $astral-blue !default;
+$state-info-bg: $lavender-violet !default;
$state-info-border: darken(adjust-hue($state-info-bg, -10), 7%) !default;
-$state-warning-text: #8a6d3b !default;
-$state-warning-bg: #fcf8e3 !default;
+$state-warning-text: $mckenzie-orange !default;
+$state-warning-bg: $derby-yellow !default;
$state-warning-border: darken(adjust-hue($state-warning-bg, -10), 5%) !default;
-$state-danger-text: #a94442 !default;
-$state-danger-bg: #f2dede !default;
+$state-danger-text: $roof-terracotta-red !default;
+$state-danger-bg: $pale-rode-red !default;
$state-danger-border: darken(adjust-hue($state-danger-bg, -10), 5%) !default;
//== Tooltips
@@ -520,9 +520,9 @@ $state-danger-border: darken(adjust-hue($state-danger-bg, -10), 5%) !default;
//** Tooltip max width
$tooltip-max-width: 200px !default;
//** Tooltip text color
-$tooltip-color: #fff !default;
+$tooltip-color: $white !default;
//** Tooltip background color
-$tooltip-bg: #000 !default;
+$tooltip-bg: $darkest !default;
$tooltip-opacity: .9 !default;
//** Tooltip arrow width
@@ -535,13 +535,13 @@ $tooltip-arrow-color: $tooltip-bg !default;
//##
//** Popover body background color
-$popover-bg: #fff !default;
+$popover-bg: $white !default;
//** Popover maximum width
$popover-max-width: 276px !default;
//** Popover border color
$popover-border-color: rgba(0, 0, 0, .2) !default;
//** Popover fallback border color
-$popover-fallback-border-color: #ccc !default;
+$popover-fallback-border-color: $neutral-gray !default;
//** Popover title background color
$popover-title-bg: darken($popover-bg, 3%) !default;
@@ -576,9 +576,9 @@ $label-warning-bg: $brand-warning !default;
$label-danger-bg: $brand-danger !default;
//** Default label text color
-$label-color: #fff !default;
+$label-color: $white !default;
//** Default text color of a linked label
-$label-link-hover-color: #fff !default;
+$label-link-hover-color: $white !default;
//== Modals
//
@@ -593,18 +593,18 @@ $modal-title-padding: 15px !default;
$modal-title-line-height: $line-height-base !default;
//** Background color of modal content area
-$modal-content-bg: #fff !default;
+$modal-content-bg: $white !default;
//** Modal content border color
$modal-content-border-color: rgba(0, 0, 0, .2) !default;
//** Modal content border color **for IE8**
-$modal-content-fallback-border-color: #999 !default;
+$modal-content-fallback-border-color: $dark-gray !default;
//** Modal backdrop background color
-$modal-backdrop-bg: #000 !default;
+$modal-backdrop-bg: $darkest !default;
//** Modal backdrop opacity
$modal-backdrop-opacity: .5 !default;
//** Modal header border color
-$modal-header-border-color: #e5e5e5 !default;
+$modal-header-border-color: $light-gray !default;
//** Modal footer border color
$modal-footer-border-color: $modal-header-border-color !default;
@@ -641,9 +641,9 @@ $alert-danger-border: $state-danger-border !default;
//##
//** Background color of the whole progress component
-$progress-bg: #f5f5f5 !default;
+$progress-bg: $very-light-gray !default;
//** Progress bar text color
-$progress-bar-color: #fff !default;
+$progress-bar-color: $white !default;
//** Variable for setting rounded corners on progress bar.
$progress-border-radius: $border-radius-base !default;
@@ -663,14 +663,14 @@ $progress-bar-info-bg: $brand-info !default;
//##
//** Background color on `.list-group-item`
-$list-group-bg: #fff !default;
+$list-group-bg: $white !default;
//** `.list-group-item` border color
-$list-group-border: #ddd !default;
+$list-group-border: $light-gray !default;
//** List group border radius
$list-group-border-radius: $border-radius-base !default;
//** Background color of single list items on hover
-$list-group-hover-bg: #f5f5f5 !default;
+$list-group-hover-bg: $very-light-gray !default;
//** Text color of active list items
$list-group-active-color: $component-active-color !default;
//** Background color of active list items
@@ -687,29 +687,29 @@ $list-group-disabled-bg: $gray-lighter !default;
//** Text color for content within disabled list items
$list-group-disabled-text-color: $list-group-disabled-color !default;
-$list-group-link-color: #555 !default;
+$list-group-link-color: $dark-gray !default;
$list-group-link-hover-color: $list-group-link-color !default;
-$list-group-link-heading-color: #333 !default;
+$list-group-link-heading-color: $darkest !default;
//== Panels
//
//##
-$panel-bg: #fff !default;
+$panel-bg: $white !default;
$panel-body-padding: 15px !default;
$panel-heading-padding: 10px 15px !default;
$panel-footer-padding: $panel-heading-padding !default;
$panel-border-radius: $border-radius-base !default;
//** Border color for elements within panels
-$panel-inner-border: #ddd !default;
-$panel-footer-bg: #f5f5f5 !default;
+$panel-inner-border: $light-gray !default;
+$panel-footer-bg: $very-light-gray !default;
$panel-default-text: $gray-dark !default;
-$panel-default-border: #ddd !default;
-$panel-default-heading-bg: #f5f5f5 !default;
+$panel-default-border: $light-gray !default;
+$panel-default-heading-bg: $very-light-gray !default;
-$panel-primary-text: #fff !default;
+$panel-primary-text: $white !default;
$panel-primary-border: $brand-primary !default;
$panel-primary-heading-bg: $brand-primary !default;
@@ -738,7 +738,7 @@ $thumbnail-padding: 4px !default;
//** Thumbnail background color
$thumbnail-bg: $body-bg !default;
//** Thumbnail border color
-$thumbnail-border: #ddd !default;
+$thumbnail-border: $light-gray !default;
//** Thumbnail border radius
$thumbnail-border-radius: $border-radius-base !default;
@@ -751,22 +751,22 @@ $thumbnail-caption-padding: 9px !default;
//
//##
-$well-bg: #f5f5f5 !default;
+$well-bg: $very-light-gray !default;
$well-border: darken($well-bg, 7%) !default;
//== Badges
//
//##
-$badge-color: #fff !default;
+$badge-color: $white !default;
//** Linked badge text color on hover
-$badge-link-hover-color: #fff !default;
+$badge-link-hover-color: $white !default;
$badge-bg: $gray-light !default;
//** Badge text color in active nav link
$badge-active-color: $link-color !default;
//** Badge background color in active nav link
-$badge-active-bg: #fff !default;
+$badge-active-bg: $white !default;
$badge-font-weight: bold !default;
$badge-line-height: 1 !default;
@@ -779,9 +779,9 @@ $badge-border-radius: 10px !default;
$breadcrumb-padding-vertical: 8px !default;
$breadcrumb-padding-horizontal: 15px !default;
//** Breadcrumb background color
-$breadcrumb-bg: #f5f5f5 !default;
+$breadcrumb-bg: $very-light-gray !default;
//** Breadcrumb text color
-$breadcrumb-color: #ccc !default;
+$breadcrumb-color: $neutral-gray !default;
//** Text color of current page in the breadcrumb
$breadcrumb-active-color: $gray-light !default;
//** Textual separator for between breadcrumb elements
@@ -793,37 +793,37 @@ $breadcrumb-separator: "/" !default;
$carousel-text-shadow: 0 1px 2px rgba(0, 0, 0, .6) !default;
-$carousel-control-color: #fff !default;
+$carousel-control-color: $white !default;
$carousel-control-width: 15% !default;
$carousel-control-opacity: .5 !default;
$carousel-control-font-size: 20px !default;
-$carousel-indicator-active-bg: #fff !default;
-$carousel-indicator-border-color: #fff !default;
+$carousel-indicator-active-bg: $white !default;
+$carousel-indicator-border-color: $white !default;
-$carousel-caption-color: #fff !default;
+$carousel-caption-color: $white !default;
//== Close
//
//##
$close-font-weight: bold !default;
-$close-color: #000 !default;
+$close-color: $darkest !default;
$close-text-shadow: 0 1px 0 #fff !default;
//== Code
//
//##
-$code-color: #c7254e !default;
-$code-bg: #f9f2f4 !default;
+$code-color: $red !default;
+$code-bg: $light-gray !default;
-$kbd-color: #fff !default;
-$kbd-bg: #333 !default;
+$kbd-color: $white !default;
+$kbd-bg: $darkest !default;
-$pre-bg: #f5f5f5 !default;
+$pre-bg: $very-light-gray !default;
$pre-color: $gray-dark !default;
-$pre-border-color: #ccc !default;
+$pre-border-color: $dark-gray !default;
$pre-scrollable-max-height: 340px !default;
//== Type