From 66b2feb9ee8b7ea64b49f32b1734ee0c2b55c702 Mon Sep 17 00:00:00 2001 From: Kevin Ross Date: Tue, 8 Dec 2015 15:50:15 -0600 Subject: [PATCH] sass conversion fix synced from 0.5.4 --- scss/_buttons.scss | 3 ++- scss/mixins/_variations.scss | 9 ++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scss/_buttons.scss b/scss/_buttons.scss index a5381eb2..5691caff 100644 --- a/scss/_buttons.scss +++ b/scss/_buttons.scss @@ -77,12 +77,13 @@ // FIXME: SPEC - this should be the 600 color, how can we get that programmatically if at all? Or are we limited to the color palette only? // SASS conversion note: please mirror any content change in _mixins-shared.scss button-variations-content - @include alert-variations(unquote(".btn"), unquote(""), $mdb-btn-background-color); + @include button-variations(unquote(".btn"), "", $mdb-btn-background-color); // Spec: // - Raised Light/Light theme no hover. // - Raised Dark/Dark theme Hover color: 600 .theme-dark & { + // } } diff --git a/scss/mixins/_variations.scss b/scss/mixins/_variations.scss index 293bb175..1e573b74 100644 --- a/scss/mixins/_variations.scss +++ b/scss/mixins/_variations.scss @@ -23,17 +23,16 @@ } } -@mixin button-variations($component, $selector-suffix, $color-default, $mdb-param-1) { - @include generic-variations($component, $selector-suffix, $color-default, "button-variations-content", $mdb-param-1); +@mixin button-variations($component, $selector-suffix, $color-default) { + @include generic-variations($component, $selector-suffix, $color-default, "button-variations-content", null); } @mixin button-variations-content($args) { //@debug "#{inspect($args)}"; $variation-color: map-get($args, variation-color); - $mdb-param-1: map-get($args, material-param-1); background-color: contrast-color($variation-color, - darken($variation-color, $mdb-param-1), - lighten($variation-color, $mdb-param-1)); + darken($variation-color, 4%), + lighten($variation-color, 4%)); } // navbar-variations(" label input[type=checkbox]:checked + .toggle:active:after", $brand-primary