javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-19 03:32:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

button updates

Browse Source
This commit is contained in:
Adam Bradley
2015-07-27 14:02:55 -05:00
parent d9f256c81c
commit 436ac4af8a
3 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,10 +91,6 @@ button,
&[outline] { &[outline] {
background: none; background: none;
&.activated {
opacity: 0.3 !important;
}
&[full] { &[full] {
border-radius: 0; border-radius: 0;
border-right-width: 0; border-right-width: 0;
@ -199,7 +195,7 @@ a[button] {
&.activated { &.activated {
color: white; color: white;
background-color: rgb(red($fg-color), green($fg-color), blue($fg-color));//, 0.15); background-color: rgb(red($fg-color), green($fg-color), blue($fg-color));
} }
} }
} }

32
ionic/components/button/extensions/material.scss
View File

@ -89,7 +89,16 @@ $button-material-border-radius: 3px !default;
} }
&.activated { &.activated {
@if lightness(get-color($color, base)) > 90 {
$fg-color: get-color($color, inverse);
} @else {
$fg-color: get-color($color, base);
}
opacity: 1; opacity: 1;
background: transparent;
color: $fg-color;
} }
} }
@ -98,12 +107,31 @@ $button-material-border-radius: 3px !default;
&:hover, &:hover,
&.hover { &.hover {
background-color: rgba(158, 158, 158, 0.2); background-color: rgba(158, 158, 158, 0.1);
} }
&.activated { &.activated {
background-color: rgba(158, 158, 158, 0.4); background-color: rgba(158, 158, 158, 0.2);
} }
} }
&[round] {
border-radius: $button-round-border-radius;
padding: $button-round-padding;
}
&[large] {
padding: 0 $button-large-padding;
min-width: ($button-large-padding * 4);
min-height: $button-large-height;
font-size: $button-large-font-size;
}
&[small] {
padding: 0 $button-small-padding;
min-width: ($button-small-padding * 3);
min-height: $button-small-height;
font-size: $button-small-font-size;
}
} }
} }
} }

2
ionic/components/icon/icon.scss
View File

@ -16,7 +16,7 @@
icon { icon {
display: inline-block; display: inline-block;
font-size: 1.8em; font-size: 1.2em;
} }
icon[small] { icon[small] {