Skip to content

Commit

Permalink
Merge pull request githru#710 from pcwadarong/main
Browse files Browse the repository at this point in the history
colors 관련 업데이트
  • Loading branch information
pcwadarong authored Sep 9, 2024
2 parents 3eab981 + b56264d commit b4d4b7b
Show file tree
Hide file tree
Showing 14 changed files with 80 additions and 418 deletions.
7 changes: 4 additions & 3 deletions packages/view/src/App.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
// FIXME
@import "styles/app";

:root {
--primary-color: #ff8272;
}

body {
background: #212121;
color: #fff;
background: $color-background;
color: $color-white;
}

.header-container {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@
font-weight: $font-weight-semibold;

.select-box {
background-color: #212121;
border: 1px solid var(--color-white);
color: var(--color-white);
border: 1px solid $color-white;
color: $color-white;
height: 30px;

& .MuiSvgIcon-root {
color: var(--color-white);
color: $color-white;
}

&.Mui-focused .MuiOutlinedInput-notchedOutline {
Expand Down
20 changes: 10 additions & 10 deletions packages/view/src/components/Detail/Detail.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
margin-right: 1rem;
flex-grow: 10;
height: 0;
border: 1px solid $white;
border: 1px solid $color-white;
}

.detail__summary {
Expand Down Expand Up @@ -56,10 +56,10 @@
width: 100%;
display: flex;
justify-content: space-between;
color: $gray-600;
color: $color-medium-gray;

.commit-detail {
color: $white;
color: $color-white;
display: flex;
justify-content: space-between;
align-items: center;
Expand All @@ -83,7 +83,7 @@
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
overflow: hidden;
color: $white;
color: $color-white;
margin: 0 4px 0 15px;

&:hover {
Expand All @@ -92,7 +92,7 @@
overflow: visible;
position: absolute;
z-index: 10;
background-color: lighten($gray-900, 5);
background-color: $color-dark-gray;
padding-bottom: 5px;
top: -7px;
}
Expand All @@ -115,9 +115,9 @@

a {
text-decoration: none;
color: var(--color-lightgray);
color: $color-light-gray;
&:visited {
color: var(--color-lightgray);
color: $color-light-gray;
}
&:hover {
color: var(--color-primary);
Expand All @@ -143,19 +143,19 @@
cursor: pointer;

&:hover {
color: $gray-300;
color: $color-light-gray;
}
}

.commit-id__tooltip {
display: none;
position: absolute;
background: $white;
background: $color-white;
padding: 8px 16px;
text-align: center;
font-size: $font-size-caption;
line-height: 1.5;
border-radius: 5px;
color: $gray-900;
color: $color-dark-gray;
transform: translateY(20%) translateX(-120%);
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
text-overflow: ellipsis;
justify-content: space-between;
margin: 5px;
background-color: $gray-300;
background-color: $color-light-gray;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@
& .select-box {
font-size: $font-size-caption;
background: transparent;
border: 1px solid $white;
border: 1px solid $color-white;
border-radius: 5px;
width: fit-content;
padding: 0 10px;
height: 25px;
color: $white;
color: $color-white;
outline: none;
text-align: center;

option {
background: $gray-900;
background: $color-dark-gray;
}
}
}
Expand All @@ -39,7 +39,7 @@
margin: 20px 40px 40px;

.axis {
color: $white;
color: $color-white;
font-weight: $font-weight-semibold;

&.x-axis {
Expand All @@ -50,7 +50,7 @@

&.x-axis {
.x-axis-label {
fill: $white;
fill: $color-white;
}
}
}
Expand All @@ -70,7 +70,7 @@
}

.name {
fill: $white;
fill: $color-white;
stroke: none;
font-size: $font-size-caption;
text-anchor: start;
Expand All @@ -83,13 +83,13 @@
.author-bar-chart__tooltip {
display: none;
position: absolute;
background: $white;
background: $color-white;
padding: 8px 16px;
text-align: center;
font-size: $font-size-caption;
line-height: 1.5;
border-radius: 5px;
color: $gray-900;
color: $color-dark-gray;

.selected {
color: var(--color-primary);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
padding: 2px;
border: solid 1px rgba(255, 255, 255, 0.22);
border-radius: 3px;
color: white;
color: $color-white;
background: rgba(255, 255, 255, 0.09);
font-weight: $font-weight-light;
font-size: $font-size-caption;
Expand All @@ -69,5 +69,5 @@
.temporal-filter__label {
font-size: $font-size-title;
font-weight: $font-weight-semibold;
fill: white;
fill: $color-white;
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
top: 2.5rem;
left: 0;
padding: 20px;
background-color: var(--color-dark-gray);
background-color: $color-dark-gray;
border-radius: 0.3rem 1.5rem 1.5rem 1.5rem;
z-index: 10;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
.sub-graph-tooltip {
position: absolute;
z-index: 10;
background: $white;
background: $color-white;
padding: 8px 16px;
font-size: $font-size-caption;
line-height: 1.5;
border-radius: 5px;
color: $gray-900;
color: $color-dark-gray;
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
border: none;
background-color: transparent;
cursor: pointer;
color: var(--color-text-white);
color: $color-white;
width: 100%;

&:hover {
border-radius: 40px;
background-color: lighten($gray-800, 5);
background-color: $color-dark-gray;
}
}
.cluster-summary__info-wrapper {
Expand All @@ -35,7 +35,7 @@

&.selected {
border-radius: 25px;
background-color: lighten($gray-900, 5);
background-color: $color-dark-gray;
}
}

Expand Down Expand Up @@ -94,9 +94,9 @@

a {
text-decoration: none;
color: var(--color-light-gray);
color: $color-light-gray;
&:visited {
color: var(--color-light-gray);
color: $color-light-gray;
}
&:hover {
color: var(--color-primary);
Expand Down Expand Up @@ -130,6 +130,6 @@
right: 26%;
top: 34%;
&:hover {
color: white;
color: $color-white;
}
}
75 changes: 41 additions & 34 deletions packages/view/src/styles/_colors.scss
Original file line number Diff line number Diff line change
@@ -1,39 +1,46 @@
@import "pallette";

$color--dark: $white;
$color--light: $black;

$danger-color--dark: #ff4444;
$danger-color--light: #cc0000;

$warning-color--dark: #ffbb33;
$warning-color--light: #ff8800;

$success-color--dark: #00c851;
$success-color--light: #007e33;
$color-white: #f7f7f7;
$color-black: #010818;
$color-light-gray: #b4bac6;
$color-medium-gray: #757880;
$color-dark-gray: #3c4048;
$color-background: #222324;

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

$info-color--dark: #33b5e5;
$info-color--light: #0099cc;
html[custom-type="hacker-blue"] {
--color-primary: #456cf7;
--color-secondary: #3f4c73;
--color-tertiary: #6c60f0;
--color-success: #1fc7a9;
--color-failed: #ee2479;
}

$brand--primary--dark: $blue-light-A200;
$brand--primary--light: $blue-light-A700;
html[custom-type="aqua"] {
--color-primary: #51decd;
--color-secondary: #0687a3;
--color-tertiary: #a7ffff;
--color-success: #008cde;
--color-failed: #ee2479;
}

$highlight-color--dark: transparentize($brand--primary--light, 0.1);
$highlight-color--light: transparentize($brand--primary--light, 0.1);
html[custom-type="cotton-candy"] {
--color-primary: #ffcccb;
--color-secondary: #feffd1;
--color-tertiary: #a39aeb;
--color-success: #7ad5c4;
--color-failed: #ff8bbc;
}

//GRADIENTS
@mixin linear-gradient($from, $to) {
background: $to;
background: -moz-linear-gradient(top, $from 0%, $to 100%);
background: -webkit-gradient(
linear,
left top,
left bottom,
color-stop(0%, $from),
color-stop(100%, $to)
);
background: -webkit-linear-gradient(top, $from 0%, $to 100%);
background: -o-linear-gradient(top, $from 0%, $to 100%);
background: linear-gradient(to bottom, $from 0%, $to 100%);
filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr=#{$from}, endColorstr=#{$to});
html[custom-type="mono"] {
--color-primary: #68788f;
--color-secondary: #3a4776;
--color-tertiary: #9aaed1;
--color-success: #6cafaf;
--color-failed: #aa4b72;
}
48 changes: 0 additions & 48 deletions packages/view/src/styles/_customTheme.scss

This file was deleted.

Loading

0 comments on commit b4d4b7b

Please sign in to comment.