From: Mark Otto Date: Fri, 21 Dec 2018 22:49:11 +0000 (-0800) Subject: Merge branch 'table-dark-colors' into v4-dev X-Git-Tag: v4.3.0~147^2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fca7531897447fb2f9524559dfb00ecee0944d58;p=thirdparty%2Fbootstrap.git Merge branch 'table-dark-colors' into v4-dev --- fca7531897447fb2f9524559dfb00ecee0944d58 diff --cc scss/_variables.scss index ddafa0c2c6,21e0fd935f..dbeab65f36 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@@ -365,12 -363,11 +365,13 @@@ $table-border-color: $border-c $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-bg: $gray-800 !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-border-color: lighten($table-dark-bg, 7.5%) !default; + $table-dark-color: $white !default; $table-striped-order: odd !default;