PROD.2025/DataRush
1
0
Fork 0
mirror of https://gitlab.com/megazordpobeda/DataRush.git synced 2026-05-23 14:27:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: merge conflicts

Browse Source
This commit is contained in:
rngsurrounded
2025-03-01 19:34:35 +09:00
parent 813db84d92 239b6fe7f1
commit 70f257803a
44 changed files with 908 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/frontend/src/styles/globals.css
+5 -5
View File
@@ -5,14 +5,14 @@
@custom-variant dark (&:is(.dark *));
:root {
--background: oklch(1 0 0);
--background: oklch(0.97 0 0);
--foreground: oklch(0.145 0 0);
--card: oklch(1 0 0);
--card-foreground: oklch(0.145 0 0);
--popover: oklch(1 0 0);
--popover-foreground: oklch(0.145 0 0);
--primary: oklch(0.205 0 0);
--primary-foreground: oklch(0.985 0 0);
--primary: oklch(89.97% 0.1763 97.07);
--primary-foreground: oklch(82.87% 0.1701 94.8);
--secondary: oklch(0.97 0 0);
--secondary-foreground: oklch(0.205 0 0);
--muted: oklch(0.97 0 0);
@@ -53,7 +53,7 @@
}
@theme inline {
--font-hse-sans: "HSE Sans", system-ui, sans-serif
--font-hse-sans: "HSE Sans", system-ui, sans-serif;
}
.dark {
--background: oklch(0.145 0 0);
@@ -144,7 +144,7 @@
@layer base {
* {
@apply border-border outline-ring/50;
@apply border-border outline-ring/50 font-hse-sans;
}
body {
@apply bg-background text-foreground;