Skip to content

Commit 0d23d30

Browse files
luannguyenQVluannguyenQV
authored
Merge pull request #140 from CodeForStartup/feat/upgrade-theme
feat: update theme
2 parents 88729b4 + 787fc66 commit 0d23d30

File tree

4 files changed

+46
-319
lines changed

4 files changed

+46
-319
lines changed

‎apps/web/app/[lang]/globals.css‎

Lines changed: 38 additions & 151 deletions
Original file line numberDiff line numberDiff line change
@@ -5,193 +5,80 @@
55
@layer base {
66
:root {
77
--background: 0 0% 100%;
8-
--foreground: 222.2 84% 4.9%;
8+
--foreground: 222.2 47.4% 11.2%;
99

10-
--card: 0 0% 100%;
11-
--card-foreground: 222.2 84% 4.9%;
10+
--muted: 210 40% 96.1%;
11+
--muted-foreground: 215.4 16.3% 46.9%;
1212

1313
--popover: 0 0% 100%;
14-
--popover-foreground: 222.2 84% 4.9%;
14+
--popover-foreground: 222.2 47.4% 11.2%;
15+
16+
--border: 214.3 31.8% 91.4%;
17+
--input: 214.3 31.8% 91.4%;
18+
19+
--card: 0 0% 100%;
20+
--card-foreground: 222.2 47.4% 11.2%;
1521

1622
--primary: 222.2 47.4% 11.2%;
1723
--primary-foreground: 210 40% 98%;
1824

1925
--secondary: 210 40% 96.1%;
2026
--secondary-foreground: 222.2 47.4% 11.2%;
2127

22-
--muted: 210 40% 96.1%;
23-
--muted-foreground: 215.4 16.3% 46.9%;
24-
2528
--accent: 210 40% 96.1%;
2629
--accent-foreground: 222.2 47.4% 11.2%;
2730

28-
--destructive: 0 84.2% 60.2%;
31+
--destructive: 0 100% 50%;
2932
--destructive-foreground: 210 40% 98%;
3033

31-
--border: 214.3 31.8% 91.4%;
32-
--input: 214.3 31.8% 91.4%;
33-
--ring: 222.2 84% 4.9%;
34+
--ring: 215 20.2% 65.1%;
3435

3536
--radius: 0.5rem;
3637
}
3738

3839
.dark {
39-
--background: 222.2 84% 4.9%;
40-
--foreground: 210 40% 98%;
40+
--background: 224 71% 4%;
41+
--foreground: 213 31% 91%;
4142

42-
--card: 222.2 84% 4.9%;
43-
--card-foreground: 210 40% 98%;
43+
--muted: 223 47% 11%;
44+
--muted-foreground: 215.4 16.3% 56.9%;
4445

45-
--popover: 222.2 84% 4.9%;
46-
--popover-foreground: 210 40% 98%;
46+
--accent: 216 34% 17%;
47+
--accent-foreground: 210 40% 98%;
4748

48-
--primary: 210 40% 98%;
49-
--primary-foreground: 222.2 47.4% 11.2%;
49+
--popover: 224 71% 4%;
50+
--popover-foreground: 215 20.2% 65.1%;
5051

51-
--secondary: 217.2 32.6% 17.5%;
52-
--secondary-foreground: 210 40% 98%;
52+
--border: 216 34% 17%;
53+
--input: 216 34% 17%;
5354

54-
--muted: 217.2 32.6% 17.5%;
55-
--muted-foreground: 215 20.2% 65.1%;
55+
--card: 224 71% 4%;
56+
--card-foreground: 213 31% 91%;
5657

57-
--accent: 217.2 32.6% 17.5%;
58-
--accent-foreground: 210 40% 98%;
58+
--primary: 210 40% 98%;
59+
--primary-foreground: 222.2 47.4% 1.2%;
5960

60-
--destructive: 0 62.8% 30.6%;
61+
--secondary: 222.2 47.4% 11.2%;
62+
--secondary-foreground: 210 40% 98%;
63+
64+
--destructive: 0 63% 31%;
6165
--destructive-foreground: 210 40% 98%;
6266

63-
--border: 217.2 32.6% 17.5%;
64-
--input: 217.2 32.6% 17.5%;
65-
--ring: 212.7 26.8% 83.9%;
67+
--ring: 216 34% 17%;
68+
69+
--radius: 0.5rem;
6670
}
6771
}
6872

