Skip to content

Commit eeac795

Browse files
committed
fix(chip): cleaned up some of the UI and added some sass variables
references #5386
1 parent dd206ad commit eeac795

File tree

3 files changed

+37
-25
lines changed

3 files changed

+37
-25
lines changed

ionic/components/chip/chip.ios.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// --------------------------------------------------
55

66
ion-chip {
7+
78
}
89

910

@@ -13,7 +14,7 @@ ion-chip {
1314
@each $color-name, $color-value in $colors-ios {
1415

1516
ion-chip {
16-
> ion-icon[#{$color-name}] {
17+
ion-icon[#{$color-name}] {
1718
background-color: $color-value;
1819
color: color-inverse($color-value) !important;
1920
}

ionic/components/chip/chip.md.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// --------------------------------------------------
55

66
ion-chip {
7+
78
}
89

910

@@ -13,7 +14,7 @@ ion-chip {
1314
@each $color-name, $color-value in $colors-md {
1415

1516
ion-chip {
16-
> ion-icon [#{$color-name}] {
17+
ion-icon[#{$color-name}] {
1718
background-color: $color-value;
1819
color: color-inverse($color-value) !important;
1920
}

ionic/components/chip/chip.scss

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,60 @@
33
// Chip
44
// --------------------------------------------------
55

6+
$chip-background-color: rgba(0,0,0,0.12) !default;
7+
$chip-font-size: 13px !default;
8+
$chip-height: 32px !default;
9+
$chip-border-radius: 16px !default;
10+
$chip-padding: 0 12px !default;
11+
$chip-margin: 2px 0 !default;
12+
13+
$chip-label-color: rgba(0,0,0,0.87) !default;
14+
15+
$chip-icon-color: rgba(0,0,0,0.87) !default;
616

717
ion-chip {
8-
font-size: 13px;
9-
font-weight: normal;
10-
background: rgba(0,0,0,0.12);
18+
background: $chip-background-color;
1119
display: inline-block;
12-
height: 32px;
13-
line-height: 32px;
14-
border-radius: 16px;
15-
padding: 0 12px;
20+
height: $chip-height;
21+
line-height: $chip-height;
22+
border-radius: $chip-border-radius;
23+
padding: $chip-padding;
24+
margin: $chip-margin;
25+
1626
box-sizing: border-box;
1727
vertical-align: middle;
1828
display: inline-flex;
1929
align-self: center;
2030

21-
margin: 2px 0;
31+
font-size: $chip-font-size;
32+
font-weight: normal;
2233

2334
ion-label {
2435
margin: 0;
25-
color: rgba(0,0,0,0.87);
36+
color: $chip-label-color;
2637
}
2738

28-
> ion-icon, > ion-avatar {
39+
> ion-icon,
40+
> ion-avatar {
2941
width: 32px;
3042
height: 32px;
3143
margin-left: -12px;
3244
vertical-align: top;
3345
border-radius: 50%;
3446
text-align: center;
3547
line-height: 32px;
36-
color: rgba(0,0,0,0.87);
37-
// .flex-shrink(0);
48+
color: $chip-icon-color;
3849
font-size: 18px;
39-
// .flexbox();
40-
// .align-items(center);
41-
// .justify-content(center);
50+
4251
img {
43-
max-width: 100%;
44-
max-height: 100%;
45-
width: 100%;
46-
height: 100%;
47-
border-radius: 50%;
48-
display: block;
52+
max-width: 100%;
53+
max-height: 100%;
54+
width: 100%;
55+
height: 100%;
56+
border-radius: 50%;
57+
display: block;
4958
}
59+
5060
+ ion-label {
5161
margin-left: 8px;
5262
}
@@ -58,9 +68,9 @@ ion-chip {
5868
}
5969

6070
.button {
61-
min-height: inherit;
71+
height: inherit;
72+
margin: 0;
6273
margin-right: -4px;
63-
margin-left: 8px;
6474
}
6575

6676
ion-icon[name="close-circle"] {

0 commit comments

Comments
 (0)