From adb7af2de948e93a533b0d3859301c4891a3b8f9 Mon Sep 17 00:00:00 2001 From: Jack Lukic Date: Sat, 22 Aug 2015 13:24:50 -0400 Subject: [PATCH] Updates to themes from example repo --- src/themes/amazon/elements/button.overrides | 4 ++++ src/themes/amazon/elements/button.variables | 7 +++++++ src/themes/material/elements/button.overrides | 8 -------- src/themes/material/elements/button.variables | 6 ++++-- src/themes/twitter/elements/button.variables | 3 +-- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/themes/amazon/elements/button.overrides b/src/themes/amazon/elements/button.overrides index 8fa0ef8c3..55249ada2 100644 --- a/src/themes/amazon/elements/button.overrides +++ b/src/themes/amazon/elements/button.overrides @@ -17,6 +17,10 @@ border-color: #32373E #24282D #212429; } +.ui.basic.button { + border-width: 0px; +} + .ui.positive.button { border-color: #3E8E22; } diff --git a/src/themes/amazon/elements/button.variables b/src/themes/amazon/elements/button.variables index 664f9ab79..0de49a62a 100644 --- a/src/themes/amazon/elements/button.variables +++ b/src/themes/amazon/elements/button.variables @@ -19,6 +19,9 @@ background @defaultDuration @defaultEasing ; +@borderColor: #A2A6AC; +@selectedBorderColor: #8D9096; + @hoverBackgroundColor: #E0E0E0; @verticalPadding: @relative7px; @@ -26,7 +29,9 @@ @backgroundColor: #F7F8FA; @backgroundImage: linear-gradient(rgba(255, 255, 255, 0), rgba(0, 0, 0, 0.1)); + @boxShadow: + @borderBoxShadow, 0 1px 0 1px rgba(255, 255, 255, 0.3) inset ; @@ -43,6 +48,8 @@ @labeledIconColor: #FFFFFF; @labeledIconBorder: transparent; +@basicBoxShadow: 0px 0px 0px 1px @borderColor inset; + /* Labeled */ @labeledLabelBorderColor: #ADB1B8; diff --git a/src/themes/material/elements/button.overrides b/src/themes/material/elements/button.overrides index 07ac47d22..751266a08 100644 --- a/src/themes/material/elements/button.overrides +++ b/src/themes/material/elements/button.overrides @@ -1,13 +1,5 @@ @import url(http://fonts.googleapis.com/css?family=Roboto); -.ui.button { - min-width: 72px; -} -.ui.circular.button, -.ui.buttons .button { - min-width: 0px; -} - .ui.primary.button:hover { box-shadow: 0px 0px 0px 1px rgba(0, 0, 0, 0.3) inset, diff --git a/src/themes/material/elements/button.variables b/src/themes/material/elements/button.variables index a4c1c4964..da7dcbd4d 100644 --- a/src/themes/material/elements/button.variables +++ b/src/themes/material/elements/button.variables @@ -13,7 +13,7 @@ @verticalPadding : 0.8em; @horizontalPadding : 0.8em; -@borderRadius : @relative2px; +@borderRadius : @relative3px; @color : #222222; @fontWeight : normal; @textTransform : none; @@ -24,7 +24,7 @@ @solidBorderColor: #DDDDDD; @borderBoxShadowColor: @solidBorderColor; -@borderBoxShadow: 0px 0px 0px 1px @solidBorderColor; +@borderBoxShadow: 0px 0px 0px 1px @solidBorderColor inset; @shadowBoxShadow: 0px 0px 0px 0px transparent; @transition: @@ -72,6 +72,8 @@ @labeledIconBackgroundColor: transparent; @labeledIconWidth: 2em; +@labeledLabelBorderOffset: 0px; + /* Colored */ @coloredBackgroundImage : @subtleGradient; @coloredBoxShadow : 0px 0px 0px 1px rgba(0, 0, 0, 0.1) inset; diff --git a/src/themes/twitter/elements/button.variables b/src/themes/twitter/elements/button.variables index 1f680a38e..1a8ecc3a6 100644 --- a/src/themes/twitter/elements/button.variables +++ b/src/themes/twitter/elements/button.variables @@ -41,5 +41,4 @@ @downPressedShadow: 0px 1px 4px rgba(0, 0, 0, 0.2) inset; @labeledIconBackgroundColor: rgba(85, 172, 238, 0.05); -@labeledIconBorder: @borderBoxShadowColor; -@labeledIconColor: #55ACEE; \ No newline at end of file +@labeledIconBorder: rgba(0, 0, 0, 0.1);