From 21c0c5767df7d5dc00b39cb5c8ad5d734490635f Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Thu, 28 Jun 2018 05:40:45 +1000 Subject: [PATCH] Fixed button color when a link --- public/styles/objects/_button.scss | 4 ++++ public/styles/settings/colors.scss | 3 +++ public/styles/tools/_input.scss | 9 +++++++-- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/public/styles/objects/_button.scss b/public/styles/objects/_button.scss index 7e45c39..b9e6012 100644 --- a/public/styles/objects/_button.scss +++ b/public/styles/objects/_button.scss @@ -20,6 +20,10 @@ &__inner { padding: ( $t-input--style-dp__padding / 2 ) $t-input--style-dp__padding; } + + &:hover { + text-decoration: none;/* Override Standard Link Underline */ + } } //Button Group diff --git a/public/styles/settings/colors.scss b/public/styles/settings/colors.scss index d8edb09..ea93779 100644 --- a/public/styles/settings/colors.scss +++ b/public/styles/settings/colors.scss @@ -54,11 +54,14 @@ $s-color--input-default__border: 1px solid #AAA; $s-color--input-default__top: #F7F7F7; $s-color--input-default__bottom: #DADADA; $s-color--input-default-hover__top: $s-color--input-default__bottom; +$s-color--input-default__text: black; +$s-color--input-default-hover__text: black; //Input Styles $s-color--input-focus__outline: darken($s-color--swatch-blue, 20%); //Button Primary +$s-color--input-primary__text: black; $s-color--input-primary__top: $s-color--swatch-blue; $s-color--input-primary__bottom: darken($s-color--input-primary__top, 8%); diff --git a/public/styles/tools/_input.scss b/public/styles/tools/_input.scss index 19004ad..9e92610 100644 --- a/public/styles/tools/_input.scss +++ b/public/styles/tools/_input.scss @@ -22,13 +22,14 @@ $t-input--style-dp__padding: 1em; //Basic Design -@mixin t-input--style($top, $bottom) { +@mixin t-input--style($top, $bottom, $color:black) { &::before, &:active &__inner { background: $bottom; } &__inner { + color: $color; background: $top; } } @@ -76,6 +77,8 @@ $t-input--style-dp__padding: 1em; background: $s-color--input-default__top; border: $s-color--input-default__border; transition: all 0.1s $s-animation--ease-out; + + color: $s-color--input-default__text; //border-radius: $t-input--style-dp__padding / 3; //Shine effect @@ -91,6 +94,7 @@ $t-input--style-dp__padding: 1em; //Pseudo elements &:hover &__inner { + color: $s-color--input-default-hover__text; @include t-translate-y($t-input--style-dp__padding / 8); } @@ -118,7 +122,8 @@ $t-input--style-dp__padding: 1em; &--style-primary { @include t-input--style( $s-color--input-primary__top, - $s-color--input-primary__bottom + $s-color--input-primary__bottom, + $s-color--input-primary__text ); }