From 67bb666e91efc10345b0762a486fbf1438c0c052 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Fri, 29 Nov 2013 22:00:11 -0600 Subject: [PATCH] .bar.button-icon alignment updates --- dist/css/ionic.css | 4 +++- scss/_bar.scss | 14 +++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dist/css/ionic.css b/dist/css/ionic.css index ed29f43d9d..3b3b3fcd76 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -2793,11 +2793,13 @@ a.subdued { height: 32px; font-size: 12px; line-height: 30px; } - .bar .button .icon { + .bar .button .icon, .bar .button.icon:before, .bar .button.icon-left:before, .bar .button.icon-right:before { padding-right: 2px; padding-left: 2px; font-size: 24px; line-height: 30px; } + .bar .button.button-icon .icon, .bar .button.button-icon.icon:before, .bar .button.button-icon.icon-left:before, .bar .button.button-icon.icon-right:before { + line-height: 32px; } .bar .button-bar > .button, .bar .buttons > .button { min-height: 31px; height: 32px; diff --git a/scss/_bar.scss b/scss/_bar.scss index 5b4f3287fe..58446451b2 100644 --- a/scss/_bar.scss +++ b/scss/_bar.scss @@ -125,12 +125,24 @@ font-size: $button-bar-button-font-size; line-height: $button-bar-button-height - $button-border-width - 1; - .icon { + .icon, + &.icon:before, + &.icon-left:before, + &.icon-right:before { padding-right: 2px; padding-left: 2px; font-size: $button-bar-button-icon-size; line-height: $button-bar-button-height - $button-border-width - 1; } + + &.button-icon { + .icon, + &.icon:before, + &.icon-left:before, + &.icon-right:before { + line-height: $button-bar-button-height; + } + } } .button-bar > .button, .buttons > .button {