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

Commit 85e016b

Browse files
authored
Merge pull request #239 from unisonweb/fix-safari-transparent-issue
Fix Safari Finder render issue
2 parents 16d9a8d + fddc57a commit 85e016b

File tree

8 files changed

+47
-26
lines changed

8 files changed

+47
-26
lines changed

src/css/definition-doc.css

+3-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@
4242
border-radius: var(--border-radius-base);
4343
margin-bottom: 1rem;
4444
scrollbar-width: auto;
45-
scrollbar-color: var(--color-workspace-item-subtle-fg) transparent;
45+
scrollbar-color: var(--color-workspace-item-subtle-fg)
46+
var(--color-transparent);
4647
overflow: auto;
4748
}
4849

@@ -64,7 +65,7 @@
6465
.definition-doc .source.example::-webkit-scrollbar-track,
6566
.definition-doc .source.eval::-webkit-scrollbar-track,
6667
.definition-doc .source.signatures .signature::-webkit-scrollbar-track {
67-
background: transparent;
68+
background: var(--color-transparent);
6869
}
6970
.definition-doc .source.code::-webkit-scrollbar-thumb,
7071
.definition-doc .sources .source::-webkit-scrollbar-thumb,

src/css/elements/button.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ a.button:hover {
155155

156156
/* -- Uncontained & Colors ------------------------------------------------- */
157157
.button.uncontained {
158-
background: transparent;
158+
background: var(--color-transparent);
159159
}
160160

161161
.button.uncontained.default,

src/css/elements/icon.css

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,19 @@
4848
}
4949

5050
.icon.animate.search .search-shine-trail-1 {
51-
fill: var(--color-icon-2, transparent);
51+
fill: var(--color-icon-2, var(--color-transparent, transparent));
5252
animation-delay: calc(0.1s + var(--icon-animation-delay, 0s));
5353
transition-delay: var(--icon-transition-delay, 0s);
5454
}
5555

5656
.icon.animate.search .search-shine-trail-2 {
57-
fill: var(--color-icon-3, transparent);
57+
fill: var(--color-icon-3, var(--color-transparent, transparent));
5858
animation-delay: calc(0.2s + var(--icon-animation-delay, 0s));
5959
transition-delay: var(--icon-transition-delay, 0s);
6060
}
6161

6262
.icon.animate.search .search-shine-trail-3 {
63-
fill: var(--color-icon-4, transparent);
63+
fill: var(--color-icon-4, var(--color-transparent, transparent));
6464
animation-delay: calc(0.3s + var(--icon-animation-delay, 0s));
6565
transition-delay: var(--icon-transition-delay, 0s);
6666
}

src/css/elements/tooltip.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959

6060
.tooltip-bubble:after,
6161
.tooltip-bubble:before {
62-
border: solid transparent;
62+
border: solid var(--color-transparent);
6363
content: "";
6464
height: 0;
6565
width: 0;

src/css/finder.css

+16-4
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
#finder input {
4747
height: 2rem;
48-
background: transparent;
48+
background: var(--color-transparent);
4949
width: 100%;
5050
border-radius: 0;
5151
font-size: 1rem;
@@ -240,7 +240,11 @@
240240
right: 0;
241241
bottom: 0;
242242
width: 2rem;
243-
background: linear-gradient(90deg, transparent, var(--color-modal-bg));
243+
background: linear-gradient(
244+
90deg,
245+
var(--color-transparent),
246+
var(--color-modal-bg)
247+
);
244248
}
245249

246250
#finder .definition-match .source code {
@@ -294,7 +298,11 @@
294298
}
295299

296300
#finder .definition-match.focused .source:after {
297-
background: linear-gradient(90deg, transparent, var(--color-modal-focus-bg));
301+
background: linear-gradient(
302+
90deg,
303+
var(--color-transparent),
304+
var(--color-modal-focus-bg)
305+
);
298306
}
299307

