Skip to content
This repository was archived by the owner on Nov 30, 2022. It is now read-only.

Commit dee8751

Browse files
committed
fix(icon,app-bar): fix color scss properties
1 parent 9a4182f commit dee8751

File tree

6 files changed

+36
-26
lines changed

6 files changed

+36
-26
lines changed

projects/core/src/lib/app-bar/app-bar-tab/app-bar-tab.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717

1818
.tab.active {
19-
--fiv-icon-color: var(--ion-color-primary);
19+
--fiv-icon-color: var(--fiv-icon-activ-color, var(--ion-color-primary));
2020
::ng-deep ion-label {
2121
color: var(--ion-color-primary);
2222
}

projects/core/src/lib/app-bar/app-bar.component.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
--fiv-border-radius: 6px;
1414
--fiv-appbar-background-color: var(--ion-color-light);
1515
--fiv-side-width: 12px;
16+
--fiv-fab-icon-color: var(--ion-color-light);
1617
}
1718

1819
svg {
@@ -63,7 +64,7 @@ svg {
6364
--fiv-fab-size: var(--fiv-appbar-fab-size);
6465
z-index: 14;
6566
fiv-icon {
66-
--fiv-icon-color: var(--fiv-color-fab-icon);
67+
--fiv-icon-color: var(--fiv-fab-icon-color);
6768
}
6869
}
6970

projects/core/src/lib/icon/icon.component.scss

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,19 @@
55
--fiv-position-top: -2px;
66
--fiv-position-right: -6px;
77

8-
--fiv-icon-color: var(--ion-color-dark);
98
--fiv-icon-height: 28px;
109
--fiv-icon-width: 28px;
1110

1211
--fiv-small-icon-height: 18px;
1312
--fiv-small-icon-width: 18px;
14-
--fiv-small-icon-background-color: var(--ion-color-primary);
15-
--fiv-small-icon-color: var(--ion-color-light);
1613
--fiv-small-icon-font-size: 0.8em;
1714

1815
--fiv-badge-height: 18px;
1916
--fiv-badge-width: 18px;
20-
--fiv-badge-background-color: var(--ion-color-primary);
21-
--fiv-badge-color: var(--ion-color-light);
2217
--fiv-badge-font-size: 0.6em;
2318

2419
--fiv-dot-height: 18px;
2520
--fiv-dot-width: 18px;
26-
--fiv-dot-color: var(--ion-color-primary);
27-
28-
--fiv-off-color: var(--fiv-icon-color);
29-
--fiv-off-background-color: var(--ion-color-light);
3021

3122
position: relative;
3223
display: inline-block;
@@ -35,7 +26,7 @@
3526
.icon {
3627
margin: 0;
3728
font-size: 1.8em;
38-
color: var(--fiv-icon-color);
29+
color: var(--fiv-icon-color, var(--ion-color-dark));
3930
padding-right: var(--fiv-padding-end);
4031
padding-left: var(--fiv-padding-start);
4132
height: var(--fiv-icon-height);
@@ -50,8 +41,8 @@
5041
height: var(--fiv-badge-height);
5142
width: var(--fiv-badge-width);
5243

53-
background-color: var(--fiv-badge-background-color);
54-
color: var(--fiv-badge-color);
44+
background-color: var(--fiv-badge-background-color, var(--ion-color-primary));
45+
color: var(--fiv-badge-color, var(--ion-color-light));
5546

5647
border-radius: 14px;
5748
z-index: 13;
@@ -73,7 +64,7 @@
7364
height: var(--fiv-dot-height);
7465
width: var(--fiv-dot-width);
7566

76-
background-color: var(--fiv-dot-color, var(--ion-color-light));
67+
background-color: var(--fiv-dot-background-color, var(--ion-color-primary));
7768

7869
border-radius: 100%;
7970
z-index: 11;
@@ -87,8 +78,11 @@
8778
height: var(--fiv-small-icon-height);
8879
width: var(--fiv-small-icon-width);
8980

90-
background-color: var(--fiv-small-icon-background-color);
91-
color: var(--fiv-small-icon-color);
81+
background-color: var(
82+
--fiv-small-icon-background-color,
83+
var(--ion-color-primary)
84+
);
85+
color: var(--fiv-small-icon-color, var(--ion-color-light));
9286

9387
border-radius: 14px;
9488
z-index: 13;
@@ -105,7 +99,10 @@
10599
.off {
106100
width: 120%;
107101
height: 2px;
108-
background: var(--fiv-off-color);
102+
background: var(
103+
--fiv-off-color,
104+
var(--fiv-icon-color, var(--ion-color-dark))
105+
);
109106
position: absolute;
110107
left: 0;
111108
transform: rotateZ(45deg) translateY(10px) translateX(6px);
@@ -116,7 +113,7 @@
116113
height: 2px;
117114
background: #000;
118115
position: absolute;
119-
background-color: var(--fiv-off-background-color);
116+
background-color: var(--fiv-off-background-color, var(--ion-color-light));
120117
left: 2px;
121118
transform: rotateZ(45deg) translateY(10px) translateX(6px);
122119
}

src/app/pages/app-bar/app-bar.page.scss

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,16 @@
77
border: 2px solid var(--ion-color-dark);
88
cursor: url(/assets/icon/cursor.png), auto;
99
}
10+
11+
fiv-app-bar {
12+
// --fiv-icon-color: var(--ion-color-dark);
13+
// --fiv-small-icon-background-color: yellow;
14+
// --fiv-small-icon-color: red;
15+
16+
// --fiv-badge-background-color: yellow;
17+
// --fiv-badge-color: red;
18+
19+
// --fiv-dot-background-color: yellow;
20+
21+
// --fiv-icon-activ-color: red;
22+
}

src/app/pages/icon/icon.page.scss

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
:host {
2-
--fiv-dot-color-background: var(--ion-background-color);
3-
--fiv-dot-color: var(--ion-color-primary);
2+
--fiv-dot-background-color: var(--ion-color-danger);
43
}
54

65
.example {
7-
--fiv-icon-color: var(--ion-color-dark);
86
position: relative;
97
height: 120px;
108
}

src/assets/docs/components/app-bar.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ export class AppBarPage implements OnInit {
7575

7676
## CSS Variables
7777

78-
| Name | Description |
79-
| ----------------------------- | ------------------------- |
80-
| --fiv-appbar-background-color | Background of the app bar |
81-
| --fiv-icon-color | Icon color of the tabs |
78+
| Name | Description |
79+
| ----------------------------- | ---------------------------- |
80+
| --fiv-appbar-background-color | Background of the app bar |
81+
| --fiv-icon-color | Icon color of the tabs |
82+
| --fiv-icon-activ-color | Icon color of the active tab |

0 commit comments

Comments
 (0)