aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Baker <[email protected]>2016-04-17 18:56:09 -0700
committerChristopher Baker <[email protected]>2016-04-17 18:56:09 -0700
commitbae54aa8fc22451bbb2c898dafb22d2f86d15e85 (patch)
treec95a6bd1b63154c502716015eecccf2f4274852c
parent0d5b6aa4e8ad24f77c5d777fe0fa27da3601c9ee (diff)
downloadbootstrap-bae54aa8fc22451bbb2c898dafb22d2f86d15e85.tar.xz
bootstrap-bae54aa8fc22451bbb2c898dafb22d2f86d15e85.zip
remove references to -* outside _variables.scss
-rw-r--r--scss/_images.scss2
-rw-r--r--scss/_tables.scss12
-rw-r--r--scss/_variables.scss5
-rw-r--r--scss/utilities/_background.scss6
4 files changed, 15 insertions, 10 deletions
diff --git a/scss/_images.scss b/scss/_images.scss
index d17006df2..71d4b38bd 100644
--- a/scss/_images.scss
+++ b/scss/_images.scss
@@ -48,5 +48,5 @@
.figure-caption {
font-size: $figure-caption-font-size;
- color: $gray-light;
+ color: $figure-caption-color;
}
diff --git a/scss/_tables.scss b/scss/_tables.scss
index c04e7c9b8..ff3ea4e57 100644
--- a/scss/_tables.scss
+++ b/scss/_tables.scss
@@ -121,19 +121,19 @@
.thead-inverse {
th {
color: #fff;
- background-color: $gray-dark;
+ background-color: $table-bg-inverse;
}
}
.thead-default {
th {
- color: $gray;
- background-color: $gray-lighter;
+ color: $table-head-color;
+ background-color: $table-head-bg;
}
}
.table-inverse {
- color: $gray-lighter;
- background-color: $gray-dark;
+ color: $body-bg;
+ background-color: $table-bg-inverse;
&.table-bordered {
border: 0;
@@ -142,7 +142,7 @@
th,
td,
thead th {
- border-color: $gray;
+ border-color: $body-bg;
}
}
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 82ef6f963..5ef5bcb4b 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -244,10 +244,14 @@ $table-cell-padding: .75rem !default;
$table-sm-cell-padding: .3rem !default;
$table-bg: transparent !default;
+$table-bg-inverse: $gray-dark !default;
$table-bg-accent: #f9f9f9 !default;
$table-bg-hover: #f5f5f5 !default;
$table-bg-active: $table-bg-hover !default;
+$table-head-bg: $gray-lighter !default;
+$table-head-color: $gray !default;
+
$table-border-width: $border-width !default;
$table-border-color: $gray-lighter !default;
@@ -750,6 +754,7 @@ $thumbnail-box-shadow: 0 1px 2px rgba(0,0,0,.075) !default;
// Figures
$figure-caption-font-size: 90% !default;
+$figure-caption-color: $gray-light !default;
// Breadcrumbs
diff --git a/scss/utilities/_background.scss b/scss/utilities/_background.scss
index 4bbf7318d..737731c95 100644
--- a/scss/utilities/_background.scss
+++ b/scss/utilities/_background.scss
@@ -5,12 +5,12 @@
// Inverse
// TODO: redo this as a proper class
.bg-inverse {
- color: $gray-lighter;
- background-color: $gray-dark;
+ color: $body-bg;
+ background-color: $body-color;
}
.bg-faded {
- background-color: $gray-lightest;
+ background-color: darken($body-bg, 3%);
}
@include bg-variant('.bg-primary', $brand-primary);