Skip to content

Commit 2713f9e

Browse files
authored
Remove Satoshi from template, keep it in opensaas.sh (#526)
1 parent a5df55a commit 2713f9e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+36
-38
lines changed
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- template/app/src/admin/dashboards/analytics/RevenueAndProfitChart.tsx
2+
+++ opensaas-sh/app/src/admin/dashboards/analytics/RevenueAndProfitChart.tsx
3+
@@ -11,7 +11,7 @@
4+
},
5+
colors: ["#3C50E0", "#80CAEE"],
6+
chart: {
7+
- fontFamily: "system-ui, sans-serif",
8+
+ fontFamily: "Satoshi, system-ui, sans-serif",
9+
height: 335,
10+
type: "area",
11+
dropShadow: {

opensaas-sh/app_diff/src/client/Main.css.diff

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- template/app/src/client/Main.css
22
+++ opensaas-sh/app/src/client/Main.css
3-
@@ -56,6 +56,23 @@
3+
@@ -56,6 +56,64 @@
44
.border-gradient-primary > * {
55
background: hsl(var(--background));
66
}
@@ -21,13 +21,7 @@
2121
+ hsl(var(--card)) 100%
2222
+ );
2323
+ }
24-
}
25-
26-
/* Here is an example of how to add a custom font.
27-
@@ -63,6 +80,16 @@
28-
* They are defined first here, then need to be referenced in the tailwind.config.js file
29-
* under `theme.extend.fontFamily`, and then can be used as a tailwind class, e.g. className='font-satoshi'.
30-
*/
24+
+}
3125
+
3226
+/* Satoshi Font Family */
3327
+@font-face {
@@ -38,13 +32,14 @@
3832
+ font-display: swap;
3933
+}
4034
+
41-
@font-face {
42-
font-family: "Satoshi";
43-
src: url("/fonts/Satoshi-Regular.woff2") format("woff2");
44-
@@ -71,6 +98,30 @@
45-
font-display: swap;
46-
}
47-
35+
+@font-face {
36+
+ font-family: "Satoshi";
37+
+ src: url("/fonts/Satoshi-Regular.woff2") format("woff2");
38+
+ font-weight: normal;
39+
+ font-style: normal;
40+
+ font-display: swap;
41+
+}
42+
+
4843
+@font-face {
4944
+ font-family: "Satoshi";
5045
+ src: url("/fonts/Satoshi-Medium.woff2") format("woff2");
@@ -67,12 +62,10 @@
6762
+ font-weight: 900;
6863
+ font-style: normal;
6964
+ font-display: swap;
70-
+}
71-
+
72-
/* third-party libraries CSS */
65+
}
7366

74-
.tableCheckbox:checked ~ div span {
75-
@@ -189,4 +240,22 @@
67+
/* third-party libraries CSS */
68+
@@ -176,4 +234,22 @@
7669
body {
7770
@apply bg-background text-foreground;
7871
}

opensaas-sh/app_diff/tailwind.config.js.diff

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
--- template/app/tailwind.config.js
22
+++ opensaas-sh/app/tailwind.config.js
3-
@@ -254,6 +254,10 @@
3+
@@ -12,6 +12,9 @@
4+
darkMode: "class",
5+
theme: {
6+
extend: {
7+
+ fontFamily: {
8+
+ satoshi: ["Satoshi", "system-ui", "sans-serif"],
9+
+ },
10+
colors: {
11+
current: "currentColor",
12+
transparent: "transparent",
13+
@@ -251,6 +254,10 @@
414
7: "-5px 0 0 #313D4A, 5px 0 0 #313D4A",
515
8: "1px 0 0 #313D4A, -1px 0 0 #313D4A, 0 1px 0 #313D4A, 0 -1px 0 #313D4A, 0 3px 13px rgb(0 0 0 / 8%)",
616
default: "0px 8px 13px -3px rgba(0, 0, 0, 0.07)",
-71.6 KB
Binary file not shown.
-71.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)