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

Jump to bottom

[Fix] set common css #1436 #1443

Merged
merged 4 commits into from
Jul 9, 2024
Merged

[Fix] set common css #1436 #1443

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
865428a
fix: scss cannot set html[dataset], move it to global.css
cweedlee Jul 8, 2024
c55a3d7
fix: scss cannot set html[dataset], move it to global.css
cweedlee Jul 8, 2024
3ee1325
fix: css variavle type
cweedlee Jul 9, 2024
4faefb6
Merge branch 'Feat/set-common-css-#1436' of https://github.com/42orgaโ€ฆ
cweedlee Jul 9, 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
48 changes: 0 additions & 48 deletions styles/agenda/common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,51 +17,3 @@ $color-coalition-lee: #ff8a85;

// font-family
$font-family-menu: 'Cafe24 Simplehae';

// color
$bg-light: linear-gradient(180deg, #c9c9c9 0%, #6d5b93 100%);
$bg-dark: linear-gradient(180deg, #38253a 0%, #604ecd 73%, #999772 100%);

$text-light: black;
$text-dark: white;
$border-light: 1px solid black;
$border-dark: 1px solid white;

$box-shadow-light: 0px 4px 4px 0px rgba(0, 0, 0, 0.25);
$box-shadow-dark: 0px 4px 4px 0px rgba(255, 255, 255, 0.25);

$highlight-yellow-light: #f8df85;
$highlight-violet-light: #af71ff;
$highlight-yellow-dark: #ff8534;
$highlight-violet-dark: #af71ff; // ๋‚˜์ค‘์— ์ˆ˜์ • - ๋‹คํฌ๋ชจ๋“œ ์ƒ‰์ƒ ๋ณ€๊ฒฝ ํ•„์š”

$box-bg-1-light: #f8f8f8;
$box-bg-2-light: #c8c8c8;
$box-bg-3-light: #b0b0b0;
$box-bg-1-dark: #666666;
$box-bg-2-dark: #888888;
$box-bg-3-dark: #a7a7a7;

html[data-theme='light'] {
--color-bg: #{$bg-light};
--color-text: #{$text-light};
--default-border: #{$border-light};
--default-box-shadow: #{$border-light};
--highlight-yellow: #{$highlight-yellow-light};
--highlight-violet: #{$highlight-violet-light};
--box-bg-1: #{$box-bg-1-light};
--box-bg-2: #{$box-bg-2-light};
--box-bg-3: #{$box-bg-3-light};
}

html[data-theme='dark'] {
--color-bg: #{$bg-dark};
--color-text: #{$text-dark};
--default-border: #{$border-dark};
--default-box-shadow: #{$border-dark};
--highlight-yellow: #{$highlight-yellow-dark};
--highlight-violet: #{$highlight-violet-dark};
--box-bg-1: #{$box-bg-1-dark};
--box-bg-2: #{$box-bg-2-dark};
--box-bg-3: #{$box-bg-3-dark};
}
48 changes: 48 additions & 0 deletions styles/color-theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/* dark - light mode */
:root {
--bg-light: linear-gradient(180deg, #c9c9c9 0%, #6d5b93 100%);
--bg-dark: linear-gradient(180deg, #38253a 0%, #604ecd 73%, #999772 100%);
--text-light: #000000;
--text-dark: #ffffff;
--border-light: 1px solid black;
--border-dark: 1px solid white;

--box-shadow-light: 0px 4px 4px 0px rgba(0, 0, 0, 0.25);
--box-shadow-dark: 0px 4px 4px 0px rgba(255, 255, 255, 0.25);

--highlight-yellow-light: #f8df85;
--highlight-violet-light: #af71ff;
--highlight-yellow-dark: #ff8534;
--highlight-violet-dark: #af71ff;

--box-bg-1-light: #f8f8f8;
--box-bg-2-light: #c8c8c8;
--box-bg-3-light: #b0b0b0;
--box-bg-1-dark: #666666;
--box-bg-2-dark: #888888;
--box-bg-3-dark: #a7a7a7;
}

html[data-theme='light'] {
--color-bg: var(--bg-light);
--color-text: var(--text-light);
--default-border: var(--border-light);
--default-box-shadow: var(--border-light);
--highlight-yellow: var(--highlight-yellow-light);
--highlight-violet: var(--highlight-violet-light);
--box-bg-1: var(--box-bg-1-light);
--box-bg-2: var(--box-bg-2-light);
--box-bg-3: var(--box-bg-3-light);
}

html[data-theme='dark'] {
--color-bg: var(--bg-dark);
--color-text: var(--text-dark);
--default-border: var(--border-dark);
--default-box-shadow: var(--border-dark);
--highlight-yellow: var(--highlight-yellow-dark);
--highlight-violet: var(--highlight-violet-dark);
--box-bg-1: var(--box-bg-1-dark);
--box-bg-2: var(--box-bg-2-dark);
--box-bg-3: var(--box-bg-3-dark);
}
2 changes: 2 additions & 0 deletions styles/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import url('./color-theme.css');

html,
body {
padding: 0;
Expand Down