From a7153f320f29d0ceb2813c844d23fb77f022cad3 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 25 Sep 2015 09:35:21 -0700 Subject: [PATCH] [Frontend] Time controller-related styling (CP > open117) open #1515 open #117 Fixing selects; Minor tweak to normalize espresso/.../mixins.scss; (cherry picked from commit 2866d56) --- platform/commonUI/general/res/sass/forms/_selects.scss | 1 + platform/commonUI/themes/espresso/res/sass/_mixins.scss | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/commonUI/general/res/sass/forms/_selects.scss b/platform/commonUI/general/res/sass/forms/_selects.scss index ca45addd4d..be7f6348a4 100644 --- a/platform/commonUI/general/res/sass/forms/_selects.scss +++ b/platform/commonUI/general/res/sass/forms/_selects.scss @@ -25,6 +25,7 @@ padding: 0 $interiorMargin; overflow: hidden; position: relative; + line-height: $formInputH; select { @include appearance(none); @include box-sizing(border-box); diff --git a/platform/commonUI/themes/espresso/res/sass/_mixins.scss b/platform/commonUI/themes/espresso/res/sass/_mixins.scss index cf19f56e2a..4fad0c6c26 100644 --- a/platform/commonUI/themes/espresso/res/sass/_mixins.scss +++ b/platform/commonUI/themes/espresso/res/sass/_mixins.scss @@ -4,10 +4,10 @@ @include boxShdwSubtle(); } -@mixin btnSubtle($bg: $colorBodyBg, $bgHov: none, $fg: $colorBodyFg, $ic: $colorBtnIcon) { + @mixin btnSubtle($bg: $colorBodyBg, $bgHov: none, $fg: $colorBodyFg, $ic: $colorBtnIcon) { @include containerSubtle($bg, $fg); @include btnBase($bg, linear-gradient(lighten($bg, 15%), lighten($bg, 10%)), $fg, $ic); - @include text-shadow(rgba(black, 0.3) 0 1px 1px); + @include text-shadow($shdwItemText); } @function pullForward($c: $colorBodyBg, $p: 20%) {