javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-08 15:51:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

button alignment tweaks

Browse Source
This commit is contained in:
Adam Bradley
2013-10-29 13:10:57 -05:00
parent fe93c6cfbc
commit 01bbf5c1fa
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dist/css/ionic-ios7.css vendored
View File

@ -652,7 +652,7 @@ a.subdued‎ {
z-index: 1; z-index: 1;
margin: 0; margin: 0;
padding: 2px 8px 0 8px; padding: 2px 8px 0 8px;
min-height: 34px; min-height: 33px;
background-color: transparent; background-color: transparent;
font-size: 12px; font-size: 12px;
line-height: 28px; } line-height: 28px; }
@ -1780,7 +1780,7 @@ input[type="range"] {
position: relative; position: relative;
display: inline-block; display: inline-block;
margin: 0; margin: 0;
padding: 9px 12px 7px 12px; padding: 10px 12px 7px 12px;
min-height: 44px; min-height: 44px;
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;
@ -1790,15 +1790,15 @@ input[type="range"] {
text-align: center; text-align: center;
text-overflow: ellipsis; text-overflow: ellipsis;
font-size: 16px; font-size: 16px;
line-height: 24px; line-height: 23px;
cursor: pointer; } cursor: pointer; }
.button [class^="icon-"], .button [class^="icon-"],
.button [class*=" icon-"] { .button [class*=" icon-"] {
display: inline-block; display: inline-block;
padding: 0; padding: 0;
vertical-align: sub; vertical-align: inherit;
font-size: 24px; font-size: 24px;
line-height: 24px; } line-height: 22px; }
.button.button-icon { .button.button-icon {
padding: 4px 5px; padding: 4px 5px;
background: none; } background: none; }

10
dist/css/ionic-scoped.css vendored
View File

@ -1418,7 +1418,7 @@
z-index: 1; z-index: 1;
margin: 0; margin: 0;
padding: 2px 8px 0 8px; padding: 2px 8px 0 8px;
min-height: 34px; min-height: 33px;
background-color: transparent; background-color: transparent;
font-size: 12px; font-size: 12px;
line-height: 28px; } line-height: 28px; }
@ -2479,7 +2479,7 @@
position: relative; position: relative;
display: inline-block; display: inline-block;
margin: 0; margin: 0;
padding: 9px 12px 7px 12px; padding: 10px 12px 7px 12px;
min-height: 44px; min-height: 44px;
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;
@ -2489,15 +2489,15 @@
text-align: center; text-align: center;
text-overflow: ellipsis; text-overflow: ellipsis;
font-size: 16px; font-size: 16px;
line-height: 24px; line-height: 23px;
cursor: pointer; } cursor: pointer; }
.ionic .button [class^="icon-"], .ionic .button [class^="icon-"],
.ionic .button [class*=" icon-"] { .ionic .button [class*=" icon-"] {
display: inline-block; display: inline-block;
padding: 0; padding: 0;
vertical-align: sub; vertical-align: inherit;
font-size: 24px; font-size: 24px;
line-height: 24px; } line-height: 22px; }
.ionic .button.button-icon { .ionic .button.button-icon {
padding: 4px 5px; padding: 4px 5px;
background: none; } background: none; }

10
dist/css/ionic.css vendored
View File

@ -1761,7 +1761,7 @@ a.subdued‎ {
z-index: 1; z-index: 1;
margin: 0; margin: 0;
padding: 2px 8px 0 8px; padding: 2px 8px 0 8px;
min-height: 34px; min-height: 33px;
background-color: transparent; background-color: transparent;
font-size: 12px; font-size: 12px;
line-height: 28px; } line-height: 28px; }
@ -3001,7 +3001,7 @@ input[type="range"] {
position: relative; position: relative;
display: inline-block; display: inline-block;
margin: 0; margin: 0;
padding: 9px 12px 7px 12px; padding: 10px 12px 7px 12px;
min-height: 44px; min-height: 44px;
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;
@ -3011,15 +3011,15 @@ input[type="range"] {
text-align: center; text-align: center;
text-overflow: ellipsis; text-overflow: ellipsis;
font-size: 16px; font-size: 16px;
line-height: 24px; line-height: 23px;
cursor: pointer; } cursor: pointer; }
.button [class^="icon-"], .button [class^="icon-"],
.button [class*=" icon-"] { .button [class*=" icon-"] {
display: inline-block; display: inline-block;
padding: 0; padding: 0;
vertical-align: sub; vertical-align: inherit;
font-size: 24px; font-size: 24px;
line-height: 24px; } line-height: 22px; }
.button.button-icon { .button.button-icon {
padding: 4px 5px; padding: 4px 5px;
background: none; } background: none; }

4
scss/ionic/_button.scss
View File

@ -25,9 +25,9 @@
[class*=" icon-"] { [class*=" icon-"] {
display: inline-block; display: inline-block;
padding: 0; padding: 0;
vertical-align: sub; vertical-align: inherit;
font-size: $button-icon-font-size; font-size: $button-icon-font-size;
line-height: $button-line-height; line-height: $button-line-height - 1;
} }
&.button-icon { &.button-icon {

6
scss/ionic/_variables.scss
View File

@ -210,20 +210,20 @@ $info-border: darken(adjust-hue($info-bg, -10), 7%);
// ------------------------------- // -------------------------------
$button-color: #222; $button-color: #222;
$button-padding: 9px 12px 7px 12px; $button-padding: 10px 12px 7px 12px;
$button-block-margin: 10px !default; $button-block-margin: 10px !default;
$button-clear-padding: 4px 5px; $button-clear-padding: 4px 5px;
$button-border-radius: 2px; $button-border-radius: 2px;
$button-border-width: 1px; $button-border-width: 1px;
$button-font-size: 16px; $button-font-size: 16px;
$button-line-height: 24px; $button-line-height: 23px;
$button-min-height: 44px; $button-min-height: 44px;
$button-icon-font-size: 24px; $button-icon-font-size: 24px;
$button-icon-large-font-size: 32px; $button-icon-large-font-size: 32px;
$button-bar-button-line-height: 15px !default; $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-bg: $brand-default;
$button-default-border: #ddd; $button-default-border: #ddd;