Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Theme Picker UI Update #704

Merged
merged 4 commits into from
Sep 6, 2024
Merged

Theme Picker UI Update #704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
407c336
theme picker 수정
pcwadarong Sep 4, 2024
16a3568
Merge branch 'main' of github.com:pcwadarong/githru-vscode-ext
pcwadarong Sep 5, 2024
4cd0587
컬러 살짝 수정
pcwadarong Sep 5, 2024
04eab12
Merge branch 'githru:main' into main
pcwadarong Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions packages/view/src/components/ThemeSelector/ThemeSelector.scss
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(궁금) 단위를 rem이랑 px 섞어서 쓰신 이유가 있으신가요??😮

Copy link
Member Author

@pcwadarong pcwadarong Sep 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

일단 딱딱 떨어지는 단위만 rem으로 쓰긴 했습니다..ㅎㅎ 그런데 이 부분에 대해 뷰팀 전체 회의가 필요할 것 같습니닷...저희가 추후 고치더라도 처음 개발할 때부터 rem이면 더 좋겠네요!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(궁금) rem으로 하면 뭐가 더 좋아지나요?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://yozm.wishket.com/magazine/detail/1410/
https://code.visualstudio.com/docs/editor/accessibility

크롬 브라우저를 예시로 들자면 사용자가 브라우저의 폰트 크기를 임의로 조정할 경우 따라서 조정되는 기능이 있습니다! vscode에서도 window.zoomlevel로 에디터가 아닌 프로그램 자체의 확대 축소 기능을 제공하는 걸로 알고 있는데요, 그런데 이게 확장 프로그램이 rem을 쓰냐 px을 쓰냐에 따라 줌인아웃에 영향을 주는지는 확신할 수는 없네요..! ㅎㅎ

Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@

