Skip to content

Commit 4d43e40

Browse files
lee-tolee-to
authored
Merge pull request #1819 from second1996/ui/components
2 parents 8712046 + 18aeef5 commit 4d43e40

File tree

19 files changed

+392
-391
lines changed

19 files changed

+392
-391
lines changed

‎src/ColorManager/src/Palettes/DefaultPalette.php‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -11,47 +11,47 @@ final class DefaultPalette implements PaletteContract
1111
public function getColors(): array
1212
{
1313
return [
14-
'primary' => '0.627 0.265 303.9',
14+
'primary' => '0 0 0',
1515
'primary-text' => '1 0 0',
16-
'secondary' => '0.746 0.16 232.661',
17-
'secondary-text' => '1 0 0',
18-
'body' => '0.98 0.0035 67.78',
16+
'secondary' => '0.92 0 0',
17+
'secondary-text' => '0 0 0',
18+
'body' => '1 0 0',
1919
'theme' => [
20-
'body' => '0 0 0',
20+
'body' => '0.21 0.006 285.885',
2121
'stroke' => '0 0 0 / 10%',
2222
'default' => '1 0 0',
23-
50 => '0.99 0 0',
24-
100 => '0.98 0 0',
25-
200 => '0.97 0 0',
26-
300 => '0.96 0 0',
27-
400 => '0.95 0 0',
28-
500 => '0.94 0 0',
29-
600 => '0.93 0 0',
30-
700 => '0.92 0 0',
31-
800 => '0.91 0 0',
32-
900 => '0.90 0 0',
23+
50 => '0.985 0 0',
24+
100 => '0.97 0 0',
25+
200 => '0.955 0 0',
26+
300 => '0.94 0 0',
27+
400 => '0.925 0 0',
28+
500 => '0.91 0 0',
29+
600 => '0.895 0 0',
30+
700 => '0.88 0 0',
31+
800 => '0.865 0 0',
32+
900 => '0.85 0 0',
3333
],
34-
'success-bg' => '0.639 0.218 142.495',
35-
'success-text' => '0.4676 0.1549 142.495',
36-
'warning-bg' => '0.8088 0.170358 75.3501',
37-
'warning-text' => '0.5 0.1031 76.1',
38-
'error-bg' => '0.589 0.214 26.855',
39-
'error-text' => '0.3706 0.145 26.855',
40-
'info-bg' => '0.601 0.219 257.63',
41-
'info-text' => '0.3471 0.1204 257.63',
34+
'success-bg' => '0.64 0.22 142.49',
35+
'success-text' => '0.46 0.16 142.49',
36+
'warning-bg' => '0.75 0.17 75.35',
37+
'warning-text' => '0.5 0.10 76.10',
38+
'error-bg' => '0.58 0.21 26.855',
39+
'error-text' => '0.37 0.145 26.85',
40+
'info-bg' => '0.60 0.219 257.63',
41+
'info-text' => '0.35 0.12 257.63',
4242
];
4343
}
4444

4545
public function getDarkColors(): array
4646
{
4747
return [
48-
'primary' => '0.606 0.25 292.717',
49-
'primary-text' => '1 0 0',
50-
'secondary' => '0.746 0.16 232.661',
51-
'secondary-text' => '1 0 0',
48+
'primary' => '1 0 0',
49+
'primary-text' => '0 0 0',
50+
'secondary' => '0.8 0 0',
51+
'secondary-text' => '0 0 0',
5252
'body' => '0.2 0.0168 274.32',
5353
'theme' => [
54-
'body' => '1 0 0',
54+
'body' => '0.87 0.01 258.34',
5555
'stroke' => '1 0 0 / 10%',
5656
'default' => '0.24 0.0168 274.32',
5757
50 => '0.255 0.017 274.32',
@@ -65,14 +65,14 @@ public function getDarkColors(): array
6565
800 => '0.375 0.024 274.32',
6666
900 => '0.39 0.025 274.32',
6767
],
68-
'success-bg' => '0.639 0.218 142.495',
69-
'success-text' => '0.9308 0.1279 144.46',
70-
'warning-bg' => '0.898 0.177 96.726',
71-
'warning-text' => '0.9865 0.0716 107.64',
68+
'success-bg' => '0.64 0.22 142.495',
69+
'success-text' => '0.93 0.12 144.46',
70+
'warning-bg' => '0.9 0.22 92.72',
71+
'warning-text' => '0.99 0.072 107.64',
7272
'error-bg' => '0.589 0.214 26.855',
73-
'error-text' => '0.8751 0.0665 18.51',
74-
'info-bg' => '0.601 0.219 257.63',
75-
'info-text' => '0.877 0.065 244.38',
73+
'error-text' => '0.87 0.07 18.51',
74+
'info-bg' => '0.6 0.22 257.63',
75+
'info-text' => '0.88 0.065 244.38',
7676
];
7777
}
7878
}

