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

material button updates

Browse Source
This commit is contained in:
Adam Bradley
2015-08-12 23:50:56 -05:00
parent 368cd94d7b
commit b342216376
1 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
ionic/components/button/modes/material.scss
View File

@@ -5,9 +5,12 @@
$button-md-font-size: 1.4rem !default;
$button-md-min-height: 3.6rem !default;
$button-md-padding: 0 1.6rem !default;
$button-md-box-shadow: 0 1px 1.5px 0 rgba(0, 0, 0, 0.12),0 1px 1px 0 rgba(0, 0, 0, 0.24);//0 1px 3px 0 rgba(0, 0, 0, 0.3); //0 2px 5px 0 rgba(0, 0, 0, 0.26) !default;
$button-md-box-shadow: 0 2px 2px 0 rgba(0,0,0,.14),0 3px 1px -2px rgba(0,0,0,.2),0 1px 5px 0 rgba(0,0,0,.12) !default;
$button-md-box-shadow-active: 0 4px 5px 0 rgba(0, 0, 0, 0.14),0 1px 10px 0 rgba(0, 0, 0, 0.12),0 2px 4px -1px rgba(0, 0, 0, 0.2); //0 1px 3px 0 rgba(0, 0, 0, 0.3); //0 2px 5px 0 rgba(0, 0, 0, 0.26) !default;
$button-md-border-radius: 3px !default;
$button-md-border-radius: 2px !default;
$button-md-clear-hover-bg-color: rgba(158, 158, 158, 0.1);
$button-md-clear-active-bg-color: rgba(158, 158, 158, 0.2);
[mode=md] button,
@@ -35,7 +38,19 @@ $button-md-border-radius: 3px !default;
border-radius: 0;
}
&[clear],
&[clear] {
box-shadow: none;
&:hover,
&.hover {
background-color: $button-md-clear-hover-bg-color;
}
&.activated {
background-color: $button-md-clear-active-bg-color;
}
}
&[outline] {
box-shadow: none;
@@ -44,6 +59,10 @@ $button-md-border-radius: 3px !default;
opacity: 0.2;
}
}*/
&.activated {
opacity: 1;
}
}
&[round] {
@@ -69,11 +88,18 @@ $button-md-border-radius: 3px !default;
border-radius: 50%;
}
&.icon-only {
padding: 0;
icon {
padding: 0 1.6rem;
}
}
// Generate iOS Checkbox Auxiliary Colors
// --------------------------------------------------
@each $color, $value in {
@each $color, $value in auxiliary-colors() {
&[#{$color}] {
@@ -113,17 +139,6 @@ $button-md-border-radius: 3px !default;
}
}
&[clear] {
box-shadow: none;
&:hover,
&.hover {
//background-color: rgba(158, 158, 158, 0.1);
}
&.activated {
//background-color: rgba(158, 158, 158, 0.2);
}
}
}
}
}