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

button margins/testing

Browse Source
This commit is contained in:
Adam Bradley
2013-10-16 11:45:59 -05:00
parent 77d9ef53d1
commit 68751e8ff3
3 changed files with 245 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
scss/ionic/_button.scss
View File

@@ -6,10 +6,9 @@
padding: $button-padding;
border-width: 0;
border-width: $button-border-width;
border-style: solid;
border-top-width: $button-border-width;
border-bottom-width: $button-border-width;
border-radius: $button-border-radius;
color: $button-color;
@@ -17,12 +16,12 @@
text-align: center;
font-size: $button-font-size;
line-height: $line-height-computed;
cursor: pointer;
&.button-icon {
padding: $button-clear-padding;
width: auto;
border: none;
background: none;
}
@@ -96,17 +95,27 @@
}
}
&.block {
margin-top: $button-block-margin;
margin-bottom: $button-block-margin;
}
}
.button-full,
.button-full > .button {
margin-right: 0;
margin-left: 0;
border-right-width: 0;
border-left-width: 0;
border-radius: 0;
}
button.block {
width: 100%;
}
a.button {
text-decoration: none;
}
.margin.button,
.margin .button,
.padding .button {
border-right-width: $button-border-width;
border-left-width: $button-border-width;
border-radius: $button-border-radius;
}

18
scss/ionic/_variables.scss
View File

@@ -61,7 +61,7 @@ $mono-font-family: Monaco, Menlo, Consolas, "Courier New", monospace !de
$base-font-family: $sans-font-family;
$base-background-color: $white;
$base-color: #000;
$content-padding: 10px;
$content-padding: 10px !default;
$inset-margin: 10px;
$border-radius-base: 4px !default;
$border-radius-large: 6px !default;
@@ -216,15 +216,13 @@ $info-border: darken(adjust-hue($info-bg, -10), 7%);
$button-bar-button-line-height: 15px !default;
$button-color: #222;
$button-padding: 8px 12px;
$button-clear-padding: 4px 5px;
$button-border-radius: 2px;
$button-border-width: 1px;
$button-font-size: 16px;
// Button block that has spacing
$button-block-margin: 10px 0 10px 0;
$button-color: #222;
$button-padding: 8px 12px;
$button-block-margin: 10px !default;
$button-clear-padding: 4px 5px;
$button-border-radius: 2px;
$button-border-width: 1px;
$button-font-size: 16px;
$button-default-bg: $brand-default;
$button-default-border: #ddd;