From b8b9b83d499975bd954addff2d3934603093e389 Mon Sep 17 00:00:00 2001 From: "Manu Mtz.-Almeida" Date: Fri, 14 Sep 2018 22:57:12 +0200 Subject: [PATCH] fix(button): vanilla color is usable --- core/src/components/button/button.scss | 3 ++- core/src/components/buttons/buttons.md.scss | 10 ++++----- .../components/toolbar/test/colors/index.html | 21 +++++++++++++++++++ 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/core/src/components/button/button.scss b/core/src/components/button/button.scss index 1be1ed9afe..0b317fcdfa 100644 --- a/core/src/components/button/button.scss +++ b/core/src/components/button/button.scss @@ -43,6 +43,8 @@ display: inline-block; + color: var(--color); + font-family: $font-family-base; text-align: center; @@ -212,7 +214,6 @@ outline: none; background: var(--background); - color: var(--color); line-height: 1; diff --git a/core/src/components/buttons/buttons.md.scss b/core/src/components/buttons/buttons.md.scss index 4d38ebf99e..04fa970117 100644 --- a/core/src/components/buttons/buttons.md.scss +++ b/core/src/components/buttons/buttons.md.scss @@ -45,11 +45,11 @@ // -------------------------------------------------- ::slotted(*) .button-outline { - --color: #{$toolbar-md-text-color}; - --color-activated: #{$toolbar-md-text-color}; + --color: currentColor; + --color-activated: currentColor; --background: transparent; --background-activated: transparent; - --border-color: #{$toolbar-md-text-color}; + --border-color: currentColor; } @@ -57,8 +57,8 @@ // -------------------------------------------------- ::slotted(*) .button-clear { - --color: #{$toolbar-md-text-color}; - --color-activated: #{$toolbar-md-text-color}; + --color: currentColor; + --color-activated: currentColor; --background: transparent; } diff --git a/core/src/components/toolbar/test/colors/index.html b/core/src/components/toolbar/test/colors/index.html index 67fc49e76c..c68caf3140 100644 --- a/core/src/components/toolbar/test/colors/index.html +++ b/core/src/components/toolbar/test/colors/index.html @@ -6,6 +6,13 @@ + + @@ -150,6 +157,20 @@ Dark + + + + + + + + + + + + + Dark +