From bae54aa8fc22451bbb2c898dafb22d2f86d15e85 Mon Sep 17 00:00:00 2001 From: Christopher Baker Date: Sun, 17 Apr 2016 18:56:09 -0700 Subject: [PATCH 1/2] remove references to -* outside _variables.scss --- scss/_images.scss | 2 +- scss/_tables.scss | 12 ++++++------ scss/_variables.scss | 5 +++++ scss/utilities/_background.scss | 6 +++--- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/scss/_images.scss b/scss/_images.scss index d17006df24..71d4b38bdd 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 c04e7c9b8a..ff3ea4e572 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 82ef6f9630..5ef5bcb4b9 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 4bbf7318d9..737731c959 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); From 84f801833d19be05c53e864bf7476bebbb9cafac Mon Sep 17 00:00:00 2001 From: Christopher Baker Date: Wed, 27 Apr 2016 19:37:44 -0700 Subject: [PATCH 2/2] add $inverse-bg and $inverse-color --- scss/_variables.scss | 6 ++++-- scss/utilities/_background.scss | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 5ef5bcb4b9..cc65867bac 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -99,8 +99,10 @@ $border-width: 1px !default; // // Settings for the `` element. -$body-bg: #fff !default; -$body-color: $gray-dark !default; +$body-bg: #fff !default; +$body-color: $gray-dark !default; +$inverse-bg: $gray-dark !default; +$inverse-color: $gray-lighter !default; // Links diff --git a/scss/utilities/_background.scss b/scss/utilities/_background.scss index 737731c959..000f3ab224 100644 --- a/scss/utilities/_background.scss +++ b/scss/utilities/_background.scss @@ -5,8 +5,8 @@ // Inverse // TODO: redo this as a proper class .bg-inverse { - color: $body-bg; - background-color: $body-color; + color: $inverse-color; + background-color: $inverse-bg; } .bg-faded {