.selector__container {
position: absolute;
top: 30px;
top: 2.5rem;
left: 0;
padding: 24px;
background-color: var(--color-darkgray);
border-radius: 5px 40px 40px 40px;
padding: 20px;
background-color: var(--color-dark-gray);
border-radius: 0.3rem 1.5rem 1.5rem 1.5rem;
z-index: 10;

display: flex;
flex-direction: column;
gap: 12px;
gap: 10px;

> div {
display: flex;
justify-content: space-between;
gap: 4px;
gap: 2px;
&:nth-child(1) {
font-size: $font-size-title;
font-weight: $font-weight-semibold;
Expand All @@ -39,14 +39,15 @@
flex-direction: column;
align-items: center;
justify-items: center;
gap: 24px;
gap: 1rem;
padding: 10px;
box-sizing: border-box;


&:hover,
&--selected {
@extend .theme-icon;
background-color: #363636;
background-color: #4f5662;
border-radius: 10px;
cursor: pointer;
}
Expand Down
18 changes: 9 additions & 9 deletions packages/view/src/components/ThemeSelector/ThemeSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,27 @@ const themes = [
title: "Githru",
value: "githru",
colors: {
primary: "#f14f8c",
secondary: "#8421c9",
tertiary: "#ffcb7d",
primary: "#e06091",
secondary: "#8840bb",
tertiary: "#ffd08a",
},
},
{
title: "Hacker Blue",
value: "hacker-blue",
colors: {
primary: "#456cf7",
secondary: "#0c216f",
secondary: "#3f4c73",
tertiary: "#6c60f0",
},
},
{
title: "Aqua",
value: "aqua",
colors: {
primary: "#25d4bf",
primary: "#51decd",
secondary: "#0687a3",
tertiary: "#35ffff",
tertiary: "#a7ffff",
},
},
{
Expand All @@ -37,17 +37,17 @@ const themes = [
colors: {
primary: "#ffcccb",
secondary: "#feffd1",
tertiary: "#8979ca",
tertiary: "#a39aeb",
},
},

{
title: "Mono",
value: "mono",
colors: {
primary: "#5f6f86",
primary: "#68788f",
secondary: "#3a4776",
tertiary: "#9499c3",
tertiary: "#9aaed1",
},
},
];
Expand Down
4 changes: 2 additions & 2 deletions packages/view/src/components/VerticalClusterList/Summary/Summary.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@

a {
text-decoration: none;
color: var(--color-lightgray);
color: var(--color-light-gray);
&:visited {
color: var(--color-lightgray);
color: var(--color-light-gray);
}
&:hover {
color: var(--color-primary);
Expand Down
12 changes: 6 additions & 6 deletions packages/view/src/fake-assets/cluster-nodes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1622,7 +1622,7 @@
"insertions": 40,
"deletions": 0
},
"packages/view/src/assets/styles/_pallete.scss": {
"packages/view/src/assets/styles/_pallette.scss": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

세심한 typo 👍👍👍👍👍👍👍👍

"insertions": 295,
"deletions": 0
},
Expand All @@ -1648,7 +1648,7 @@
}
}
},
"message": "Merge pull request #20 from jeonghye-choi/feat/styles/n/nfeat: add style pallete"
"message": "Merge pull request #20 from jeonghye-choi/feat/styles/n/nfeat: add style pallette"
},
"clusterId": 10
},
Expand Down Expand Up @@ -1882,13 +1882,13 @@
"insertions": 295,
"deletions": 0,
"files": {
"packages/view/src/styles/_pallete.scss": {
"packages/view/src/styles/_pallette.scss": {
"insertions": 295,
"deletions": 0
}
}
},
"message": "feat: add color palletes with levels"
"message": "feat: add color pallettes with levels"
},
"clusterId": 10
}
Expand Down Expand Up @@ -2047,7 +2047,7 @@
"insertions": 40,
"deletions": 0
},
"packages/view/src/assets/styles/_pallete.scss": {
"packages/view/src/assets/styles/_pallette.scss": {
"insertions": 295,
"deletions": 0
},
Expand Down Expand Up @@ -2493,7 +2493,7 @@
"insertions": 40,
"deletions": 0
},
"packages/view/src/assets/styles/_pallete.scss": {
"packages/view/src/assets/styles/_pallette.scss": {
"insertions": 295,
"deletions": 0
},
Expand Down
2 changes: 1 addition & 1 deletion packages/view/src/styles/_colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "pallete";
@import "pallette";

$color--dark: $white;
$color--light: $black;
Expand Down
43 changes: 22 additions & 21 deletions packages/view/src/styles/_customTheme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,48 @@
:root {
--color-black: #000000;
--color-white: #ffffff;
--color-lightgray: #bdbdbd;
--color-darkgray: #3e3e3e;
--color-black: #010b13;
--color-white: #f8f8f8;
--color-light-gray: #b4bac6;
--color-medium-gray: #757880;
--color-dark-gray: #363a41;
--color-text-white: #f8f8f8;
}

html[custom-type="githru"] {
--color-primary: #e06091;
--color-secondary: #8840bb;
--color-tertiary: #ffd08a;
--color-success: #07bebe;
--color-failed: #ee2479;
}

html[custom-type="hacker-blue"] {
--color-primary: #456cf7;
--color-secondary: #465070;
--color-secondary: #3f4c73;
--color-tertiary: #6c60f0;
--color-success: #1fc7a9;
--color-failed: #ee2479;
}

html[custom-type="aqua"] {
--color-primary: #25d4bf;
--color-primary: #51decd;
--color-secondary: #0687a3;
--color-tertiary: #35ffff;
--color-success: #0373b2;
--color-tertiary: #a7ffff;
--color-success: #008cde;
--color-failed: #ee2479;
}

html[custom-type="cotton-candy"] {
--color-primary: #ffcccb;
--color-secondary: #feffd1;
--color-tertiary: #8979ca;
--color-tertiary: #a39aeb;
--color-success: #7ad5c4;
--color-failed: #ff8bbc;
}

html[custom-type="githru"] {
--color-primary: #f14f8c;
--color-secondary: #8421c9;
--color-tertiary: #ffcb7d;
--color-success: #07bebe;
--color-failed: #ee2479;
}

html[custom-type="mono"] {
--color-primary: #5f6f86;
--color-primary: #68788f;
--color-secondary: #3a4776;
--color-tertiary: #9499c3;
--color-success: #42b8b8;
--color-failed: #ee2479;
--color-tertiary: #9aaed1;
--color-success: #6cafaf;
--color-failed: #aa4b72;
}
2 changes: 1 addition & 1 deletion packages/view/src/styles/_pallete.scss → packages/view/src/styles/_pallette.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//pallete from Bootstrap
//pallette from Bootstrap
// red
$red-50: #ffebee;
$red-100: #ffcdd2;
Expand Down
42 changes: 0 additions & 42 deletions packages/view/src/styles/_theme.scss
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions packages/view/src/styles/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import "customTheme";
@import "colors";
@import "font";
@import "pallete";
@import "pallette";
@import "reset";
@import "theme";
@import "utils";
Loading