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

fix color inheritance, core components should not contain colors

Browse Source
This commit is contained in:
Adam Bradley
2015-12-04 23:23:55 -06:00
parent 78a3ce12b1
commit d8f235d09d
38 changed files with 313 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ionic/components/segment/modes/ios.scss
View File

@@ -11,7 +11,7 @@ $segment-button-ios-bg-color: transparent !default;
$segment-button-ios-font-size: 1.3rem !default;
$segment-button-ios-border-radius: 4px !default;
$segment-button-ios-bg-color-activated: map-get($colors, primary) !default;
$segment-button-ios-bg-color-activated: map-get($colors-ios, primary) !default;
$segment-button-ios-text-color: inverse($segment-button-ios-bg-color-activated) !default;
$segment-button-ios-activated-transition: 100ms all linear !default;
$segment-button-ios-hover-opacity: 0.16 !default;
@@ -112,7 +112,7 @@ ion-segment {
// Loop through all of the colors to change the segment colors
// based on the toolbar color or if it isn't in a toolbar then based on
// the segment color value
@each $color-name, $color-value in $colors {
@each $color-name, $color-value in $colors-ios {
$inverse-color-value: inverse($color-value);
.toolbar[#{$color-name}] {
@@ -126,7 +126,7 @@ ion-segment {
// Loop through all of the colors again to change the segment colors
// for each toolbar based on the segment color
// this will take priority over the default toolbar colors
@each $color-name, $color-value in $colors {
@each $color-name, $color-value in $colors-ios {
$inverse-color-value: inverse($color-value);
ion-segment[#{$color-name}] {

8
ionic/components/segment/modes/md.scss
View File

@@ -8,8 +8,8 @@ $segment-button-md-font-size: 1.2rem !default;
$segment-button-md-min-height: 4.0rem !default;
$segment-button-md-line-height: 4.0rem !default;
$segment-button-md-text-color-activated: color(primary) !default;
$segment-button-md-border-color-activated: color(primary) !default;
$segment-button-md-text-color-activated: map-get($colors-md, primary) !default;
$segment-button-md-border-color-activated: map-get($colors-md, primary) !default;
$segment-button-md-border-bottom: 2px solid rgba(#000000, 0.10) !default;
@@ -72,7 +72,7 @@ ion-segment {
// Loop through all of the colors to change the segment colors
// based on the toolbar color or if it isn't in a toolbar then based on
// the segment color value
@each $color-name, $color-value in $colors {
@each $color-name, $color-value in $colors-md {
$inverse-color-value: inverse($color-value);
.toolbar[#{$color-name}] {
@@ -86,7 +86,7 @@ ion-segment {
// Loop through all of the colors again to change the segment colors
// for each toolbar based on the segment color
// this will take priority over the default toolbar colors
@each $color-name, $color-value in $colors {
@each $color-name, $color-value in $colors-md {
ion-segment[#{$color-name}] {
ion-segment-button[button] {
@include segment-button($color-value);