Skip to content

Commit 40a3314

Browse files
committed
Revert emoji font and fix long-standing Safari bug
1 parent 9b10580 commit 40a3314

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

web_src/less/_base.less

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
:root {
22
/* documented customizable variables */
3-
--fonts-proportional: -apple-system, "Segoe UI", system-ui, "Roboto", "Helvetica Neue", "Arial", "Noto Sans", "Liberation Sans", sans-serif;
3+
--fonts-proportional: -apple-system, "Segoe UI", system-ui, "Roboto", "Helvetica Neue", "Arial", "Noto Sans", "Liberation Sans";
44
--fonts-monospace: "SFMono-Regular", "Menlo", "Monaco", "Consolas", "Liberation Mono", "Courier New", monospace;
5-
--fonts-emoji: system-emoji;
5+
--fonts-emoji: "Apple Color Emoji", "Segoe UI Emoji", "Noto Color Emoji", "Twemoji Mozilla";
66
/* other variables */
7-
--fonts-regular: var(--fonts-emoji), var(--fonts-proportional);
7+
--fonts-regular: var(--fonts-proportional), var(--fonts-emoji), sans-serif;
88
--border-radius: .28571429rem;
99
--opacity-disabled: .55;
1010
--color-primary: #4183c4;
@@ -115,12 +115,6 @@
115115
--checkbox-mask-indeterminate: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16"><path fill-rule="evenodd" d="M2 7.75A.75.75 0 012.75 7h10a.75.75 0 010 1.5h-10A.75.75 0 012 7.75z"></path></svg>');
116116
}
117117

118-
@font-face {
119-
font-family: system-emoji;
120-
src: local("Apple Color Emoji"), local("Segoe UI Emoji"), local("Noto Color Emoji"), local("Twemoji Mozilla");
121-
unicode-range: ~"U+2100-2BFF, U+303?, U+329?, U+FE0?, U+1F000-1FAFF";
122-
}
123-
124118
textarea {
125119
font-family: var(--fonts-regular);
126120
}
@@ -1857,6 +1851,17 @@ table th[data-sortt-desc] {
18571851
font-style: normal !important;
18581852
font-weight: normal !important;
18591853
vertical-align: -.075em;
1854+
1855+
@supports (-webkit-hyphens:none) {
1856+
& {
1857+
font-size: inherit;
1858+
vertical-align: inherit;
1859+
img {
1860+
font-size: 1.25em;
1861+
vertical-align: -.225em !important;
1862+
}
1863+
}
1864+
}
18601865
}
18611866

18621867
.emoji img,

web_src/less/_font_i18n.less

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
:root {
33
/* customizable localized variables */
44
:lang(ja) {
5-
--fonts-regular: var(--fonts-emoji), system-ui-ja, var(--fonts-proportional);
5+
--fonts-regular: system-ui-ja, var(--fonts-proportional), var(--fonts-emoji), sans-serif;
66
}
77
:lang(zh-CN) {
8-
--fonts-regular: var(--fonts-emoji), system-ui-zh-cn, var(--fonts-proportional);
8+
--fonts-regular: system-ui-zh-cn, var(--fonts-proportional), var(--fonts-emoji), sans-serif;
99
}
1010
:lang(zh-TW) {
11-
--fonts-regular: var(--fonts-emoji), system-ui-zh-tw, var(--fonts-proportional);
11+
--fonts-regular: system-ui-zh-tw, var(--fonts-proportional), var(--fonts-emoji), sans-serif;
1212
}
1313
:lang(zh-HK) {
14-
--fonts-regular: var(--fonts-emoji), system-ui-zh-hk, var(--fonts-proportional);
14+
--fonts-regular: system-ui-zh-hk, var(--fonts-proportional), var(--fonts-emoji), sans-serif;
1515
}
1616
:lang(ko) {
17-
--fonts-regular: var(--fonts-emoji), system-ui-ko, var(--fonts-proportional);
17+
--fonts-regular: system-ui-ko, var(--fonts-proportional), var(--fonts-emoji), sans-serif;
1818
}
1919
}
2020

0 commit comments

Comments
 (0)