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

color updates

Browse Source
This commit is contained in:
Adam Bradley
2015-08-11 22:10:25 -05:00
parent f70aff1895
commit 147a7e68ff
23 changed files with 265 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ionic/components/button/button-outline.scss
View File

@@ -47,7 +47,7 @@ button,
button[#{$color}],
[button][#{$color}] {
$fg-color: darken-or-lighten($value);
$fg-color: darken-or-lighten($value, 5%);
@include button-outline($fg-color);
}

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

@@ -14,7 +14,7 @@ $button-round-padding: 0 2.6rem !default;
$button-color: color(primary) !default;
$button-color-activated: darken-or-lighten($button-color) !default;
$button-text-color: inverse(primary) !default;
$button-text-color: inverse($button-color) !default;
$button-hover-opacity: 0.88 !default;
@@ -112,7 +112,6 @@ button,
padding: $button-round-padding;
}
&.disabled,
&[disabled] {
opacity: 0.4;
cursor: default !important;
@@ -121,17 +120,15 @@ button,
}
a[button] {
text-decoration: none;
}
.padding > button[block]:first-child,
.padding > [button][block]:first-child {
margin-top: 0;
}
a[button] {
color: inherit;
text-decoration: none;
}
// Default Button Color Mixin
// --------------------------------------------------
@@ -156,7 +153,7 @@ a[button] {
$bg-color: $value;
$bg-color-activated: darken-or-lighten($bg-color);
$text-color: inverse($color);
$text-color: inverse($bg-color);
@include button-default($bg-color, $bg-color-activated, $text-color);
}

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

@@ -12,7 +12,6 @@ $button-md-border-radius: 3px !default;
[mode="md"] button,
[mode="md"] [button] {
border: 0;
border-radius: $button-md-border-radius;
min-height: $button-md-min-height;
@@ -32,18 +31,6 @@ $button-md-border-radius: 3px !default;
box-shadow: $button-md-box-shadow-active;
}
&[icon] {
//font-size: $button-icon-size;
}
&[large][icon] {
//font-size: $button-icon-large-size;
}
&[small][icon] {
//font-size: $button-icon-small-size;
}
&[full] {
border-radius: 0;
}
@@ -51,40 +38,63 @@ $button-md-border-radius: 3px !default;
&[outline] {
box-shadow: none;
.md-ripple {
/*.md-ripple {
&.is-visible {
opacity: 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;
}
&[fab] {
border-radius: 50%;
}
@each $color, $value in $colors {
// Generate iOS Checkbox Auxiliary Colors
// --------------------------------------------------
@each $color, $value in {
&[#{$color}] {
@if lightness(get-color($color, base)) < 80 {
.md-ripple {
background-color: white;
//background-color: white;
}
}
&.activated {
opacity: 1;
background-color: get-color($color, base);
//background-color: get-color($color, base);
}
&[outline] {
@if lightness(get-color($color, base)) >= 80 {
.md-ripple {
background-color: black;
//background-color: black;
}
} @else {
.md-ripple {
background-color: get-color($color, base);
//background-color: get-color($color, base);
}
}
@@ -97,8 +107,8 @@ $button-md-border-radius: 3px !default;
}
opacity: 1;
background: transparent;
color: $fg-color;
//background: transparent;
//color: $fg-color;
}
}
@@ -107,31 +117,12 @@ $button-md-border-radius: 3px !default;
&:hover,
&.hover {
background-color: rgba(158, 158, 158, 0.1);
//background-color: rgba(158, 158, 158, 0.1);
}
&.activated {
background-color: rgba(158, 158, 158, 0.2);
//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;
}
}
}
}