From 01bbf5c1fabe30af21bc0306d8d8f9a81bab4edb Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Tue, 29 Oct 2013 13:10:57 -0500 Subject: [PATCH] button alignment tweaks --- dist/css/ionic-ios7.css | 10 +++++----- dist/css/ionic-scoped.css | 10 +++++----- dist/css/ionic.css | 10 +++++----- scss/ionic/_button.scss | 4 ++-- scss/ionic/_variables.scss | 6 +++--- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dist/css/ionic-ios7.css b/dist/css/ionic-ios7.css index 9a2c80ca11..abc6fb3092 100644 --- a/dist/css/ionic-ios7.css +++ b/dist/css/ionic-ios7.css @@ -652,7 +652,7 @@ a.subdued‎ { z-index: 1; margin: 0; padding: 2px 8px 0 8px; - min-height: 34px; + min-height: 33px; background-color: transparent; font-size: 12px; line-height: 28px; } @@ -1780,7 +1780,7 @@ input[type="range"] { position: relative; display: inline-block; margin: 0; - padding: 9px 12px 7px 12px; + padding: 10px 12px 7px 12px; min-height: 44px; border-width: 1px; border-style: solid; @@ -1790,15 +1790,15 @@ input[type="range"] { text-align: center; text-overflow: ellipsis; font-size: 16px; - line-height: 24px; + line-height: 23px; cursor: pointer; } .button [class^="icon-"], .button [class*=" icon-"] { display: inline-block; padding: 0; - vertical-align: sub; + vertical-align: inherit; font-size: 24px; - line-height: 24px; } + line-height: 22px; } .button.button-icon { padding: 4px 5px; background: none; } diff --git a/dist/css/ionic-scoped.css b/dist/css/ionic-scoped.css index 7941a5da31..3658125ff2 100644 --- a/dist/css/ionic-scoped.css +++ b/dist/css/ionic-scoped.css @@ -1418,7 +1418,7 @@ z-index: 1; margin: 0; padding: 2px 8px 0 8px; - min-height: 34px; + min-height: 33px; background-color: transparent; font-size: 12px; line-height: 28px; } @@ -2479,7 +2479,7 @@ position: relative; display: inline-block; margin: 0; - padding: 9px 12px 7px 12px; + padding: 10px 12px 7px 12px; min-height: 44px; border-width: 1px; border-style: solid; @@ -2489,15 +2489,15 @@ text-align: center; text-overflow: ellipsis; font-size: 16px; - line-height: 24px; + line-height: 23px; cursor: pointer; } .ionic .button [class^="icon-"], .ionic .button [class*=" icon-"] { display: inline-block; padding: 0; - vertical-align: sub; + vertical-align: inherit; font-size: 24px; - line-height: 24px; } + line-height: 22px; } .ionic .button.button-icon { padding: 4px 5px; background: none; } diff --git a/dist/css/ionic.css b/dist/css/ionic.css index 56be152987..4b57127948 100644 --- a/dist/css/ionic.css +++ b/dist/css/ionic.css @@ -1761,7 +1761,7 @@ a.subdued‎ { z-index: 1; margin: 0; padding: 2px 8px 0 8px; - min-height: 34px; + min-height: 33px; background-color: transparent; font-size: 12px; line-height: 28px; } @@ -3001,7 +3001,7 @@ input[type="range"] { position: relative; display: inline-block; margin: 0; - padding: 9px 12px 7px 12px; + padding: 10px 12px 7px 12px; min-height: 44px; border-width: 1px; border-style: solid; @@ -3011,15 +3011,15 @@ input[type="range"] { text-align: center; text-overflow: ellipsis; font-size: 16px; - line-height: 24px; + line-height: 23px; cursor: pointer; } .button [class^="icon-"], .button [class*=" icon-"] { display: inline-block; padding: 0; - vertical-align: sub; + vertical-align: inherit; font-size: 24px; - line-height: 24px; } + line-height: 22px; } .button.button-icon { padding: 4px 5px; background: none; } diff --git a/scss/ionic/_button.scss b/scss/ionic/_button.scss index c91bad3392..0ba46a1e5c 100644 --- a/scss/ionic/_button.scss +++ b/scss/ionic/_button.scss @@ -25,9 +25,9 @@ [class*=" icon-"] { display: inline-block; padding: 0; - vertical-align: sub; + vertical-align: inherit; font-size: $button-icon-font-size; - line-height: $button-line-height; + line-height: $button-line-height - 1; } &.button-icon { diff --git a/scss/ionic/_variables.scss b/scss/ionic/_variables.scss index 6af5793082..82b68a6153 100644 --- a/scss/ionic/_variables.scss +++ b/scss/ionic/_variables.scss @@ -210,20 +210,20 @@ $info-border: darken(adjust-hue($info-bg, -10), 7%); // ------------------------------- $button-color: #222; -$button-padding: 9px 12px 7px 12px; +$button-padding: 10px 12px 7px 12px; $button-block-margin: 10px !default; $button-clear-padding: 4px 5px; $button-border-radius: 2px; $button-border-width: 1px; $button-font-size: 16px; -$button-line-height: 24px; +$button-line-height: 23px; $button-min-height: 44px; $button-icon-font-size: 24px; $button-icon-large-font-size: 32px; $button-bar-button-line-height: 15px !default; -$button-bar-button-min-hieght: 34px !default; +$button-bar-button-min-hieght: 33px !default; $button-default-bg: $brand-default; $button-default-border: #ddd;