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

refactor(css): update theme imports

Browse Source
This commit is contained in:
Brandy Carney
2016-09-13 16:57:27 -05:00
committed by Adam Bradley
parent 750cde38e2
commit 16df3a4aab
38 changed files with 262 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/components/button/button-fab.scss
View File

@@ -1,4 +1,4 @@
@import "../../globals.core";
@import "../../themes/ionic.globals";
// Floating Action Buttons
// --------------------------------------------------
@@ -11,15 +11,18 @@ $button-fab-size: 56px !default;
position: absolute;
overflow: hidden;
line-height: $button-fab-size;
vertical-align: middle;
background-clip: padding-box;
}
.button-fab.button {
width: $button-fab-size;
min-width: 0;
height: $button-fab-size;
font-size: 14px;
line-height: $button-fab-size;
vertical-align: middle;
background-clip: padding-box;
}
.button-fab ion-icon {
@@ -28,28 +31,28 @@ $button-fab-size: 56px !default;
font-size: 2.8rem;
}
[fab-center] {
.button-fab[fab-center] {
left: 50%;
margin-left: -$button-fab-size / 2;
}
[fab-top] {
.button-fab[fab-top] {
top: 16px;
}
[fab-right] {
.button-fab[fab-right] {
right: 16px;
}
[fab-bottom] {
.button-fab[fab-bottom] {
bottom: 16px;
}
[fab-left] {
.button-fab[fab-left] {
left: 16px;
}
[fab-fixed] {
.button-fab[fab-fixed] {
position: fixed;
}

4
src/components/button/button-icon.scss
View File

@@ -1,4 +1,4 @@
@import "../../globals.core";
@import "../../themes/ionic.globals";
// Button Icons
// --------------------------------------------------
@@ -23,7 +23,7 @@
padding-left: .4em;
}
[icon-only] {
.button[icon-only] {
padding: 0;
min-width: .9em;

10
src/components/button/button.scss
View File

@@ -1,4 +1,4 @@
@import "../../globals.core";
@import "../../themes/ionic.globals";
// Buttons
// --------------------------------------------------
@@ -11,7 +11,6 @@ $button-round-border-radius: 64px !default;
.button {
@include user-select-none();
@include appearance(none);
position: relative;
@@ -31,6 +30,7 @@ $button-round-border-radius: 64px !default;
transition: background-color, opacity 100ms linear;
font-kerning: none;
user-select: none;
}
.button-inner {
@@ -68,10 +68,10 @@ button[disabled],
clear: both;
width: 100%;
}
&::after {
clear: both;
}
.button-block::after {
clear: both;
}