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

chore(sass): update sass to match linter config

Browse Source 
references #5797
This commit is contained in:
Brandy Carney
2016-03-10 22:41:56 -05:00
parent de6cd2f68c
commit f7b52eeee1
113 changed files with 1235 additions and 1172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ionic/components/segment/segment.ios.scss
View File

@ -4,19 +4,19 @@
// iOS Segment
// --------------------------------------------------
$segment-button-ios-background-color: transparent !default;
$segment-button-ios-background-color-activated: $toolbar-ios-active-color !default;
$segment-button-ios-background-color: transparent !default;
$segment-button-ios-background-color-activated: $toolbar-ios-active-color !default;
$segment-button-ios-text-color: color-inverse($segment-button-ios-background-color-activated) !default;
$segment-button-ios-activated-transition: 100ms all linear !default;
$segment-button-ios-hover-transition: 100ms all linear !default;
$segment-button-ios-active-transition: 100ms all linear !default;
$segment-button-ios-hover-opacity: 0.1 !default;
$segment-button-ios-active-opacity: 0.16 !default;
$segment-button-ios-hover-opacity: .1 !default;
$segment-button-ios-active-opacity: .16 !default;
$segment-button-ios-border-width: 1px !default;
$segment-button-ios-height: 3.2rem !default;
$segment-button-ios-line-height: 3.0rem !default;
$segment-button-ios-line-height: 3rem !default;
$segment-button-ios-font-size: 1.3rem !default;
$segment-button-ios-border-radius: 4px !default;
$segment-button-ios-icon-size: 2.6rem !default;
@ -31,29 +31,29 @@ $segment-button-ios-toolbar-icon-line-height: 2.4rem !default;
.segment-button {
height: $segment-button-ios-height;
line-height: $segment-button-ios-line-height;
font-size: $segment-button-ios-font-size;
flex: 1;
width: 0;
height: $segment-button-ios-height;
border-width: $segment-button-ios-border-width;
border-style: solid;
border-color: $segment-button-ios-background-color-activated;
font-size: $segment-button-ios-font-size;
line-height: $segment-button-ios-line-height;
color: $segment-button-ios-background-color-activated;
background-color: $segment-button-ios-background-color;
flex: 1;
width: 0;
ion-icon {
font-size: $segment-button-ios-icon-size;
line-height: $segment-button-ios-icon-line-height;
}
&.segment-activated {
opacity: 1;
color: $segment-button-ios-text-color;
background-color: $segment-button-ios-background-color-activated;
opacity: 1;
transition: $segment-button-ios-activated-transition;
}
@ -68,8 +68,8 @@ $segment-button-ios-toolbar-icon-line-height: 2.4rem !default;
}
&:first-of-type {
border-radius: $segment-button-ios-border-radius 0 0 $segment-button-ios-border-radius;
margin-right: 0;
border-radius: $segment-button-ios-border-radius 0 0 $segment-button-ios-border-radius;
}
&:not(:first-of-type) {
@ -77,9 +77,9 @@ $segment-button-ios-toolbar-icon-line-height: 2.4rem !default;
}
&:last-of-type {
margin-left: 0;
border-left-width: 0;
border-radius: 0 $segment-button-ios-border-radius $segment-button-ios-border-radius 0;
margin-left: 0;
}
}
@ -87,17 +87,17 @@ $segment-button-ios-toolbar-icon-line-height: 2.4rem !default;
ion-segment {
position: absolute;
left: 0;
right: 0;
top: 0;
right: 0;
bottom: 0;
left: 0;
}
.segment-button {
max-width: $segment-button-ios-toolbar-button-max-width;
height: $segment-button-ios-toolbar-button-height;
line-height: $segment-button-ios-toolbar-line-height;
font-size: $segment-button-ios-toolbar-font-size;
line-height: $segment-button-ios-toolbar-line-height;
ion-icon {
font-size: $segment-button-ios-toolbar-icon-size;

21
ionic/components/segment/segment.md.scss
View File

@ -8,35 +8,34 @@ $segment-button-md-text-color-activated: $toolbar-md-active-color !default
$segment-button-md-border-color-activated: $toolbar-md-active-color !default;
$segment-button-md-border-bottom-width: 2px !default;
$segment-button-md-border-bottom-color: rgba(#000000, 0.10) !default;
$segment-button-md-border-bottom-color: rgba(#000, .10) !default;
$segment-button-md-padding: 0 6px !default;
$segment-button-md-height: 4.2rem !default;
$segment-button-md-line-height: 4.0rem !default;
$segment-button-md-line-height: 4rem !default;
$segment-button-md-font-size: 1.2rem !default;
$segment-button-md-icon-size: 2.6rem !default;
$segment-button-md-icon-line-height: $segment-button-md-line-height !default;
.segment-button {
flex: 1;
padding: $segment-button-md-padding;
width: 0;
height: $segment-button-md-height;
border-bottom-width: $segment-button-md-border-bottom-width;
border-bottom-style: solid;
border-bottom-color: $segment-button-md-border-bottom-color;
height: $segment-button-md-height;
line-height: $segment-button-md-line-height;
font-size: $segment-button-md-font-size;
text-transform: uppercase;
font-weight: 500;
line-height: $segment-button-md-line-height;
text-transform: uppercase;
flex: 1;
width: 0;
opacity: 0.7;
color: $segment-button-md-text-color-activated;
background-color: transparent;
opacity: .7;
transition: 100ms all linear;
ion-icon {
@ -74,9 +73,9 @@ $segment-button-md-icon-line-height: $segment-button-md-line-height !d
&.activated,
&.segment-activated {
opacity: 1;
border-color: $color-value;
color: $color-value;
opacity: 1;
}
}

10
ionic/components/segment/segment.scss
View File

@ -6,20 +6,20 @@
ion-segment {
display: flex;
flex: 1;
align-items: center;
justify-content: center;
flex: 1;
width: 100%;
}
.segment-button {
position: relative;
display: block;
margin-left: 0;
margin-right: 0;
overflow: hidden;
margin-right: 0;
margin-left: 0;
text-align: center;
text-overflow: ellipsis;
white-space: nowrap;

16
ionic/components/segment/segment.wp.scss
View File

@ -7,8 +7,8 @@
$segment-button-wp-text-color-activated: $toolbar-wp-text-color !default;
$segment-button-wp-padding: 0 6px !default;
$segment-button-wp-height: 4.0rem !default;
$segment-button-wp-line-height: 4.0rem !default;
$segment-button-wp-height: 4rem !default;
$segment-button-wp-line-height: 4rem !default;
$segment-button-wp-font-size: 1.3rem !default;
$segment-button-wp-text-transform: uppercase !default;
$segment-button-wp-font-weight: bold !default;
@ -16,8 +16,8 @@ $segment-button-wp-icon-size: 2.6rem !default;
$segment-button-wp-icon-line-height: $segment-button-wp-line-height !default;
$segment-button-wp-background-color: transparent !default;
$segment-button-wp-opacity: 0.5 !default;
$segment-button-wp-opacity-activated: 1.0 !default;
$segment-button-wp-opacity: .5 !default;
$segment-button-wp-opacity-activated: 1 !default;
$segment-button-wp-buttons-justify-content: flex-start !default;
@ -29,15 +29,15 @@ ion-segment {
padding: $segment-button-wp-padding;
height: $segment-button-wp-height;
font-size: $segment-button-wp-font-size;
font-weight: $segment-button-wp-font-weight;
line-height: $segment-button-wp-line-height;
font-size: $segment-button-wp-font-size;
text-transform: $segment-button-wp-text-transform;
font-weight: $segment-button-wp-font-weight;
opacity: $segment-button-wp-opacity;
color: $segment-button-wp-text-color-activated;
background-color: $segment-button-wp-background-color;
opacity: $segment-button-wp-opacity;
ion-icon {
font-size: $segment-button-wp-icon-size;
@ -69,9 +69,9 @@ ion-segment {
&.activated,
&.segment-activated {
opacity: $segment-button-wp-opacity-activated;
border-color: $color-value;
color: $color-value;
opacity: $segment-button-wp-opacity-activated;
}
}