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

update button vertical alignments

Browse Source
This commit is contained in:
Adam Bradley
2013-10-30 07:48:47 -05:00
parent 082259dcfb
commit 83a00fa301
8 changed files with 934 additions and 791 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scss/ionic/_bar.scss
View File

@ -106,7 +106,7 @@
z-index: 1;
margin: 0;
padding: 2px 8px 0 8px;
min-height: $button-bar-button-min-hieght;
min-height: $button-bar-button-min-height;
background-color: transparent;
font-size: 12px;
line-height: 28px;

23
scss/ionic/_button.scss
View File

@ -21,8 +21,7 @@
cursor: pointer;
[class^="icon-"],
[class*=" icon-"] {
i, .icon {
display: inline-block;
padding: 0;
vertical-align: inherit;
@ -34,8 +33,7 @@
padding: $button-clear-padding;
background: none;
[class^="icon-"],
[class*=" icon-"] {
i, .icon {
font-size: $button-icon-large-font-size;
}
}
@ -43,6 +41,7 @@
&.button-clear {
@include transition(opacity .1s);
padding: $button-clear-padding;
max-height: 44px;
border: none;
background: none;
box-shadow: none;
@ -117,23 +116,23 @@
}
.button-small {
font-size: $button-font-size - 4;
min-height: 32px;
padding: 1px 8px 1px 8px;
min-height: $button-small-min-height;
line-height: $button-small-line-height;
font-size: $button-font-size - 4;
[class^="icon-"],
[class*=" icon-"] {
i, .icon {
font-size: $button-icon-font-size - 4;
line-height: $button-small-line-height - 3;
}
}
.button-large {
font-size: $button-font-size + 8;
min-height: $button-min-height + 8;
padding: 12px 18px 12px 18px;
min-height: $button-min-height + 8;
font-size: $button-font-size + 8;
[class^="icon-"],
[class*=" icon-"] {
i, .icon {
font-size: $button-icon-font-size + 8;
}
}

7
scss/ionic/_variables.scss
View File

@ -212,18 +212,21 @@ $info-border: darken(adjust-hue($info-bg, -10), 7%);
$button-color: #222;
$button-padding: 10px 12px 7px 12px;
$button-block-margin: 10px !default;
$button-clear-padding: 4px 5px;
$button-clear-padding: 12px 6px;
$button-border-radius: 2px;
$button-border-width: 1px;
$button-font-size: 16px;
$button-line-height: 23px;
$button-min-height: 44px;
$button-small-line-height: 29px !default;
$button-small-min-height: 32px !default;
$button-icon-font-size: 24px;
$button-icon-large-font-size: 32px;
$button-bar-button-line-height: 15px !default;
$button-bar-button-min-hieght: 33px !default;
$button-bar-button-min-height: 33px !default;
$button-default-bg: $brand-default;
$button-default-border: #ddd;