rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-21 18:54:30 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'v4-dev' of https://github.com/HMUDesign/bootstrap into HMUDesign-v4-dev

Browse Source
This commit is contained in:
Mark Otto 2016-10-30 13:38:44 -07:00
commit 864343a3cc
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scss/_images.scss
View File

@ -39,5 +39,5 @@
.figure-caption { .figure-caption {
font-size: $figure-caption-font-size; font-size: $figure-caption-font-size;
color: $gray-light; color: $figure-caption-color;
} }

12
scss/_tables.scss
View File

@ -106,25 +106,25 @@
.thead-inverse { .thead-inverse {
th { th {
color: #fff; color: #fff;
background-color: $gray-dark; background-color: $table-bg-inverse;
} }
} }
.thead-default { .thead-default {
th { th {
color: $gray; color: $table-head-color;
background-color: $gray-lighter; background-color: $table-head-bg;
} }
} }
.table-inverse { .table-inverse {
color: $gray-lighter; color: $body-bg;
background-color: $gray-dark; background-color: $table-bg-inverse;
th, th,
td, td,
thead th { thead th {
border-color: $gray; border-color: $body-bg;
} }
&.table-bordered { &.table-bordered {

8
scss/_variables.scss
View File

@ -156,6 +156,8 @@ $border-width: 1px !default;
$body-bg: #fff !default; $body-bg: #fff !default;
$body-color: $gray-dark !default; $body-color: $gray-dark !default;
$inverse-bg: $gray-dark !default;
$inverse-color: $gray-lighter !default;
// 5. Links // 5. Links
@ -310,10 +312,15 @@ $table-cell-padding: .75rem !default;
$table-sm-cell-padding: .3rem !default; $table-sm-cell-padding: .3rem !default;
$table-bg: transparent !default; $table-bg: transparent !default;
$table-bg-inverse: $gray-dark !default;
$table-bg-accent: rgba(0,0,0,.05) !default; $table-bg-accent: rgba(0,0,0,.05) !default;
$table-bg-hover: rgba(0,0,0,.075) !default; $table-bg-hover: rgba(0,0,0,.075) !default;
$table-bg-active: $table-bg-hover !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-width: $border-width !default;
$table-border-color: $gray-lighter !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 // 30. Figures
$figure-caption-font-size: 90% !default; $figure-caption-font-size: 90% !default;
$figure-caption-color: $gray-light !default;
// 31. Breadcrumbs // 31. Breadcrumbs

2
scss/utilities/_background.scss
View File

@ -3,7 +3,7 @@
// //
.bg-faded { .bg-faded {
background-color: $gray-lightest; background-color: darken($body-bg, 3%);
} }
@include bg-variant('.bg-primary', $brand-primary); @include bg-variant('.bg-primary', $brand-primary);