300308
/* hover */
@@ -308,5 +316,9 @@
308316
}
309317

310318
#finder .definition-match:not(.focused):hover .source:after {
311-
background: linear-gradient(90deg, transparent, var(--color-modal-mg));
319+
background: linear-gradient(
320+
90deg,
321+
var(--color-transparent),
322+
var(--color-modal-mg)
323+
);
312324
}

src/css/themes/unison/colors.css

+7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
:root {
2+
/* `transparent` sometimes renders as a dark shade when used
3+
* in gradients in some browsers. Having a variable based
4+
* on rgba fixes this and makes it convienient to use
5+
* everywhere.
6+
*/
7+
--color-transparent: rgba(255, 255, 255, 0);
8+
29
/* Brand colors */
310
--color-brand-bright-red: #ff4756;
411
--color-brand-orange: #ff8800;

src/css/themes/unison/light.css

+12-12
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
--color-main-focus-bg: var(--color-blue-2);
1616
--color-main-alert: var(--color-pink-1);
1717
--color-main-mark-fg: var(--color-blue-2);
18-
--color-main-mark-bg: transparent;
18+
--color-main-mark-bg: var(--color-transparent);
1919

2020
--color-main-header-fg: var(--color-gray-lighten-100);
2121
--color-main-header-bg: var(--color-gray-darken-10);
@@ -33,10 +33,10 @@
3333
--color-sidebar-fg: var(--color-gray-lighten-50);
3434
--color-sidebar-fg-em: var(--color-gray-lighten-100);
3535
--color-sidebar-bg: var(--color-gray-darken-20);
36-
--color-sidebar-border: transparent;
36+
--color-sidebar-border: var(--color-transparent);
3737
--color-sidebar-subtle-fg: var(--color-gray-lighten-20);
3838
--color-sidebar-subtle-fg-em: var(--color-gray-lighten-30);
39-
--color-sidebar-subtle-bg: transparent;
39+
--color-sidebar-subtle-bg: var(--color-transparent);
4040
--color-sidebar-focus-fg: var(--color-gray-lighten-60);
4141
--color-sidebar-focus-bg: var(--color-gray-darken-10);
4242
--color-sidebar-keyboard-shortcut-key-fg: var(--color-gray-lighten-30);
@@ -74,12 +74,12 @@
7474
255,
7575
0.5
7676
); /* 50% gray-lighten-100 */
77-
--color-workspace-item-source-bg: transparent;
77+
--color-workspace-item-source-bg: var(--color-transparent);
7878
--color-workspace-item-subtle-fg: var(--color-gray-lighten-30);
7979
--color-workspace-item-subtle-bg: var(--color-gray-lighten-60);
8080
--color-workspace-item-bg-em: var(--color-gray-lighten-55);
8181
--color-workspace-item-content-border: var(--color-gray-lighten-55);
82-
--color-workspace-item-border: transparent;
82+
--color-workspace-item-border: var(--color-transparent);
8383
--color-workspace-item-info-item-fg: var(--color-gray-lighten-30);
8484
--color-workspace-item-info-item-subtle-fg: var(--color-gray-lighten-30);
8585
--color-workspace-item-info-item-hover-fg: var(--color-gray-darken-30);
@@ -89,7 +89,7 @@
8989
--color-workspace-item-focus-subtle-fg: var(--color-gray-lighten-30);
9090
--color-workspace-item-focus-subtle-bg: var(--color-gray-lighten-50);
9191
--color-workspace-item-focus-mg: var(--color-gray-lighten-55);
92-
--color-workspace-item-focus-source-bg: transparent;
92+
--color-workspace-item-focus-source-bg: var(--color-transparent);
9393
--color-workspace-item-focus-bg: var(--color-gray-lighten-60);
9494
--color-workspace-item-focus-bg-faded: rgba(
9595
250,
@@ -140,7 +140,7 @@
140140
--color-modal-separator: var(--color-gray-lighten-55);
141141
--color-modal-shadow: rgba(24, 24, 28, 0.2); /* 20% gray-darken-30 */
142142
--color-modal-overlay: rgba(24, 24, 28, 0.5); /* 50% gray-darken-30 */
143-
--color-modal-border: transparent;
143+
--color-modal-border: var(--color-transparent);
144144
--color-modal-subtle-fg: var(--color-main-subtle-fg);
145145
--color-modal-subtle-fg-em: var(--color-gray-lighten-20);
146146
--color-modal-subtle-mg: var(--color-gray-lighten-55);
@@ -150,9 +150,9 @@
150150
--color-modal-focus-subtle-fg: var(--color-gray-base);
151151
--color-modal-focus-subtle-bg: var(--color-gray-lighten-50);
152152
--color-modal-title-fg: var(--color-gray-lighten-20);
153-
--color-modal-title-bg: transparent;
153+
--color-modal-title-bg: var(--color-transparent);
154154
--color-modal-mark-fg: var(--color-blue-2);
155-
--color-modal-mark-bg: transparent;
155+
--color-modal-mark-bg: var(--color-transparent);
156156
--color-modal-error-fg: var(--color-pink-1);
157157

158158
/* Icons */
@@ -168,7 +168,7 @@
168168
/* FoldToggle */
169169

170170
--color-fold-toggle-fg: var(--color-gray-lighten-30);
171-
--color-fold-toggle-bg: transparent;
171+
--color-fold-toggle-bg: var(--color-transparent);
172172
--color-fold-toggle-hover-fg: var(--color-gray-base);
173173
--color-fold-toggle-hover-bg: var(--color-gray-lighten-45);
174174

@@ -209,7 +209,7 @@
209209
--color-option-badge-icon: var(--color-gray-lighten-30);
210210
--color-option-badge-hover-icon: var(--color-gray-100);
211211
--color-option-badge-bg: var(--color-gray-darken-30);
212-
--color-option-badge-border: transparent;
212+
--color-option-badge-border: var(--color-transparent);
213213

214214
/* Tooltips */
215215
--color-tooltip-fg: var(--color-gray-lighten-60);
@@ -238,7 +238,7 @@
238238
/* ActionMenu (should probably be moved out of tooltip) */
239239
--color-tooltip-item-fg: var(--color-gray-lighten-60);
240240
--color-tooltip-item-subtle-fg: var(--color-gray-lighten-20);
241-
--color-tooltip-item-bg: transparent;
241+
--color-tooltip-item-bg: var(--color-transparent);
242242
--color-tooltip-item-hover-fg: var(--color-gray-lighten-60);
243243
--color-tooltip-item-hover-subtle-fg: var(--color-gray-lighten-30);
244244
--color-tooltip-item-hover-bg: var(--color-gray-darken-10);

src/css/workspace-item.css

+4-3
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@
238238
0deg,
239239
var(--color-workspace-item-bg) 20%,
240240
var(--color-workspace-item-bg-faded) 80%,
241-
rgba(255, 255, 255, 0)
241+
var(--color-transparent)
242242
);
243243
}
244244

@@ -262,7 +262,8 @@
262262
width: var(--workspace-content-width);
263263
overflow: auto;
264264
scrollbar-width: auto;
265-
scrollbar-color: var(--color-workspace-item-subtle-fg) transparent;
265+
scrollbar-color: var(--color-workspace-item-subtle-fg)
266+
var(--color-transparent);
266267
}
267268

268269
.workspace-item .content .definition-source .fold-toggle {
@@ -277,7 +278,7 @@
277278
}
278279

279280
.workspace-item .content .definition-source::-webkit-scrollbar-track {
280-
background: transparent;
281+
background: var(--color-transparent);
281282
}
282283

283284
.workspace-item .content .definition-source::-webkit-scrollbar-thumb {

0 commit comments

Comments
 (0)