javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-23 05:58:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

style(scss): fix lint errors

Browse Source
This commit is contained in:
Brandy Carney
2017-09-21 14:16:24 -04:00
parent 662743f843
commit 66ae3a4601
76 changed files with 262 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/core/src/components/segment/segment.ios.scss
View File

@ -75,6 +75,7 @@ $segment-button-ios-toolbar-icon-line-height: 2.4rem !default;
.segment-ios ion-segment-button {
display: flex;
flex: 1;
width: 0;
@ -228,4 +229,4 @@ $segment-button-ios-toolbar-icon-line-height: 2.4rem !default;
.toolbar-ios-#{$color-name} .segment-ios .segment-button.segment-activated {
color: $color-base;
}
}
}

7
packages/core/src/components/segment/segment.md.scss
View File

@ -55,10 +55,13 @@ $segment-button-md-icon-line-height: $segment-button-md-line-height !d
.segment-md ion-segment-button {
display: flex;
flex: 1;
}
.segment-md .segment-button {
@include padding($segment-button-md-padding-top, $segment-button-md-padding-end, $segment-button-md-padding-bottom, $segment-button-md-padding-start);
flex: 1;
width: 0;
@ -78,8 +81,6 @@ $segment-button-md-icon-line-height: $segment-button-md-line-height !d
opacity: $segment-button-md-opacity;
transition: 100ms all linear;
@include padding($segment-button-md-padding-top, $segment-button-md-padding-end, $segment-button-md-padding-bottom, $segment-button-md-padding-start);
ion-icon {
font-size: $segment-button-md-icon-size;
line-height: $segment-button-md-icon-line-height;
@ -137,4 +138,4 @@ $segment-button-md-icon-line-height: $segment-button-md-line-height !d
@each $color-name, $color-base, $color-contrast in get-colors($colors-md) {
@include md-segment-button($color-name, $color-base, $color-contrast);
}
}

2
packages/core/src/components/segment/segment.scss
View File

@ -25,4 +25,4 @@ ion-segment {
text-overflow: ellipsis;
white-space: nowrap;
cursor: pointer;
}
}

6
packages/core/src/components/segment/segment.wp.scss
View File

@ -61,6 +61,8 @@ $segment-button-wp-buttons-justify-content: flex-start !default;
}
.segment-wp .segment-button {
@include padding($segment-button-wp-padding-top, $segment-button-wp-padding-end, $segment-button-wp-padding-bottom, $segment-button-wp-padding-start);
height: $segment-button-wp-height;
font-size: $segment-button-wp-font-size;
@ -73,8 +75,6 @@ $segment-button-wp-buttons-justify-content: flex-start !default;
background-color: $segment-button-wp-background-color;
opacity: $segment-button-wp-opacity;
@include padding($segment-button-wp-padding-top, $segment-button-wp-padding-end, $segment-button-wp-padding-bottom, $segment-button-wp-padding-start);
&.segment-activated {
opacity: $segment-button-wp-opacity-activated;
}
@ -125,4 +125,4 @@ $segment-button-wp-buttons-justify-content: flex-start !default;
@each $color-name, $color-base, $color-contrast in get-colors($colors-wp) {
@include wp-segment-button($color-name, $color-base);
}
}