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

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

6
ionic/components/chip/chip.ios.scss
View File

@@ -3,10 +3,6 @@
// Material Design Chip
// --------------------------------------------------
ion-chip {
}
// Generate Material Design Chip Colors
// --------------------------------------------------
@@ -15,8 +11,8 @@ ion-chip {
ion-chip {
ion-icon[#{$color-name}] {
color: color-inverse($color-value);
background-color: $color-value;
color: color-inverse($color-value) !important;
}
}

6
ionic/components/chip/chip.md.scss
View File

@@ -3,10 +3,6 @@
// Material Design Chip
// --------------------------------------------------
ion-chip {
}
// Generate Material Design Chip Colors
// --------------------------------------------------
@@ -15,8 +11,8 @@ ion-chip {
ion-chip {
ion-icon[#{$color-name}] {
color: color-inverse($color-value);
background-color: $color-value;
color: color-inverse($color-value) !important;
}
}

49
ionic/components/chip/chip.scss
View File

@@ -3,33 +3,30 @@
// Chip
// --------------------------------------------------
$chip-background-color: rgba(0,0,0,0.12) !default;
$chip-background-color: rgba(0, 0, 0, .12) !default;
$chip-font-size: 13px !default;
$chip-height: 32px !default;
$chip-border-radius: 16px !default;
$chip-padding: 0 12px !default;
$chip-margin: 2px 0 !default;
$chip-label-color: rgba(0,0,0,0.87) !default;
$chip-icon-color: rgba(0,0,0,0.87) !default;
$chip-label-color: rgba(0, 0, 0, .87) !default;
$chip-icon-color: rgba(0, 0, 0, .87) !default;
ion-chip {
background: $chip-background-color;
display: inline-block;
height: $chip-height;
line-height: $chip-height;
border-radius: $chip-border-radius;
padding: $chip-padding;
margin: $chip-margin;
box-sizing: border-box;
vertical-align: middle;
display: inline-flex;
align-self: center;
margin: $chip-margin;
padding: $chip-padding;
height: $chip-height;
border-radius: $chip-border-radius;
font-size: $chip-font-size;
font-weight: normal;
line-height: $chip-height;
background: $chip-background-color;
vertical-align: middle;
box-sizing: border-box;
ion-label {
margin: 0;
@@ -38,23 +35,23 @@ ion-chip {
> ion-icon,
> ion-avatar {
margin-left: -12px;
width: 32px;
height: 32px;
margin-left: -12px;
vertical-align: top;
border-radius: 50%;
text-align: center;
line-height: 32px;
color: $chip-icon-color;
font-size: 18px;
line-height: 32px;
text-align: center;
color: $chip-icon-color;
vertical-align: top;
img {
max-width: 100%;
max-height: 100%;
width: 100%;
height: 100%;
border-radius: 50%;
display: block;
width: 100%;
max-width: 100%;
height: 100%;
max-height: 100%;
border-radius: 50%;
}
+ ion-label {
@@ -68,9 +65,9 @@ ion-chip {
}
.button {
height: inherit;
margin: 0;
margin-right: -4px;
height: inherit;
}
ion-icon[name="close-circle"] {

6
ionic/components/chip/chip.wp.scss
View File

@@ -3,10 +3,6 @@
// Windows Chip
// --------------------------------------------------
ion-chip {
}
// Generate Windows Chip Colors
// --------------------------------------------------
@@ -15,8 +11,8 @@ ion-chip {
ion-chip {
ion-icon[#{$color-name}] {
color: color-inverse($color-value);
background-color: $color-value;
color: color-inverse($color-value) !important;
}
}