aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2018-12-21 13:48:44 -0800
committerMark Otto <[email protected]>2018-12-21 13:48:44 -0800
commitd9712b7bcd6dc53fc97ac9d352083e4481c35773 (patch)
treefde033943ed9cc929b19e991d94e40f3500343f6
parent3b843c37c1d374984a24d0bf805dc3247658313d (diff)
parent3b42a9ec5be0425298a4a875ef6ae826242e1428 (diff)
downloadbootstrap-d9712b7bcd6dc53fc97ac9d352083e4481c35773.tar.xz
bootstrap-d9712b7bcd6dc53fc97ac9d352083e4481c35773.zip
Merge branch 'table-hover-colors' into v4-dev
-rw-r--r--scss/_tables.scss2
-rw-r--r--scss/_variables.scss5
2 files changed, 6 insertions, 1 deletions
diff --git a/scss/_tables.scss b/scss/_tables.scss
index a1150420f..bb9491b0b 100644
--- a/scss/_tables.scss
+++ b/scss/_tables.scss
@@ -88,6 +88,7 @@
.table-hover {
tbody tr {
@include hover {
+ color: $table-hover-color;
background-color: $table-hover-bg;
}
}
@@ -152,6 +153,7 @@
&.table-hover {
tbody tr {
@include hover {
+ color: $table-dark-hover-color;
background-color: $table-dark-hover-bg;
}
}
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 25e26843e..275a8ede9 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -352,8 +352,10 @@ $hr-margin-y: $spacer !default;
$table-cell-padding: .75rem !default;
$table-cell-padding-sm: .3rem !default;
+$table-color: $body-color !default;
$table-bg: transparent !default;
$table-accent-bg: rgba($black, .05) !default;
+$table-hover-color: $table-color !default;
$table-hover-bg: rgba($black, .075) !default;
$table-active-bg: $table-hover-bg !default;
@@ -363,11 +365,12 @@ $table-border-color: $gray-300 !default;
$table-head-bg: $gray-200 !default;
$table-head-color: $gray-700 !default;
+$table-dark-color: $white !default;
$table-dark-bg: $gray-900 !default;
$table-dark-accent-bg: rgba($white, .05) !default;
+$table-dark-hover-color: $table-dark-color !default;
$table-dark-hover-bg: rgba($white, .075) !default;
$table-dark-border-color: lighten($gray-900, 7.5%) !default;
-$table-dark-color: $white !default;
$table-striped-order: odd !default;