From b0b4c19a700a638d77f1c99da1fc953ff9abe435 Mon Sep 17 00:00:00 2001 From: Kevin Ross Date: Mon, 28 Mar 2016 16:14:36 -0500 Subject: [PATCH] #921 - V4 wrong text color for .table-inverse - refactored inverse colors and names - colors may not be exact, but it's a start --- scss/_core.scss | 1 + scss/_tables.scss | 26 ++++++++++++++++++++++++++ scss/_variables.scss | 6 ++++-- scss/plugins/_plugin-snackbarjs.scss | 2 +- scss/variables/bootstrap/_nav.scss | 12 ++++++------ scss/variables/bootstrap/_state.scss | 8 ++++---- 6 files changed, 42 insertions(+), 13 deletions(-) create mode 100644 scss/_tables.scss diff --git a/scss/_core.scss b/scss/_core.scss index ec395239..bf99bf97 100644 --- a/scss/_core.scss +++ b/scss/_core.scss @@ -13,6 +13,7 @@ @import "forms"; @import "input-group"; @import "list-group"; +@import "tables"; @import "nav"; @import "navbar"; @import "alerts"; diff --git a/scss/_tables.scss b/scss/_tables.scss new file mode 100644 index 00000000..258aa909 --- /dev/null +++ b/scss/_tables.scss @@ -0,0 +1,26 @@ +// BS4 has not yet converted the following to variables - keep an eye on it and move to variables when possible. +.thead-inverse { + th { + //color: $bmd-inverse; // #fff; + //background-color: $gray-dark; + } +} +.thead-default { + th { + //color: $gray; + //background-color: $bmd-inverse-lighter; //$gray-lighter; + } +} + +.table-inverse { + color: $bmd-inverse-light; //$gray-lighter; + //background-color: $gray-dark; + + //th, + //td, + //thead th { + // border-color: $gray; + //} +} + + diff --git a/scss/_variables.scss b/scss/_variables.scss index 0c122e20..13c97b38 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -11,8 +11,10 @@ $gray-dark: rgba($black, 0.87) !default; // used for text color - others use g $bmd-font-weight-base: 400; // wondering if any of these could still be refactored out, but are definitely in use. -$bmd-text-color-inverse: rgba($white, 0.84) !default; -$bmd-text-color-inverse-light: rgba($white, 0.54) !default; +$bmd-inverse: rgba($white, 1) !default; +$bmd-inverse-light: rgba($white, 0.84) !default; +$bmd-inverse-lighter: rgba($white, 0.54) !default; + $bmd-label-color: $gray-light !default; $bmd-label-color-inner-focus: $gray !default; // e.g. radio label or text-muted not a control-label which is primary diff --git a/scss/plugins/_plugin-snackbarjs.scss b/scss/plugins/_plugin-snackbarjs.scss index c481fa7b..8d51741f 100644 --- a/scss/plugins/_plugin-snackbarjs.scss +++ b/scss/plugins/_plugin-snackbarjs.scss @@ -4,7 +4,7 @@ //.snackbar { // height: 0; // font-size: 14px; -// color: $bmd-text-color-inverse; +// color: $bmd-inverse; // background-color: #323232; // border-radius: $border-radius; // transition: transform 0.2s ease-in-out, opacity 0.2s ease-in, height 0s linear 0.2s, padding 0s linear 0.2s, height 0s linear 0.2s; diff --git a/scss/variables/bootstrap/_nav.scss b/scss/variables/bootstrap/_nav.scss index 09f36b84..b680a102 100644 --- a/scss/variables/bootstrap/_nav.scss +++ b/scss/variables/bootstrap/_nav.scss @@ -22,17 +22,17 @@ $bmd-nav-tabs-active-border-color: $brand-primary !default; $bmd-nav-tabs-disabled-link-color: $nav-disabled-link-color !default; $bmd-nav-tabs-disabled-link-color-hover: $nav-disabled-link-hover-color !default; -$bmd-nav-tabs-primary-color: $bmd-text-color-inverse !default; +$bmd-nav-tabs-primary-color: $bmd-inverse !default; $bmd-nav-tabs-primary-active-color: #fff !default; $bmd-nav-tabs-primary-active-border-color: #fff !default; -$bmd-nav-tabs-primary-disabled-link-color: $bmd-text-color-inverse-light !default; -$bmd-nav-tabs-primary-disabled-link-color-hover: $bmd-text-color-inverse-light !default; +$bmd-nav-tabs-primary-disabled-link-color: $bmd-inverse-light !default; +$bmd-nav-tabs-primary-disabled-link-color-hover: $bmd-inverse-light !default; -$bmd-nav-tabs-inverse-color: $bmd-text-color-inverse !default; +$bmd-nav-tabs-inverse-color: $bmd-inverse !default; $bmd-nav-tabs-inverse-active-color: #fff !default; $bmd-nav-tabs-inverse-active-border-color: #fff !default; -$bmd-nav-tabs-inverse-disabled-link-color: $bmd-text-color-inverse-light !default; -$bmd-nav-tabs-inverse-disabled-link-color-hover: $bmd-text-color-inverse-light !default; +$bmd-nav-tabs-inverse-disabled-link-color: $bmd-inverse-light !default; +$bmd-nav-tabs-inverse-disabled-link-color-hover: $bmd-inverse-light !default; //$nav-item-margin: .2rem !default; diff --git a/scss/variables/bootstrap/_state.scss b/scss/variables/bootstrap/_state.scss index bb20af1a..0037a2b9 100644 --- a/scss/variables/bootstrap/_state.scss +++ b/scss/variables/bootstrap/_state.scss @@ -1,15 +1,15 @@ // Form states and alerts // // Define colors for form feedback states and, by default, alerts. -$state-success-text: $bmd-text-color-inverse !default; +$state-success-text: $bmd-inverse !default; $state-success-bg: $brand-success !default; -$state-info-text: $bmd-text-color-inverse !default; +$state-info-text: $bmd-inverse !default; $state-info-bg: $brand-info !default; -$state-warning-text: $bmd-text-color-inverse !default; +$state-warning-text: $bmd-inverse !default; $state-warning-bg: $brand-warning !default; -$state-danger-text: $bmd-text-color-inverse !default; +$state-danger-text: $bmd-inverse !default; $state-danger-bg: $brand-danger !default;