diff options
| author | Mark Otto <[email protected]> | 2016-10-30 13:38:44 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2016-10-30 13:38:44 -0700 |
| commit | 864343a3cca6182bb6afefae79ca561b7bff1416 (patch) | |
| tree | f84c9d0739b0e5a760f060d198507cfde7d26fc1 | |
| parent | c9dc04b4f50ee78ca9cd513b5832245c2ab64c95 (diff) | |
| parent | 84f801833d19be05c53e864bf7476bebbb9cafac (diff) | |
| download | bootstrap-864343a3cca6182bb6afefae79ca561b7bff1416.tar.xz bootstrap-864343a3cca6182bb6afefae79ca561b7bff1416.zip | |
Merge branch 'v4-dev' of https://github.com/HMUDesign/bootstrap into HMUDesign-v4-dev
| -rw-r--r-- | scss/_images.scss | 2 | ||||
| -rw-r--r-- | scss/_tables.scss | 12 | ||||
| -rw-r--r-- | scss/_variables.scss | 12 | ||||
| -rw-r--r-- | scss/utilities/_background.scss | 2 |
4 files changed, 18 insertions, 10 deletions
diff --git a/scss/_images.scss b/scss/_images.scss index 3cdedc4ff..2189f719f 100644 --- a/scss/_images.scss +++ b/scss/_images.scss @@ -39,5 +39,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 aeedf0b69..89b03e4b1 100644 --- a/scss/_tables.scss +++ b/scss/_tables.scss @@ -106,25 +106,25 @@ .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; th, td, thead th { - border-color: $gray; + border-color: $body-bg; } &.table-bordered { diff --git a/scss/_variables.scss b/scss/_variables.scss index 1a68a1fbf..5f02e78da 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -154,8 +154,10 @@ $border-width: 1px !default; // // Settings for the `<body>` 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; // 5. Links @@ -310,10 +312,15 @@ $table-cell-padding: .75rem !default; $table-sm-cell-padding: .3rem !default; $table-bg: transparent !default; +$table-bg-inverse: $gray-dark !default; + $table-bg-accent: rgba(0,0,0,.05) !default; $table-bg-hover: rgba(0,0,0,.075) !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; @@ -842,6 +849,7 @@ $thumbnail-box-shadow: 0 1px 2px rgba(0,0,0,.075) !default; // 30. Figures $figure-caption-font-size: 90% !default; +$figure-caption-color: $gray-light !default; // 31. Breadcrumbs diff --git a/scss/utilities/_background.scss b/scss/utilities/_background.scss index a81dcff2c..b9ac29523 100644 --- a/scss/utilities/_background.scss +++ b/scss/utilities/_background.scss @@ -3,7 +3,7 @@ // .bg-faded { - background-color: $gray-lightest; + background-color: darken($body-bg, 3%); } @include bg-variant('.bg-primary', $brand-primary); |