From 495d1162d205a28ec3fad25ca4493903ab4a3b13 Mon Sep 17 00:00:00 2001 From: jlukic Date: Sun, 5 Oct 2014 13:30:19 -0400 Subject: [PATCH] Update to google theme, fix input button alignment --- src/definitions/elements/input.less | 2 +- src/themes/packages/google/elements/button.overrides | 4 ++++ src/themes/packages/google/elements/button.variables | 10 +++++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/definitions/elements/input.less b/src/definitions/elements/input.less index de4b3a506..630cb65e6 100755 --- a/src/definitions/elements/input.less +++ b/src/definitions/elements/input.less @@ -328,7 +328,7 @@ .ui.action.input > .button, .ui.action.input > .buttons { display: table-cell; - vertical-align: top; + vertical-align: middle; white-space: nowrap; } .ui.action.input > .button > .icon, diff --git a/src/themes/packages/google/elements/button.overrides b/src/themes/packages/google/elements/button.overrides index 7ba96cefa..f7a35f975 100755 --- a/src/themes/packages/google/elements/button.overrides +++ b/src/themes/packages/google/elements/button.overrides @@ -16,4 +16,8 @@ 0px 0px 0px 1px rgba(0, 0, 0, 0.2) inset, 0px 2px 3px 0px rgba(0, 0, 0, 0.3) !important ; +} +.ui.buttons > .button:hover, +.ui.buttons > .button.active { + position: static !important; } \ No newline at end of file diff --git a/src/themes/packages/google/elements/button.variables b/src/themes/packages/google/elements/button.variables index aad2b0daa..3cc173a93 100755 --- a/src/themes/packages/google/elements/button.variables +++ b/src/themes/packages/google/elements/button.variables @@ -56,15 +56,19 @@ Variations --------------------*/ +@labeledIconBackgroundColor: transparent; +@labeledIconWidth: 2em; + @coloredBackgroundImage : @subtleGradient; @coloredBoxShadow : 0px 0px 0px 1px rgba(0, 0, 0, 0.25) inset; @primaryColor : #4184F3; @primaryBoxShadow : 0px 0px 0px 1px #0157E4 inset; -@secondaryColor : #EEEEEE; -@secondaryTextColor : @textColor; -@secondaryBoxShadow : @borderBoxShadow; +@secondaryColor : #EEEEEE; +@secondaryBackgroundImage : @backgroundImage; +@secondaryTextColor : @textColor; +@secondaryBoxShadow : @borderBoxShadow; @positiveColor: #3D9400; @negativeColor: #D34836;