Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- template/app/src/admin/dashboards/analytics/RevenueAndProfitChart.tsx
+++ opensaas-sh/app/src/admin/dashboards/analytics/RevenueAndProfitChart.tsx
@@ -11,7 +11,7 @@
},
colors: ["#3C50E0", "#80CAEE"],
chart: {
- fontFamily: "system-ui, sans-serif",
+ fontFamily: "Satoshi, system-ui, sans-serif",
height: 335,
type: "area",
dropShadow: {
33 changes: 13 additions & 20 deletions opensaas-sh/app_diff/src/client/Main.css.diff
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- template/app/src/client/Main.css
+++ opensaas-sh/app/src/client/Main.css
@@ -56,6 +56,23 @@
@@ -56,6 +56,64 @@
.border-gradient-primary > * {
background: hsl(var(--background));
}
Expand All @@ -21,13 +21,7 @@
+ hsl(var(--card)) 100%
+ );
+ }
}

/* Here is an example of how to add a custom font.
@@ -63,6 +80,16 @@
* They are defined first here, then need to be referenced in the tailwind.config.js file
* under `theme.extend.fontFamily`, and then can be used as a tailwind class, e.g. className='font-satoshi'.
*/
+}
+
+/* Satoshi Font Family */
+@font-face {
Expand All @@ -38,13 +32,14 @@
+ font-display: swap;
+}
+
@font-face {
font-family: "Satoshi";
src: url("/fonts/Satoshi-Regular.woff2") format("woff2");
@@ -71,6 +98,30 @@
font-display: swap;
}

+@font-face {
+ font-family: "Satoshi";
+ src: url("/fonts/Satoshi-Regular.woff2") format("woff2");
+ font-weight: normal;
+ font-style: normal;
+ font-display: swap;
+}
+
+@font-face {
+ font-family: "Satoshi";
+ src: url("/fonts/Satoshi-Medium.woff2") format("woff2");
Expand All @@ -67,12 +62,10 @@
+ font-weight: 900;
+ font-style: normal;
+ font-display: swap;
+}
+
/* third-party libraries CSS */
}

.tableCheckbox:checked ~ div span {
@@ -189,4 +240,22 @@
/* third-party libraries CSS */
@@ -176,4 +234,22 @@
body {
@apply bg-background text-foreground;
}
Expand Down
12 changes: 11 additions & 1 deletion opensaas-sh/app_diff/tailwind.config.js.diff
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
--- template/app/tailwind.config.js
+++ opensaas-sh/app/tailwind.config.js
@@ -254,6 +254,10 @@
@@ -12,6 +12,9 @@
darkMode: "class",
theme: {
extend: {
+ fontFamily: {
+ satoshi: ["Satoshi", "system-ui", "sans-serif"],
+ },
colors: {
current: "currentColor",
transparent: "transparent",
@@ -251,6 +254,10 @@
7: "-5px 0 0 #313D4A, 5px 0 0 #313D4A",
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%)",
default: "0px 8px 13px -3px rgba(0, 0, 0, 0.07)",
Expand Down
Binary file removed template/app/public/fonts/Satoshi-Black.eot
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-Black.ttf
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-Black.woff
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-BlackItalic.eot
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-BlackItalic.ttf
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-BlackItalic.woff
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-BlackItalic.woff2
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-Bold.eot
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-Bold.ttf
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-Bold.woff
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-BoldItalic.eot
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-BoldItalic.ttf
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-BoldItalic.woff
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-BoldItalic.woff2
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-Italic.eot
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-Italic.ttf
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-Italic.woff
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-Italic.woff2
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-Light.eot
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-Light.ttf
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-Light.woff
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-LightItalic.eot
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-LightItalic.ttf
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-LightItalic.woff
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-LightItalic.woff2
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-Medium.eot
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-Medium.ttf
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-Medium.woff
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-MediumItalic.eot
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-MediumItalic.ttf
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-MediumItalic.woff
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-MediumItalic.woff2
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-Regular.eot
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-Regular.ttf
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-Regular.woff
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-Variable.eot
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-Variable.ttf
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-Variable.woff
Binary file not shown.
Binary file removed template/app/public/fonts/Satoshi-Variable.woff2
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const options: ApexOptions = {
},
colors: ["#3C50E0", "#80CAEE"],
chart: {
fontFamily: "Satoshi, sans-serif",
fontFamily: "system-ui, sans-serif",
height: 335,
type: "area",
dropShadow: {
Expand Down
13 changes: 0 additions & 13 deletions template/app/src/client/Main.css
Original file line number Diff line number Diff line change
Expand Up @@ -58,19 +58,6 @@
}
}

/* Here is an example of how to add a custom font.
* Fonts are stored in the public/fonts folder.
* They are defined first here, then need to be referenced in the tailwind.config.js file
* under `theme.extend.fontFamily`, and then can be used as a tailwind class, e.g. className='font-satoshi'.
*/
@font-face {
font-family: "Satoshi";
src: url("/fonts/Satoshi-Regular.woff2") format("woff2");
font-weight: normal;
font-style: normal;
font-display: swap;
}

/* third-party libraries CSS */

.tableCheckbox:checked ~ div span {
Expand Down
3 changes: 0 additions & 3 deletions template/app/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ export default {
darkMode: "class",
theme: {
extend: {
fontFamily: {
satoshi: ["Satoshi", "system-ui", "sans-serif"],
},
colors: {
current: "currentColor",
transparent: "transparent",
Expand Down