Skip to content

Commit ba6faee

Browse files
AhmadHassan-BTedAhmadHassan-BTed
committed
fix(ui): resolve font loading across admin and tenant dashboards with local and cdn fallbacks
1 parent 499e7ba commit ba6faee

5 files changed

Lines changed: 28 additions & 7 deletions

File tree

‎src/fractal_server/static/admin-responsive.css‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
@font-face {
22
font-family: 'Genos';
3-
src:url("{{ url_for('static',filename='Genos-VariableFont_wght.ttf') }}") format('truetype-variations');
3+
src: url('Genos-VariableFont_wght.ttf') format('truetype-variations'),
4+
url('Genos-VariableFont_wght.ttf') format('truetype');
45
font-weight: 100 900;
6+
font-style: normal;
7+
}
8+
9+
@font-face {
10+
font-family: 'Genos';
11+
src: url('Genos-Italic-VariableFont_wght.ttf') format('truetype-variations'),
12+
url('Genos-Italic-VariableFont_wght.ttf') format('truetype');
13+
font-weight: 100 900;
14+
font-style: italic;
515
}
616

717
*,

‎src/fractal_server/static/dashboard-responsive.css‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
@font-face {
22
font-family: 'Genos';
3-
src: url("Genos-VariableFont_wght.ttf") format('truetype-variations');
3+
src: url('Genos-VariableFont_wght.ttf') format('truetype-variations'),
4+
url('Genos-VariableFont_wght.ttf') format('truetype');
45
font-weight: 100 900;
56
font-style: normal;
67
}
78

89
@font-face {
910
font-family: 'Genos';
10-
src: url("Genos-Italic-VariableFont_wght.ttf") format('truetype-variations');
11+
src: url('Genos-Italic-VariableFont_wght.ttf') format('truetype-variations'),
12+
url('Genos-Italic-VariableFont_wght.ttf') format('truetype');
1113
font-weight: 100 900;
1214
font-style: italic;
1315
}

‎src/fractal_server/templates/admin.html‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<title>Fractal — Admin</title>
88
<link rel="icon" type="image/svg+xml" href="{{ url_for('static', filename='favicon.svg') }}">
9-
<link rel="stylesheet" href="{{ url_for('static', filename='admin-responsive.css') }}?v=2">
9+
<link rel="preconnect" href="https://fonts.googleapis.com">
10+
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
11+
<link href="https://fonts.googleapis.com/css2?family=Genos:ital,wght@0,100..900;1,100..900&display=swap" rel="stylesheet">
12+
<link rel="stylesheet" href="{{ url_for('static', filename='admin-responsive.css') }}?v=3">
1013
</head>
1114

1215
<body>

‎src/fractal_server/templates/login.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
77
<title>Fractal Grid — Login</title>
88
<link rel="icon" type="image/svg+xml" href="{{ url_for('static', filename='favicon.svg') }}">
9+
<link rel="preconnect" href="https://fonts.googleapis.com">
10+
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
11+
<link href="https://fonts.googleapis.com/css2?family=Genos:ital,wght@0,100..900;1,100..900&display=swap" rel="stylesheet">
912
<style>
1013
@font-face {
1114
font-family: 'Genos';
12-
src: url("{{ url_for('static',filename='Genos-VariableFont_wght.ttf') }}") format('truetype-variations');
15+
src: url("{{ url_for('static', filename='Genos-VariableFont_wght.ttf') }}") format('truetype-variations'),
16+
url("{{ url_for('static', filename='Genos-VariableFont_wght.ttf') }}") format('truetype');
1317
font-weight: 100 900;
1418
font-style: normal;
1519
}

‎src/fractal_server/templates/tenant.html‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<title>Fractal Grid</title>
88
<link rel="icon" type="image/svg+xml" href="{{ url_for('static', filename='favicon.svg') }}">
9-
<link rel="stylesheet" href="{{ url_for('static', filename='dashboard-responsive.css') }}?v=2">
10-
9+
<link rel="preconnect" href="https://fonts.googleapis.com">
10+
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
11+
<link href="https://fonts.googleapis.com/css2?family=Genos:ital,wght@0,100..900;1,100..900&display=swap" rel="stylesheet">
12+
<link rel="stylesheet" href="{{ url_for('static', filename='dashboard-responsive.css') }}?v=3">
1113
</head>
1214

1315
<body>

0 commit comments

Comments
 (0)