From 1e55aa17e940de23964651a69f59b0274692bd42 Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Mon, 14 May 2018 08:44:24 +1000 Subject: [PATCH] Moved Button design to appropriate variables. --- public/styles/objects/_button.scss | 18 ++++++++++++------ public/styles/settings/colors.scss | 9 +++++++++ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/public/styles/objects/_button.scss b/public/styles/objects/_button.scss index 6e470ab..d6835a0 100644 --- a/public/styles/objects/_button.scss +++ b/public/styles/objects/_button.scss @@ -3,6 +3,8 @@ * Clicky Tappy Touchy Buttons! * * Dependencies: + * styles/settings/animation.scss + * styles/settings/colors.scss * styles/tools/_gradient.scss * * @@ -10,14 +12,18 @@ * 1.0.1 - 2018/05/14 */ - - .o-btn { + position: relative; display: inline-block; cursor: pointer; - border: 1px solid #DDD; - border-radius: 4px; - padding: 0.5em 1.25em; + border: $s-color--btn-default__border; + padding: 1em 1em; + transition: all 0.2s $s-animation--ease-out; - @include t-vertical-gradient(#FFF, #FBFBFB); + @include t-horizontal-gradient($s-color--btn-default__top, $s-color--btn-default__bottom); + + + &:hover { + @include t-vertical-gradient($s-color--btn-default-hover__top, $s-color--btn-default-hover__bottom); + } } diff --git a/public/styles/settings/colors.scss b/public/styles/settings/colors.scss index 7d6bf26..8f46ae7 100644 --- a/public/styles/settings/colors.scss +++ b/public/styles/settings/colors.scss @@ -42,3 +42,12 @@ $s-color--navbar__bar-active: $s-color--pastel-green; //loader $s-color--loader: $s-color--swatch-blue; + +/*** Buttons and Inputs ***/ +//Button Default +$s-color--btn-default__top: #FFF; +$s-color--btn-default__bottom: #FBFBFB; +$s-color--btn-default__border: 1px solid #DDD; + +$s-color--btn-default-hover__top: $s-color--btn-default__bottom; +$s-color--btn-default-hover__bottom: #EEE;