6973
@layer base {
7074
* {
7175
@apply border-border;
7276
}
73-
body {
74-
@apply min-h-screen bg-background font-sans text-foreground antialiased;
75-
}
76-
77-
h1,
78-
h2,
79-
h3,
80-
h4,
81-
h5,
82-
h6 {
83-
@apply mb-4 font-bold;
84-
}
8577

86-
p {
87-
@apply mb-2;
88-
}
89-
90-
code {
91-
background-color: #cecece;
92-
border-radius: 0.25em;
93-
box-decoration-break: clone;
94-
color: #616161;
95-
font-size: 0.9rem;
96-
padding: 0.25em;
97-
}
98-
99-
pre {
100-
background: #0f111a;
101-
border-radius: 0.5rem;
102-
color: #fff;
103-
font-family: "JetBrainsMono", monospace;
104-
padding: 0.75rem 1rem;
105-
106-
code {
107-
background: none;
108-
color: inherit;
109-
font-size: 0.8rem;
110-
padding: 0;
111-
}
112-
113-
.hljs-comment,
114-
.hljs-quote {
115-
color: #616161;
116-
}
117-
118-
.hljs-variable,
119-
.hljs-template-variable,
120-
.hljs-attribute,
121-
.hljs-tag,
122-
.hljs-name,
123-
.hljs-regexp,
124-
.hljs-link,
125-
.hljs-name,
126-
.hljs-selector-id,
127-
.hljs-selector-class {
128-
color: #f98181;
129-
}
130-
131-
.hljs-number,
132-
.hljs-meta,
133-
.hljs-built_in,
134-
.hljs-builtin-name,
135-
.hljs-literal,
136-
.hljs-type,
137-
.hljs-params {
138-
color: #fbbc88;
139-
}
140-
141-
.hljs-string,
142-
.hljs-symbol,
143-
.hljs-bullet {
144-
color: #b9f18d;
145-
}
146-
147-
.hljs-title,
148-
.hljs-section {
149-
color: #faf594;
150-
}
151-
152-
.hljs-keyword,
153-
.hljs-selector-tag {
154-
color: #70cff8;
155-
}
156-
157-
.hljs-emphasis {
158-
font-style: italic;
159-
}
160-
161-
.hljs-strong {
162-
font-weight: 700;
163-
}
78+
body {
79+
@apply bg-background text-foreground;
80+
font-feature-settings:
81+
"rlig" 1,
82+
"calt" 1;
16483
}
16584
}
166-
167-
/* editorjs */
168-
.ce-block__content,
169-
.ce-toolbar__content {
170-
max-width: unset;
171-
margin-left: 70px;
172-
margin-right: 70px;
173-
}
174-
175-
h1.ce-header {
176-
@apply scroll-m-20 text-4xl font-extrabold tracking-tight lg:text-5xl;
177-
}
178-
179-
h2.ce-header {
180-
@apply scroll-m-20 text-3xl font-semibold tracking-tight first:mt-0;
181-
}
182-
183-
h3.ce-header {
184-
@apply scroll-m-20 text-2xl font-semibold tracking-tight;
185-
}
186-
187-
h4.ce-header {
188-
@apply scroll-m-20 text-xl font-semibold tracking-tight;
189-
}
190-
191-
h5.ce-header {
192-
@apply scroll-m-20 text-lg font-semibold tracking-tight;
193-
}
194-
195-
h6.ce-header {
196-
@apply scroll-m-20 text-base font-semibold tracking-tight;
197-
}

‎apps/web/app/[lang]/layout.tsx‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
import "./globals.css"
22
import "ui/dist/index.css"
3-
4-
import AuthProvider from "providers/authProvider"
5-
import { ToastContainer } from "react-toastify"
6-
7-
import Nav from "@/molecules/nav"
8-
93
import "react-toastify/dist/ReactToastify.css"
104
import "remixicon/fonts/remixicon.css"
115

126
import { NextIntlClientProvider, useMessages } from "next-intl"
7+
import AuthProvider from "providers/authProvider"
8+
import { ToastContainer } from "react-toastify"
139

1410
import Footer from "@/molecules/footer"
11+
import Nav from "@/molecules/nav"
1512
import { Providers } from "@/providers"
1613

1714
export const metadata = {

‎packages/ui/app/globals.css‎

Lines changed: 1 addition & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -7,90 +7,6 @@
77
@apply border-border;
88
}
99
body {
10-
@apply bg-background text-foreground min-h-screen font-sans antialiased;
11-
}
12-
13-
h1, h2, h3, h4, h5, h6 {
14-
@apply font-bold mb-4;
15-
}
16-
17-
p {
18-
@apply mb-2;
19-
}
20-
21-
code {
22-
background-color: #cecece;
23-
border-radius: 0.25em;
24-
box-decoration-break: clone;
25-
color: #616161;
26-
font-size: 0.9rem;
27-
padding: 0.25em;
28-
}
29-
30-
pre {
31-
background: #0f111a;
32-
border-radius: 0.5rem;
33-
color: #fff;
34-
font-family: "JetBrainsMono", monospace;
35-
padding: 0.75rem 1rem;
36-
37-
code {
38-
background: none;
39-
color: inherit;
40-
font-size: 0.8rem;
41-
padding: 0;
42-
}
43-
44-
.hljs-comment,
45-
.hljs-quote {
46-
color: #616161;
47-
}
48-
49-
.hljs-variable,
50-
.hljs-template-variable,
51-
.hljs-attribute,
52-
.hljs-tag,
53-
.hljs-name,
54-
.hljs-regexp,
55-
.hljs-link,
56-
.hljs-name,
57-
.hljs-selector-id,
58-
.hljs-selector-class {
59-
color: #f98181;
60-
}
61-
62-
.hljs-number,
63-
.hljs-meta,
64-
.hljs-built_in,
65-
.hljs-builtin-name,
66-
.hljs-literal,
67-
.hljs-type,
68-
.hljs-params {
69-
color: #fbbc88;
70-
}
71-
72-
.hljs-string,
73-
.hljs-symbol,
74-
.hljs-bullet {
75-
color: #b9f18d;
76-
}
77-
78-
.hljs-title,
79-
.hljs-section {
80-
color: #faf594;
81-
}
82-
83-
.hljs-keyword,
84-
.hljs-selector-tag {
85-
color: #70cff8;
86-
}
87-
88-
.hljs-emphasis {
89-
font-style: italic;
90-
}
91-
92-
.hljs-strong {
93-
font-weight: 700;
94-
}
10+
@apply min-h-screen bg-background font-sans text-foreground antialiased;
9511
}
9612
}

0 commit comments

Comments
 (0)