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

Outline

Browse Source
This commit is contained in:
Max Lynch
2015-07-20 13:53:30 -05:00
parent 6c5dbbd680
commit e7206e2ae5
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ionic/components/app/colors.scss
View File

@@ -14,11 +14,13 @@ $colors: (
// ----------------------
primary: (
base: #387ef5,
light: #387ef5,
inverse: #fff
),
secondary: (
base: #32db64,
light: #32db64,
inverse: #fff
),
@@ -27,6 +29,7 @@ $colors: (
// ----------------------
danger: (
base: #f53d3d,
light: #f53d3d,
inverse: #fff,
),
@@ -35,16 +38,19 @@ $colors: (
// ----------------------
light: (
base: #fff,
light: #ddd,
inverse: #444,
),
stable: (
base: #f4f4f4,
light: #888,
inverse: #444,
),
dark: (
base: #222,
light: #222,
inverse: #fff,
),

5
ionic/components/button/button.scss
View File

@@ -261,7 +261,8 @@ a[button] {
color: $fg-color;
&.activated {
background-color: rgba(red($fg-color), green($fg-color), blue($fg-color), 0.15);
color: white;
background-color: rgb(red($fg-color), green($fg-color), blue($fg-color));//, 0.15);
}
}
}
@@ -279,7 +280,7 @@ a[button] {
@include button-clear(get-color($color, base));
@include button-outline(get-color($color, base));
@include button-outline(get-color($color, light));
}
}