From 231b64c5aae03ff6ace9fc34135e5ef2158b936d Mon Sep 17 00:00:00 2001 From: jlukic Date: Thu, 18 Sep 2014 15:04:32 -0400 Subject: [PATCH] Adds ability to swap borders with 1 variables in buttons --- .../default/elements/button.variables | 21 ++++++++++++------- .../packages/raised/elements/button.variables | 3 +-- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/themes/packages/default/elements/button.variables b/src/themes/packages/default/elements/button.variables index b5a703cd6..646017fee 100755 --- a/src/themes/packages/default/elements/button.variables +++ b/src/themes/packages/default/elements/button.variables @@ -16,15 +16,20 @@ @textShadow: none; @invertedTextShadow: none; @borderRadius: 0.25em; +@borderBoxShadowColor: transparent; +@borderBoxShadowWidth: 1px; /* Shadow */ @shadowDistance: 0em; @shadowOffset: (@shadowDistance / 2); + @shadowBoxShadow: 0px -@shadowDistance 0px 0px @borderColor inset; +@borderBoxShadow: 0px 0px 0px @borderBoxShadowWidth @borderBoxShadowColor inset; @backgroundColor: #E0E0E0; @backgroundImage: none; @boxShadow: + @borderBoxShadow, @shadowBoxShadow ; @@ -59,12 +64,10 @@ --------------------*/ @groupBoxShadow: none; -@groupButtonBoxShadow: - @shadowBoxShadow -; -@verticalBoxShadow: 0px 0px 0px 1px @borderColor inset; -@groupButtonOffset: 0px 0px 0px -1px; -@verticalGroupOffset: 0px 0px -1px 0px; +@groupButtonBoxShadow: @boxShadow; +@verticalBoxShadow: none; +@groupButtonOffset: 0px 0px 0px 0px; +@verticalGroupOffset: 0px 0px 0px 0px; /*------------------- States @@ -81,6 +84,7 @@ @focusBackgroundColor: ''; @focusBackgroundImage: ''; @focusBoxShadow: + @borderBoxShadow, 0px 0px 1px rgba(81, 167, 232, 0.8) inset, 0px 0px 3px 2px rgba(81, 167, 232, 0.8) ; @@ -91,6 +95,7 @@ @downBackgroundColor: #CCCCCC; @downBackgroundImage: ''; @downBoxShadow: + @borderBoxShadow, 0px 1px 4px 0px rgba(0, 0, 0, 0.1) inset !important ; @downColor: @pressedTextColor; @@ -99,12 +104,12 @@ @activeBackgroundColor: #D0D0D0; @activeBackgroundImage: none; @activeColor: @selectedTextColor; -@activeBoxShadow: none; +@activeBoxShadow: @borderBoxShadow; /* Active + Hovered */ @activeHoverBackgroundColor: #D0D0D0; @activeHoverBackgroundImage: none; -@activeHoverBoxShadow: none; +@activeHoverBoxShadow: @borderBoxShadow; @activeHoverColor: @selectedTextColor; /* Loading */ diff --git a/src/themes/packages/raised/elements/button.variables b/src/themes/packages/raised/elements/button.variables index ec7b9ed71..ac4a5ae2c 100755 --- a/src/themes/packages/raised/elements/button.variables +++ b/src/themes/packages/raised/elements/button.variables @@ -8,5 +8,4 @@ /* Shadow */ @shadowDistance: 0.2em; -@shadowOffset: (@shadowDistance / 2); -@shadowBoxShadow: 0px -@shadowDistance 0px 0px @borderColor inset; \ No newline at end of file +@borderBoxShadowColor: @borderColor;