Skip to content

Commit 8093899

Browse files
committed
Add side-nav hover-text and active-text styling to ft-icon-button
1 parent 9201646 commit 8093899

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

src/renderer/components/ft-icon-button/ft-icon-button.scss

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,27 @@
2222
color: var(--primary-text-color);
2323

2424
&:hover,
25-
&:focus {
25+
&:focus-visible {
2626
background-color: var(--side-nav-hover-color);
2727
color: var(--side-nav-hover-text-color);
2828
}
2929

3030
&:active {
3131
background-color: var(--side-nav-active-color);
32+
color: var(--side-nav-active-text-color);
3233
}
3334
}
3435

3536
&.base-no-default {
3637
&:hover,
37-
&:focus {
38+
&:focus-visible {
3839
background-color: var(--side-nav-hover-color);
40+
color: var(--side-nav-hover-text-color);
3941
}
4042

4143
&:active {
4244
background-color: var(--side-nav-active-color);
45+
color: var(--side-nav-active-text-color);
4346
}
4447
}
4548

@@ -48,7 +51,7 @@
4851
color: var(--text-with-main-color);
4952

5053
&:hover,
51-
&:focus {
54+
&:focus-visible {
5255
background-color: var(--primary-color-hover);
5356
}
5457

@@ -62,7 +65,7 @@
6265
color: var(--text-with-accent-color);
6366

6467
&:hover,
65-
&:focus {
68+
&:focus-visible {
6669
background-color: var(--accent-color-hover);
6770
}
6871

@@ -71,7 +74,7 @@
7174
}
7275
}
7376

74-
&.favorite {
77+
&.favorite, &.favorite:hover, &.favorite:focus-visible {
7578
color: var(--favorite-icon-color);
7679
}
7780
}
@@ -118,13 +121,15 @@
118121
white-space: nowrap;
119122

120123
&:hover,
121-
&:focus {
124+
&:focus-visible {
122125
background-color: var(--side-nav-hover-color);
126+
color: var(--side-nav-hover-text-color);
123127
transition: background 0.2s ease-in;
124128
}
125129

126130
&:active {
127131
background-color: var(--side-nav-active-color);
132+
color: var(--side-nav-active-text-color);
128133
transition: background 0.1s ease-in;
129134
}
130135
}

src/renderer/themes.css

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,6 @@
184184
--search-bar-color: #FFF0DD;
185185
--logo-icon: url("../../_icons/iconBlackSmall.png");
186186
--logo-text: url("../../_icons/textBlackSmall.png");
187-
/* --logo-icon: url("../../_icons/iconPastelPinkLightSmall.png");
188-
--logo-text: url("../../_icons/textPastelPinkLightSmall.png"); */
189187
}
190188

191189
.hotPink {
@@ -216,6 +214,7 @@
216214
--primary-color-hover: #000000 !important;
217215
--primary-color-active: #000000 !important;
218216
--text-with-main-color: #FFFFFF !important;
217+
--text-with-accent-color: #FFFFFF !important;
219218
--accent-color: #000000 !important;
220219
--accent-color-hover: #808080 !important;
221220
--accent-color-active: #6A739A !important;
@@ -225,9 +224,6 @@
225224
--accent-color-opacity2: rgba(0,0,0,0.12) !important;
226225
--accent-color-opacity3: rgba(255,255,255,0.16) !important;
227226
--accent-color-opacity4: rgba(255,255,255,0.24) !important;
228-
229-
/* --logo-icon: url("../../_icons/iconHotPinkLightSmall.png");
230-
--logo-text: url("../../_icons/textHotPinkLightSmall.png"); */
231227
}
232228

233229
/* Given that the Hot Pink theme does not need link underlining due to meeting

0 commit comments

Comments
 (0)