From: Mark Otto Date: Sun, 30 Oct 2016 20:38:44 +0000 (-0700) Subject: Merge branch 'v4-dev' of https://github.com/HMUDesign/bootstrap into HMUDesign-v4-dev X-Git-Tag: v4.0.0-alpha.6~464 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=864343a3cca6182bb6afefae79ca561b7bff1416;p=thirdparty%2Fbootstrap.git Merge branch 'v4-dev' of https://github.com/HMUDesign/bootstrap into HMUDesign-v4-dev --- 864343a3cca6182bb6afefae79ca561b7bff1416 diff --cc scss/_tables.scss index aeedf0b69a,ff3ea4e572..89b03e4b18 --- a/scss/_tables.scss +++ b/scss/_tables.scss @@@ -106,50 -121,29 +106,50 @@@ .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; - } - th, td, thead th { - border-color: $gray; + border-color: $body-bg; } + + &.table-bordered { + border: 0; + } +} + + + +// Responsive tables +// +// Wrap your tables in `.table-responsive` and we'll make them mobile friendly +// by enabling horizontal scrolling. Only applies <768px. Everything above that +// will display normally. + +.table-responsive { + display: block; + width: 100%; + min-height: 0%; // Workaround for IE9 bug (see https://github.com/twbs/bootstrap/issues/14837) + overflow-x: auto; + + // TODO: find out if we need this still. + // + // border: $table-border-width solid $table-border-color; + // -ms-overflow-style: -ms-autohiding-scrollbar; // See https://github.com/twbs/bootstrap/pull/10057 } diff --cc scss/_variables.scss index 1a68a1fbf1,cc65867bac..5f02e78dad --- a/scss/_variables.scss +++ b/scss/_variables.scss @@@ -154,11 -99,13 +154,13 @@@ $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 +// 5. Links // // Style anchor elements. @@@ -310,10 -246,14 +312,15 @@@ $table-cell-padding: .75rem $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-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; @@@ -839,12 -753,13 +846,13 @@@ $thumbnail-border-radius: $border-r $thumbnail-box-shadow: 0 1px 2px rgba(0,0,0,.075) !default; -// Figures +// 30. Figures $figure-caption-font-size: 90% !default; + $figure-caption-color: $gray-light !default; -// Breadcrumbs +// 31. Breadcrumbs $breadcrumb-padding-y: .75rem !default; $breadcrumb-padding-x: 1rem !default; diff --cc scss/utilities/_background.scss index a81dcff2ca,000f3ab224..b9ac295231 --- a/scss/utilities/_background.scss +++ b/scss/utilities/_background.scss @@@ -2,8 -2,15 +2,8 @@@ // Contextual backgrounds // -// Inverse -// TODO: redo this as a proper class -.bg-inverse { - color: $inverse-color; - background-color: $inverse-bg; -} - .bg-faded { - background-color: $gray-lightest; + background-color: darken($body-bg, 3%); } @include bg-variant('.bg-primary', $brand-primary);