Skip to content

Commit ba2323a

Browse files
Merge pull request #23 from Eric-Zhang-Developer/feature/UI-theming
Feature/UI theming
2 parents 8718369 + d4fc62e commit ba2323a

File tree

14 files changed

+176
-42
lines changed

14 files changed

+176
-42
lines changed

.prettierrc.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"plugins": ["prettier-plugin-tailwindcss"]
3+
}

package-lock.json

Lines changed: 97 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
"eslint-config-next": "15.2.3",
3232
"jest": "^30.0.3",
3333
"jest-environment-jsdom": "^30.0.2",
34+
"prettier": "^3.6.2",
35+
"prettier-plugin-tailwindcss": "^0.6.13",
3436
"tailwindcss": "^4",
3537
"typescript": "^5"
3638
}

public/background.webp

8.14 KB
Loading

public/file.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

public/globe.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

public/next.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

public/vercel.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

public/window.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/app/globals.css

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,31 @@
11
@import "tailwindcss";
22

33
:root {
4-
--background: #ffffff;
4+
/* --background: #FFF6EB;*/
5+
--background: #FFFFFF
56
--foreground: #171717;
67
}
78

9+
@theme inline{
10+
--color-primary: #333333;
11+
--color-secondary: #525252;
12+
--color-accent: #FF6C47;
13+
--color-light-accent: #FFDED6;
14+
15+
--font-main: var(--font-lora);
16+
--font-text: var(--font-inter);
17+
}
818

919

1020
body {
1121
background: var(--background);
1222
color: var(--foreground);
1323
font-family: Arial, Helvetica, sans-serif;
24+
background-image: url('/background.webp');
25+
background-blend-mode: multiply;
26+
background-repeat: no-repeat;
27+
background-size: cover;
28+
background-position: center center;
29+
background-attachment: fixed;
1430
}
31+

0 commit comments

Comments
 (0)