From a7be08710472e4f976c0e53762cc3649e8e9ddd7 Mon Sep 17 00:00:00 2001 From: jlukic Date: Sat, 11 Oct 2014 15:24:52 -0400 Subject: [PATCH] Adds additional button variables, basic styling for google buttons --- src/definitions/elements/button.less | 1 + .../packages/default/elements/button.variables | 1 + .../packages/google/elements/button.variables | 13 +++++++++++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/definitions/elements/button.less b/src/definitions/elements/button.less index 786d6da17..36a7af702 100755 --- a/src/definitions/elements/button.less +++ b/src/definitions/elements/button.less @@ -626,6 +626,7 @@ .ui.basic.buttons .button.active, .ui.basic.button.active { background: @basicActiveBackground !important; + box-shadow: @basicActiveBoxShadow !important; color: @basicActiveColor; box-shadow: @selectedBorderColor; } diff --git a/src/themes/packages/default/elements/button.variables b/src/themes/packages/default/elements/button.variables index 8292b8ec5..62b28d5b7 100755 --- a/src/themes/packages/default/elements/button.variables +++ b/src/themes/packages/default/elements/button.variables @@ -188,6 +188,7 @@ ; /* Basic Active */ @basicActiveBackground: @transparentBlack; +@basicActiveBoxShadow: ''; @basicActiveColor: @selectedTextColor; /* Basic Inverted */ diff --git a/src/themes/packages/google/elements/button.variables b/src/themes/packages/google/elements/button.variables index 3cc173a93..97c86e83b 100755 --- a/src/themes/packages/google/elements/button.variables +++ b/src/themes/packages/google/elements/button.variables @@ -32,7 +32,6 @@ box-shadow 0.3s @transitionEasing, background 0.3s @transitionEasing ; - /*------------------- State --------------------*/ @@ -51,11 +50,21 @@ @activeBackgroundColor: #F0F0F0; @activeBoxShadow: 0px 0px 0px 1px #DDDDDD; - /*------------------- Variations --------------------*/ +@basicBorderSize: 0px; +@basicBorderRadius: 4px; +@basicColoredBorderSize: 1px; +@basicHoverBackground: @white; +@basicHoverBoxShadow: @hoverBoxShadow; +@basicDownBackground: @white; +@basicDownBoxShadow: @downBoxShadow; + +@basicActiveBackground: #FFFFFF; +@basicActiveBoxShadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.2); + @labeledIconBackgroundColor: transparent; @labeledIconWidth: 2em;