‎src/UI/resources/css/base/colors.css‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
@theme inline {
2-
--color-body: oklch(var(--body, 0.96 0 0));
2+
--color-body: oklch(var(--body, 1 0 0));
33

4-
--color-primary: oklch(var(--primary, 0.627 0.265 303.9));
4+
--color-primary: oklch(var(--primary, 0 0 0));
55
--color-primary-text: oklch(var(--primary-text, 1 0 0));
6-
--color-secondary: oklch(var(--secondary, 0.746 0.16 232.661));
7-
--color-secondary-text: oklch(var(--secondary-text, 1 0 0));
6+
--color-secondary: oklch(var(--secondary, 0.92 0 0));
7+
--color-secondary-text: oklch(var(--secondary-text, 0 0 0));
88

9-
--color-theme-stroke: oklch(var(--theme-stroke, 1 0 0 / 10%));
10-
--color-theme-body: oklch(var(--theme-body, 0 0 0));
9+
--color-theme-stroke: oklch(var(--theme-stroke, 0 0 0 / 10%));
10+
--color-theme-body: oklch(var(--theme-body, 0.21 0.006 285.885));
1111

1212
--color-theme: oklch(var(--theme-default, 1 0 0));
13-
--color-theme-50: oklch(var(--theme-50, 0.99 0 0));
14-
--color-theme-100: oklch(var(--theme-100, 0.98 0 0));
15-
--color-theme-200: oklch(var(--theme-200, 0.97 0 0));
16-
--color-theme-300: oklch(var(--theme-300, 0.96 0 0));
17-
--color-theme-400: oklch(var(--theme-400, 0.95 0 0));
18-
--color-theme-500: oklch(var(--theme-500, 0.94 0 0));
19-
--color-theme-600: oklch(var(--theme-600, 0.93 0 0));
20-
--color-theme-700: oklch(var(--theme-700, 0.92 0 0));
21-
--color-theme-800: oklch(var(--theme-800, 0.91 0 0));
22-
--color-theme-900: oklch(var(--theme-900, 0.9 0 0));
23-
24-
--color-success: oklch(var(--success-bg, 0.639 0.218 142.495));
25-
--color-success-text: oklch(var(--success-text, 0.4676 0.1549 142.495));
26-
--color-warning: oklch(var(--warning-bg, 0.8088 0.170358 75.3501));
27-
--color-warning-text: oklch(var(--warning-text, 0.5 0.1031 76.1));
28-
--color-error: oklch(var(--error-bg, 0.589 0.214 26.855));
29-
--color-error-text: oklch(var(--error-text, 0.3706 0.145 26.855));
30-
--color-info: oklch(var(--info-bg, 0.601 0.219 257.63));
31-
--color-info-text: oklch(var(--info-text, 0.3471 0.1204 257.63));
13+
--color-theme-50: oklch(var(--theme-50, 0.985 0 0));
14+
--color-theme-100: oklch(var(--theme-100, 0.97 0 0));
15+
--color-theme-200: oklch(var(--theme-200, 0.955 0 0));
16+
--color-theme-300: oklch(var(--theme-300, 0.94 0 0));
17+
--color-theme-400: oklch(var(--theme-400, 0.925 0 0));
18+
--color-theme-500: oklch(var(--theme-500, 0.91 0 0));
19+
--color-theme-600: oklch(var(--theme-600, 0.895 0 0));
20+
--color-theme-700: oklch(var(--theme-700, 0.88 0 0));
21+
--color-theme-800: oklch(var(--theme-800, 0.865 0 0));
22+
--color-theme-900: oklch(var(--theme-900, 0.85 0 0));
23+
24+
--color-success: oklch(var(--success-bg, 0.64 0.22 142.49));
25+
--color-success-text: oklch(var(--success-text, 0.46 0.16 142.49));
26+
--color-warning: oklch(var(--warning-bg, 0.75 0.17 75.35));
27+
--color-warning-text: oklch(var(--warning-text, 0.5 0.1 76.1));
28+
--color-error: oklch(var(--error-bg, 0.58 0.21 26.855));
29+
--color-error-text: oklch(var(--error-text, 0.37 0.145 26.85));
30+
--color-info: oklch(var(--info-bg, 0.6 0.219 257.63));
31+
--color-info-text: oklch(var(--info-text, 0.35 0.12 257.63));
3232

3333
--gradient-start: var(--color-primary);
3434
--gradient-end: var(--color-primary);
@@ -41,13 +41,13 @@
4141
@variant dark {
4242
--color-body: oklch(var(--body, 0.2 0.0168 274.32));
4343

44-
--color-primary: oklch(var(--primary, 0.606 0.25 292.717));
45-
--color-primary-text: oklch(var(--primary-text, 1 0 0));
46-
--color-secondary: oklch(var(--secondary, 0.746 0.16 232.661));
47-
--color-secondary-text: oklch(var(--secondary-text, 1 0 0));
44+
--color-primary: oklch(var(--primary, 1 0 0));
45+
--color-primary-text: oklch(var(--primary-text, 0 0 0));
46+
--color-secondary: oklch(var(--secondary, 0.8 0 0));
47+
--color-secondary-text: oklch(var(--secondary-text, 0 0 0));
4848

49-
--color-theme-stroke: oklch(var(--theme-stroke, 0 0 0 / 10%));
50-
--color-theme-body: oklch(var(--theme-body, 1 0 0));
49+
--color-theme-stroke: oklch(var(--theme-stroke, 1 0 0 / 10%));
50+
--color-theme-body: oklch(var(--theme-body, 0.87 0.01 258.34));
5151

5252
--color-theme: oklch(var(--theme-default, 0.24 0.0168 274.32));
5353
--color-theme-50: oklch(var(--theme-50, 0.255 0.017 274.32));
@@ -61,14 +61,14 @@
6161
--color-theme-800: oklch(var(--theme-800, 0.375 0.024 274.32));
6262
--color-theme-900: oklch(var(--theme-900, 0.39 0.025 274.32));
6363

64-
--color-success: oklch(var(--success-bg, 0.639 0.218 142.495));
65-
--color-success-text: oklch(var(--success-text, 0.9308 0.1279 144.46));
66-
--color-warning: oklch(var(--warning-bg, 0.898 0.177 96.726));
67-
--color-warning-text: oklch(var(--warning-text, 0.9865 0.0716 107.64));
64+
--color-success: oklch(var(--success-bg, 0.64 0.22 142.495));
65+
--color-success-text: oklch(var(--success-text, 0.93 0.12 144.46));
66+
--color-warning: oklch(var(--warning-bg, 0.9 0.22 92.72));
67+
--color-warning-text: oklch(var(--warning-text, 0.99 0.072 107.64));
6868
--color-error: oklch(var(--error-bg, 0.589 0.214 26.855));
69-
--color-error-text: oklch(var(--error-text, 0.8751 0.0665 18.51));
70-
--color-info: oklch(var(--info-bg, 0.601 0.219 257.63));
71-
--color-info-text: oklch(var(--info-text, 0.877 0.065 244.38));
69+
--color-error-text: oklch(var(--error-text, 0.87 0.07 18.51));
70+
--color-info: oklch(var(--info-bg, 0.6 0.22 257.63));
71+
--color-info-text: oklch(var(--info-text, 0.88 0.065 244.38));
7272
}
7373

7474
.text-purple {

‎src/UI/resources/css/base/common.css‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,28 +63,33 @@
6363
h1,
6464
.h1 {
6565
font-size: var(--text-2xl);
66+
font-weight: var(--font-weight-semibold);
6667
}
6768

6869
h2,
6970
.h2 {
7071
font-size: var(--text-xl);
72+
font-weight: var(--font-weight-semibold);
7173
}
7274

7375
h3,
7476
.h3 {
7577
font-size: var(--text-lg);
78+
font-weight: var(--font-weight-semibold);
7679
}
7780

7881
h4,
7982
.h4 {
8083
font-size: var(--text-md);
84+
font-weight: var(--font-weight-medium);
8185
}
8286

8387
h5,
8488
h6,
8589
.h5,
8690
.h6 {
8791
font-size: var(--text-base);
92+
font-weight: var(--font-weight-medium);
8893
}
8994

9095
.heading {
@@ -99,12 +104,24 @@
99104
.h3,
100105
.h4,
101106
div {
102-
@apply truncate font-medium;
107+
@apply truncate;
103108
}
104109
}
105110

106111
a {
107-
@apply hover:text-primary dark:hover:text-white;
112+
--ms-link-color: var(--ms-defaults-link-color, var(--color-theme-body));
113+
--ms-link-hover-color: var(--ms-defaults-link-color, var(--color-primary));
114+
115+
color: var(--ms-link-color);
116+
transition-property:
117+
background-color, border-color, color, text-decoration-color, box-shadow, opacity, fill,
118+
stroke;
119+
transition-duration: var(--default-transition-duration);
120+
transition-timing-function: var(--default-transition-timing-function);
121+
122+
@variant hover {
123+
color: var(--ms-link-hover-color);
124+
}
108125
}
109126

110127
.link {
@@ -120,7 +137,7 @@
120137
}
121138

122139
p + p {
123-
margin-top: --spacing(2);
140+
margin-top: var(--ms-defaults-paragraph-space-y, --spacing(2));
124141
}
125142

126143
b,

‎src/UI/resources/css/base/utilites.css‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -82,60 +82,6 @@
8282
@apply border-black/10 dark:border-white/10;
8383
}
8484

85-
/* Text utilities */
86-
87-
@utility text-xs {
88-
font-size: var(--text-xs);
89-
}
90-
91-
@utility text-sm {
92-
font-size: var(--text-sm);
93-
}
94-
95-
@utility text-base {
96-
font-size: var(--text-base);
97-
}
98-
99-
@utility text-md {
100-
font-size: var(--text-md);
101-
}
102-
103-
@utility text-lg {
104-
font-size: var(--text-lg);
105-
}
106-
107-
@utility text-xl {
108-
font-size: var(--text-xl);
109-
}
110-
111-
@utility text-2xl {
112-
font-size: var(--text-2xl);
113-
}
114-
115-
@utility text-3xl {
116-
font-size: var(--text-3xl);
117-
}
118-
119-
@utility text-4xl {
120-
font-size: var(--text-4xl);
121-
}
122-
123-
@utility text-5xl {
124-
font-size: var(--text-5xl);
125-
}
126-
127-
@utility text-6xl {
128-
font-size: var(--text-6xl);
129-
}
130-
131-
@utility text-7xl {
132-
font-size: var(--text-7xl);
133-
}
134-
135-
@utility text-8xl {
136-
font-size: var(--text-8xl);
137-
}
138-
13985
/* z-index */
14086
@utility z-dropdown {
14187
z-index: var(--z-dropdown);

0 commit comments

Comments
 (0)