diff --git a/scss/_forms.scss b/scss/_forms.scss index b2da21d2..a8573a7d 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -75,19 +75,19 @@ form { @include bmd-form-color($bmd-label-color, $bmd-label-color-focus, $input-border-color); .has-success { - @include bmd-form-color(map-get($theme-colors, success), map-get($theme-colors, success), map-get($theme-colors, success)); + @include bmd-form-color(theme-color(success), theme-color(success), theme-color(success)); } .has-info { - @include bmd-form-color(map-get($theme-colors, info), map-get($theme-colors, info), map-get($theme-colors, info)); + @include bmd-form-color(theme-color(info), theme-color(info), theme-color(info)); } .has-warning { - @include bmd-form-color(map-get($theme-colors, warning), map-get($theme-colors, warning), map-get($theme-colors, warning)); + @include bmd-form-color(theme-color(warning), theme-color(warning), theme-color(warning)); } .has-danger { - @include bmd-form-color(map-get($theme-colors, danger), map-get($theme-colors, danger), map-get($theme-colors, danger)); + @include bmd-form-color(theme-color(danger), theme-color(danger), theme-color(danger)); } // Reference http://www.google.com/design/spec/components/text-fields.html diff --git a/scss/_variables.scss b/scss/_variables.scss index 4c5dc5ef..7e88e96a 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -62,7 +62,7 @@ $enable-shadows: true; // enable shadows, set to false to turn off shadows @import "variables/drawer"; @import "variables/snackbar"; -$bmd-label-color-focus: map-get($theme-colors, primary) !default; +$bmd-label-color-focus: theme-color(primary) !default; $bmd-invalid-underline: $red-a700 !default; $bmd-readonly-underline: $input-border-color !default; @@ -111,7 +111,7 @@ $background-disabled: #eaeaea !default; $bmd-checkbox-size: 1.25rem !default; $bmd-checkbox-animation-ripple: 500ms !default; $bmd-checkbox-animation-check: 0.3s !default; -$bmd-checkbox-checked-color: map-get($theme-colors, primary) !default; +$bmd-checkbox-checked-color: theme-color(primary) !default; $bmd-checkbox-label-padding: .3125rem !default; // 5px $bmd-checkbox-border-size: .125rem !default; @@ -124,7 +124,7 @@ $bmd-switch-width: 2.125rem !default; // 34px $bmd-switch-height: .875rem !default; // 14px $bmd-switch-handle-size: 1.25rem !default; // 20px (was 18px) -$bmd-switch-handle-checked-bg: map-get($theme-colors, primary) !default; +$bmd-switch-handle-checked-bg: theme-color(primary) !default; $bmd-switch-handle-unchecked-bg: #f1f1f1 !default; $bmd-switch-handle-disabled-bg: #bdbdbd !default; $bmd-switch-unchecked-bg: $gray-light !default; @@ -145,7 +145,7 @@ $bmd-radio-ripple-offset: 1em !default; $bmd-radio-label-padding: .3125rem !default; // 5px $bmd-radio-color-off: $bmd-label-color-inner-focus !default; // FIXME seems inconsistent, check spec -$bmd-radio-color-on: map-get($theme-colors, primary) !default; +$bmd-radio-color-on: theme-color(primary) !default; $bmd-radio-color-disabled: $gray-light; // light theme spec: Disabled: #000000, Opacity 26% $bmd-radio-color-disabled-inverse: rgba( $white, diff --git a/scss/variables/bootstrap/_buttons.scss b/scss/variables/bootstrap/_buttons.scss index a7da5c6a..f5224776 100644 --- a/scss/variables/bootstrap/_buttons.scss +++ b/scss/variables/bootstrap/_buttons.scss @@ -40,7 +40,7 @@ $btn-active-box-shadow: none !default; // inset 0 3px 5px rgba(0,0,0,.1 // $btn-primary-color: #fff !default; -$btn-primary-bg: map-get($theme-colors, primary) !default; +$btn-primary-bg: theme-color(primary) !default; $btn-primary-border-color: $btn-primary-bg !default; // $btn-secondary-color: $gray-dark !default; @@ -48,19 +48,19 @@ $btn-secondary-bg: $body-bg !default; // #fff $btn-secondary-border-color: #ccc !default; // $btn-info-color: #fff !default; -$btn-info-bg: map-get($theme-colors, info) !default; +$btn-info-bg: theme-color(info) !default; $btn-info-border-color: $btn-info-bg !default; // $btn-success-color: #fff !default; -$btn-success-bg: map-get($theme-colors, success) !default; +$btn-success-bg: theme-color(success) !default; $btn-success-border-color: $btn-success-bg !default; // $btn-warning-color: #fff !default; -$btn-warning-bg: map-get($theme-colors, warning) !default; +$btn-warning-bg: theme-color(warning) !default; $btn-warning-border-color: $btn-warning-bg !default; // $btn-danger-color: #fff !default; -$btn-danger-bg: map-get($theme-colors, danger) !default; +$btn-danger-bg: theme-color(danger) !default; $btn-danger-border-color: $btn-danger-bg !default; // $btn-link-disabled-color: $gray-light !default; diff --git a/scss/variables/bootstrap/_nav.scss b/scss/variables/bootstrap/_nav.scss index d2e12f58..5c47975b 100644 --- a/scss/variables/bootstrap/_nav.scss +++ b/scss/variables/bootstrap/_nav.scss @@ -17,7 +17,7 @@ $bmd-nav-tabs-border-size: .214rem !default; // 3px $bmd-nav-tabs-color: $gray !default; $bmd-nav-tabs-active-color: $gray-dark !default; -$bmd-nav-tabs-active-border-color: map-get($theme-colors, primary) !default; +$bmd-nav-tabs-active-border-color: theme-color(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; diff --git a/scss/variables/bootstrap/_state.scss b/scss/variables/bootstrap/_state.scss index d95382da..e21a6042 100644 --- a/scss/variables/bootstrap/_state.scss +++ b/scss/variables/bootstrap/_state.scss @@ -2,13 +2,13 @@ // // Define colors for form feedback states and, by default, alerts. $state-success-text: $bmd-inverse !default; -$state-success-bg: map-get($theme-colors, success) !default; +$state-success-bg: theme-color(success) !default; $state-info-text: $bmd-inverse !default; -$state-info-bg: map-get($theme-colors, info) !default; +$state-info-bg: theme-color(info) !default; $state-warning-text: $bmd-inverse !default; -$state-warning-bg: map-get($theme-colors, warning) !default; +$state-warning-bg: theme-color(warning) !default; $state-danger-text: $bmd-inverse !default; -$state-danger-bg: map-get($theme-colors, danger) !default; +$state-danger-bg: theme-color(danger) !default;