From 396bc3b0f6d639ac65cf0e36984db2658b069847 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 8 Jul 2015 21:14:25 -0400 Subject: [PATCH] (css) Lower icon button width to 36px --- UI/WebServerResources/scss/components/button/button.scss | 2 +- UI/WebServerResources/scss/components/select/select.scss | 6 ------ UI/WebServerResources/scss/core/variables.scss | 4 ++-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/UI/WebServerResources/scss/components/button/button.scss b/UI/WebServerResources/scss/components/button/button.scss index 659bd78bb..9d23bd763 100644 --- a/UI/WebServerResources/scss/components/button/button.scss +++ b/UI/WebServerResources/scss/components/button/button.scss @@ -54,7 +54,7 @@ $button-fab-height: 56px; a.md-button.sg-icon-button, .md-button.sg-icon-button { z-index: 1; - padding: $iconButton-padding 0; + line-height: inherit; border-radius: 50%; min-width: $iconButton-size; transition: $iconButton-transition; diff --git a/UI/WebServerResources/scss/components/select/select.scss b/UI/WebServerResources/scss/components/select/select.scss index 8e0abefcd..482e33ed7 100644 --- a/UI/WebServerResources/scss/components/select/select.scss +++ b/UI/WebServerResources/scss/components/select/select.scss @@ -1,10 +1,5 @@ @import "extends"; -md-select { - margin-bottom: 2px; - margin-right: $bl; -} - // Try to align select labels with other input components [layout="row"] { .md-select-label { @@ -34,5 +29,4 @@ md-select.md-default-theme.sg-logout { border: none; color: $colorWhite; } - } \ No newline at end of file diff --git a/UI/WebServerResources/scss/core/variables.scss b/UI/WebServerResources/scss/core/variables.scss index 4cf2a8b9f..9c5463f8e 100644 --- a/UI/WebServerResources/scss/core/variables.scss +++ b/UI/WebServerResources/scss/core/variables.scss @@ -53,7 +53,7 @@ $pitch: $sg-md-grid-pitch; // touch and pointers // ---------------------------------------------------------------------------- -$touch-zone-width: 48px; +$touch-zone-width: 36px; // shortcut alias for $touch-zone-width $touch-zone: $touch-zone-width; @@ -146,8 +146,8 @@ $z-index-bottom-sheet: 70 !default; $z-index-scroll-mask: 65 !default; $z-index-sidenav: 60 !default; $z-index-backdrop: 50 !default; -$z-index-toolbar: 10 !default; $z-index-fab: 20 !default; +$z-index-toolbar: 10 !default; $z-index-view: 9; // Easing Curves