Skip to content

Commit 99d43e2

Browse files
authored
Merge pull request #704 from pcwadarong/main
Theme Picker UI Update
2 parents ada80e3 + 04eab12 commit 99d43e2

File tree

9 files changed

+51
-92
lines changed

9 files changed

+51
-92
lines changed

packages/view/src/components/ThemeSelector/ThemeSelector.scss

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@
99

1010
.selector__container {
1111
position: absolute;
12-
top: 30px;
12+
top: 2.5rem;
1313
left: 0;
14-
padding: 24px;
15-
background-color: var(--color-darkgray);
16-
border-radius: 5px 40px 40px 40px;
14+
padding: 20px;
15+
background-color: var(--color-dark-gray);
16+
border-radius: 0.3rem 1.5rem 1.5rem 1.5rem;
1717
z-index: 10;
1818

1919
display: flex;
2020
flex-direction: column;
21-
gap: 12px;
21+
gap: 10px;
2222

2323
> div {
2424
display: flex;
2525
justify-content: space-between;
26-
gap: 4px;
26+
gap: 2px;
2727
&:nth-child(1) {
2828
font-size: $font-size-title;
2929
font-weight: $font-weight-semibold;
@@ -39,14 +39,15 @@
3939
flex-direction: column;
4040
align-items: center;
4141
justify-items: center;
42-
gap: 24px;
42+
gap: 1rem;
4343
padding: 10px;
4444
box-sizing: border-box;
4545

46+
4647
&:hover,
4748
&--selected {
4849
@extend .theme-icon;
49-
background-color: #363636;
50+
background-color: #4f5662;
5051
border-radius: 10px;
5152
cursor: pointer;
5253
}

packages/view/src/components/ThemeSelector/ThemeSelector.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,27 @@ const themes = [
88
title: "Githru",
99
value: "githru",
1010
colors: {
11-
primary: "#f14f8c",
12-
secondary: "#8421c9",
13-
tertiary: "#ffcb7d",
11+
primary: "#e06091",
12+
secondary: "#8840bb",
13+
tertiary: "#ffd08a",
1414
},
1515
},
1616
{
1717
title: "Hacker Blue",
1818
value: "hacker-blue",
1919
colors: {
2020
primary: "#456cf7",
21-
secondary: "#0c216f",
21+
secondary: "#3f4c73",
2222
tertiary: "#6c60f0",
2323
},
2424
},
2525
{
2626
title: "Aqua",
2727
value: "aqua",
2828
colors: {
29-
primary: "#25d4bf",
29+
primary: "#51decd",
3030
secondary: "#0687a3",
31-
tertiary: "#35ffff",
31+
tertiary: "#a7ffff",
3232
},
3333
},
3434
{
@@ -37,17 +37,17 @@ const themes = [
3737
colors: {
3838
primary: "#ffcccb",
3939
secondary: "#feffd1",
40-
tertiary: "#8979ca",
40+
tertiary: "#a39aeb",
4141
},
4242
},
4343

4444
{
4545
title: "Mono",
4646
value: "mono",
4747
colors: {
48-
primary: "#5f6f86",
48+
primary: "#68788f",
4949
secondary: "#3a4776",
50-
tertiary: "#9499c3",
50+
tertiary: "#9aaed1",
5151
},
5252
},
5353
];

packages/view/src/components/VerticalClusterList/Summary/Summary.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@
9494

9595
a {
9696
text-decoration: none;
97-
color: var(--color-lightgray);
97+
color: var(--color-light-gray);
9898
&:visited {
99-
color: var(--color-lightgray);
99+
color: var(--color-light-gray);
100100
}
101101
&:hover {
102102
color: var(--color-primary);

packages/view/src/fake-assets/cluster-nodes.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1622,7 +1622,7 @@
16221622
"insertions": 40,
16231623
"deletions": 0
16241624
},
1625-
"packages/view/src/assets/styles/_pallete.scss": {
1625+
"packages/view/src/assets/styles/_pallette.scss": {
16261626
"insertions": 295,
16271627
"deletions": 0
16281628
},
@@ -1648,7 +1648,7 @@
16481648
}
16491649
}
16501650
},
1651-
"message": "Merge pull request #20 from jeonghye-choi/feat/styles/n/nfeat: add style pallete"
1651+
"message": "Merge pull request #20 from jeonghye-choi/feat/styles/n/nfeat: add style pallette"
16521652
},
16531653
"clusterId": 10
16541654
},
@@ -1882,13 +1882,13 @@
18821882
"insertions": 295,
18831883
"deletions": 0,
18841884
"files": {
1885-
"packages/view/src/styles/_pallete.scss": {
1885+
"packages/view/src/styles/_pallette.scss": {
18861886
"insertions": 295,
18871887
"deletions": 0
18881888
}
18891889
}
18901890
},
1891-
"message": "feat: add color palletes with levels"
1891+
"message": "feat: add color pallettes with levels"
18921892
},
18931893
"clusterId": 10
18941894
}
@@ -2047,7 +2047,7 @@
20472047
"insertions": 40,
20482048
"deletions": 0
20492049
},
2050-
"packages/view/src/assets/styles/_pallete.scss": {
2050+
"packages/view/src/assets/styles/_pallette.scss": {
20512051
"insertions": 295,
20522052
"deletions": 0
20532053
},
@@ -2493,7 +2493,7 @@
24932493
"insertions": 40,
24942494
"deletions": 0
24952495
},
2496-
"packages/view/src/assets/styles/_pallete.scss": {
2496+
"packages/view/src/assets/styles/_pallette.scss": {
24972497
"insertions": 295,
24982498
"deletions": 0
24992499
},

packages/view/src/styles/_colors.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "pallete";
1+
@import "pallette";
22

33
$color--dark: $white;
44
$color--light: $black;
Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,48 @@
11
:root {
2-
--color-black: #000000;
3-
--color-white: #ffffff;
4-
--color-lightgray: #bdbdbd;
5-
--color-darkgray: #3e3e3e;
2+
--color-black: #010b13;
3+
--color-white: #f8f8f8;
4+
--color-light-gray: #b4bac6;
5+
--color-medium-gray: #757880;
6+
--color-dark-gray: #363a41;
67
--color-text-white: #f8f8f8;
78
}
89

10+
html[custom-type="githru"] {
11+
--color-primary: #e06091;
12+
--color-secondary: #8840bb;
13+
--color-tertiary: #ffd08a;
14+
--color-success: #07bebe;
15+
--color-failed: #ee2479;
16+
}
17+
918
html[custom-type="hacker-blue"] {
1019
--color-primary: #456cf7;
11-
--color-secondary: #465070;
20+
--color-secondary: #3f4c73;
1221
--color-tertiary: #6c60f0;
1322
--color-success: #1fc7a9;
1423
--color-failed: #ee2479;
1524
}
1625

1726
html[custom-type="aqua"] {
18-
--color-primary: #25d4bf;
27+
--color-primary: #51decd;
1928
--color-secondary: #0687a3;
20-
--color-tertiary: #35ffff;
21-
--color-success: #0373b2;
29+
--color-tertiary: #a7ffff;
30+
--color-success: #008cde;
2231
--color-failed: #ee2479;
2332
}
2433

2534
html[custom-type="cotton-candy"] {
2635
--color-primary: #ffcccb;
2736
--color-secondary: #feffd1;
28-
--color-tertiary: #8979ca;
37+
--color-tertiary: #a39aeb;
2938
--color-success: #7ad5c4;
3039
--color-failed: #ff8bbc;
3140
}
3241

33-
html[custom-type="githru"] {
34-
--color-primary: #f14f8c;
35-
--color-secondary: #8421c9;
36-
--color-tertiary: #ffcb7d;
37-
--color-success: #07bebe;
38-
--color-failed: #ee2479;
39-
}
40-
4142
html[custom-type="mono"] {
42-
--color-primary: #5f6f86;
43+
--color-primary: #68788f;
4344
--color-secondary: #3a4776;
44-
--color-tertiary: #9499c3;
45-
--color-success: #42b8b8;
46-
--color-failed: #ee2479;
45+
--color-tertiary: #9aaed1;
46+
--color-success: #6cafaf;
47+
--color-failed: #aa4b72;
4748
}

packages/view/src/styles/_pallete.scss renamed to packages/view/src/styles/_pallette.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//pallete from Bootstrap
1+
//pallette from Bootstrap
22
// red
33
$red-50: #ffebee;
44
$red-100: #ffcdd2;

packages/view/src/styles/_theme.scss

Lines changed: 0 additions & 42 deletions
This file was deleted.

packages/view/src/styles/app.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
@import "customTheme";
22
@import "colors";
33
@import "font";
4-
@import "pallete";
4+
@import "pallette";
55
@import "reset";
6-
@import "theme";
76
@import "utils";

0 commit comments

Comments
 (0)