Skip to content

Commit 09cf34f

Browse files
committed
trial outfit/funnel display fonts
1 parent fdbe677 commit 09cf34f

6 files changed

Lines changed: 20 additions & 12 deletions

File tree

src/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ function SidebarNavButton(props: {
8282
<Show when={props.pings}>
8383
<span
8484
class="indicator-item indicator-bottom bg-red-600 inline-flex text-xs font-medium items-center rounded-full
85-
min-w-[18px] h-[18px] m-1.5 ring-bg-0/80 ring-[3px]"
85+
min-w-[18px] h-[18px] m-1.5"
8686
>
8787
<span class="min-w-[18px] text-center text-white px-1.5 py-2">
8888
{humanizePings(props.pings!)}

src/client/themes.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,13 @@ function applyTheme(theme: Theme) {
226226
set('link', theme.link.default)
227227
set('link-hover', theme.link.hover)
228228
set('link-visited', theme.link.visited)
229+
230+
// For PWA theme color
231+
const [r, g, b] = theme.bg[2];
232+
const hex = '#' + r.toString(16).padStart(2, '0')
233+
+ g.toString(16).padStart(2, '0')
234+
+ b.toString(16).padStart(2, '0');
235+
document.querySelector('meta[name="theme-color"]')?.setAttribute('content', hex);
229236
}
230237

231238
type ExtendedSetter = <U extends Theme>(prev: Theme | ((prev: Theme) => U), saveNow?: boolean) => U

src/components/messaging/Chat.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2039,7 +2039,7 @@ export default function Chat(props: {
20392039
)}
20402040
</div>
20412041
<div class="break-words flex-grow p-2 bg-1">
2042-
<h2 class="text-sm font-title font-medium justify-self-center">
2042+
<h2 class="text-sm font-title font-medium">
20432043
{attachment.filename}
20442044
</h2>
20452045
<div class="text-xs text-fg/60">

src/index.css

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
@import url('https://fonts.googleapis.com/css2?family=Plus+Jakarta+Sans:wght@400;500;600;700;800&display=swap');
1+
/* @import url('https://fonts.googleapis.com/css2?family=Figtree:ital,wght@0,300..900;1,300..900&family=Funnel+Display:wght@300..800&display=swap'); */
2+
@import url('https://fonts.googleapis.com/css2?family=Funnel+Display:wght@300..800&family=Outfit:wght@100..900&display=swap');
23

34
@import "./styles/button.css";
45
@import "./styles/checkbox.css";
@@ -8,13 +9,6 @@
89
@tailwind components;
910
@tailwind utilities;
1011

11-
@font-face {
12-
font-family: 'Geist';
13-
src: url('/fonts/GeistVariableVF.woff2') format('woff2');
14-
font-weight: 100 900;
15-
font-display: swap;
16-
}
17-
1812
@font-face {
1913
font-family: 'Geist Mono';
2014
src: url('/fonts/GeistMonoVariableVF.woff2') format('woff2');
@@ -48,6 +42,8 @@ html {
4842

4943
body {
5044
@apply hide-scrollbar;
45+
margin: 0;
46+
background-color: rgb(var(--c-bg-2));
5147
touch-action: none;
5248
}
5349

@@ -99,6 +95,10 @@ details > summary::-webkit-details-marker { display: none }
9995
}
10096
}
10197

98+
#root {
99+
position: fixed;
100+
}
101+
102102
main {
103103
background-color: rgb(var(--c-bg-2));
104104
background-image:

src/pages/guilds/GuildHome.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ export default function GuildHome() {
4848
"background-size": "cover",
4949
"background-position": "center",
5050
"mask-image": "linear-gradient(to bottom, rgba(0,0,0,1), rgba(0,0,0,0))",
51+
"-webkit-mask-image": "linear-gradient(to bottom, rgba(0,0,0,1), rgba(0,0,0,0))",
5152
}}
5253
/>
5354
<div class="absolute flex items-start top-[calc(100%-2rem)] left-4 gap-x-3">

tailwind.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ module.exports = {
5858
},
5959
},
6060
fontFamily: {
61-
title: ['"Plus Jakarta Sans"', "Geist", ...defaultTheme.fontFamily.sans],
62-
sans: ["Geist", ...defaultTheme.fontFamily.sans],
61+
title: ["'Funnel Display'", "Outfit", ...defaultTheme.fontFamily.sans],
62+
sans: ["Outfit", ...defaultTheme.fontFamily.sans],
6363
mono: [
6464
'"Geist Mono"', 'Menlo', 'Monaco', 'Lucida Console', 'Liberation Mono',
6565
'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Courier New', 'monospace',

0 commit comments

Comments
 (0)