diff --git a/apps/frontend/src/assets/styles/components.scss b/apps/frontend/src/assets/styles/components.scss index b11d0e4a8..1fa038cd0 100644 --- a/apps/frontend/src/assets/styles/components.scss +++ b/apps/frontend/src/assets/styles/components.scss @@ -625,17 +625,17 @@ tr.button-transparent { .danger-button { --background-color: var(--color-red); - --text-color: var(--color-brand-inverted); + --text-color: var(--color-accent-contrast); } .moderation-button { --background-color: var(--color-orange); - --text-color: var(--color-brand-inverted); + --text-color: var(--color-accent-contrast); } .brand-button { --background-color: var(--color-brand); - --text-color: var(--color-brand-inverted); + --text-color: var(--color-accent-contrast); } .alt-brand-button { @@ -715,7 +715,7 @@ tr.button-transparent { &:after { transform: translatex(20px); - background: var(--color-brand-inverted); + background: var(--color-accent-contrast); } } diff --git a/apps/frontend/src/assets/styles/global.scss b/apps/frontend/src/assets/styles/global.scss index 80a4dbad7..c317036a4 100644 --- a/apps/frontend/src/assets/styles/global.scss +++ b/apps/frontend/src/assets/styles/global.scss @@ -51,9 +51,6 @@ html { --color-text-inverted: initial !important; --color-bg-inverted: initial !important; - --color-brand: var(--color-green) !important; - --color-brand-inverted: initial !important; - --tab-underline-hovered: initial !important; --color-button-text: initial !important; @@ -184,6 +181,8 @@ html { --color-green-bg: rgba(0, 175, 92, 0.1); --color-blue-bg: rgba(31, 104, 192, 0.1); --color-purple-bg: rgba(142, 50, 243, 0.1); + --color-purple-highlight: rgba(142, 50, 243, 0.25); + --color-purple-shadow: rgba(142, 50, 243, 0.7); --color-warning-bg: hsl(355, 70%, 88%); --color-warning-text: hsl(342, 70%, 35%); @@ -280,6 +279,8 @@ html { --color-green-bg: rgba(27, 217, 106, 0.2); --color-blue-bg: rgba(79, 156, 255, 0.2); --color-purple-bg: rgba(199, 138, 255, 0.2); + --color-purple-highlight: rgba(177, 101, 255, 0.25); + --color-purple-shadow: rgba(191, 114, 255, 0.7); --color-brand: var(--color-green); --color-brand-highlight: rgba(27, 217, 106, 0.25); @@ -391,6 +392,11 @@ html { } .oled-mode { + .experimental-styles-within, + &.experimental-styles-within { + --color-button-bg: #222329; + } + --color-bg: #000000; --color-raised-bg: #101013; @@ -405,6 +411,11 @@ html { } .retro-mode { + .experimental-styles-within, + &.experimental-styles-within { + --color-button-bg: #3a3b38; + } + --color-bg: #191917; --color-raised-bg: #1d1e1b; --color-button-bg: #3a3b38; @@ -426,12 +437,25 @@ html { --color-purple: rgb(139, 129, 230); --color-gray: #718096; - --color-red-highlight: rgba(232, 32, 13, 0.25); - --color-orange-highlight: rgba(232, 141, 13, 0.25); - --color-green-highlight: rgba(60, 219, 54, 0.25); - --color-blue-highlight: rgba(9, 159, 239, 0.25); + --color-red-bg: rgba(232, 32, 13, 0.1); + --color-orange-bg: rgba(232, 141, 13, 0.1); + --color-green-bg: rgba(60, 219, 54, 0.1); + --color-blue-bg: rgba(9, 159, 239, 0.1); + --color-purple-bg: rgba(139, 129, 230, 0.1); --color-purple-highlight: rgba(139, 129, 230, 0.25); - --color-gray-highlight: rgba(113, 128, 150, 0.25); + --color-purple-shadow: rgba(139, 129, 230, 0.7); +} + +.green-mode { + --color-brand: var(--color-green); + --color-brand-highlight: var(--color-green-highlight); + --color-brand-shadow: var(--color-green-shadow); +} + +.purple-mode { + --color-brand: var(--color-purple); + --color-brand-highlight: var(--color-purple-highlight); + --color-brand-shadow: var(--color-purple-shadow); } body { diff --git a/apps/frontend/src/assets/styles/layout.scss b/apps/frontend/src/assets/styles/layout.scss index 92b0bf4a8..00eba13d6 100644 --- a/apps/frontend/src/assets/styles/layout.scss +++ b/apps/frontend/src/assets/styles/layout.scss @@ -74,20 +74,20 @@ .normal-page { margin: 0 auto; max-width: 80rem; - column-gap: 0.75rem; + column-gap: 1rem; grid-template: "sidebar content" auto "info content" auto "dummy content" 1fr - / 18.75rem 1fr; + / 300px 1fr; &.alt-layout { grid-template: "content sidebar" auto "content info" auto "content dummy" 1fr - / 1fr 18.75rem; + / 1fr 300px; } &.no-sidebar { @@ -106,12 +106,12 @@ } .normal-page__sidebar { - min-width: 18.75rem; - width: 18.75rem; + min-width: 300px; + width: 300px; } .normal-page__content { - max-width: calc(80rem - 18.75rem - 0.75rem); + max-width: calc(80rem - 300px - 1rem); //overflow-x: hidden; } } @@ -120,8 +120,8 @@ display: grid; margin: 0 auto; max-width: 80rem; - column-gap: 0.75rem; - padding: 0 0.75rem; + column-gap: 1rem; + padding: 0 1rem; grid-template: "header" @@ -135,14 +135,14 @@ "header header" auto "content sidebar" auto "content dummy" 1fr - / 1fr 18.75rem; + / 1fr 300px; &.alt-layout { grid-template: "header header" auto "sidebar content" auto "dummy content" 1fr - / 18.75rem 1fr; + / 300px 1fr; } } @@ -158,7 +158,7 @@ .normal-page__content { grid-area: content; - max-width: calc(80rem - 18.75rem - 0.75rem); + max-width: calc(80rem - 300px - 1rem); //overflow-x: hidden; } } diff --git a/apps/frontend/src/components/ui/Checkbox.vue b/apps/frontend/src/components/ui/Checkbox.vue index fc9390f9f..3250dde31 100644 --- a/apps/frontend/src/components/ui/Checkbox.vue +++ b/apps/frontend/src/components/ui/Checkbox.vue @@ -119,7 +119,7 @@ export default { } svg { - color: var(--color-brand-inverted); + color: var(--color-accent-contrast); stroke-width: 0.2rem; height: 0.8rem; width: 0.8rem; diff --git a/apps/frontend/src/components/ui/NavStackItem.vue b/apps/frontend/src/components/ui/NavStackItem.vue index e9adf443b..8bfa1383f 100644 --- a/apps/frontend/src/components/ui/NavStackItem.vue +++ b/apps/frontend/src/components/ui/NavStackItem.vue @@ -99,8 +99,8 @@ export default { border-radius: 0.25rem; .nav-content { - color: var(--color-button-text-active); - background-color: var(--color-button-bg); + color: var(--color-contrast); + background-color: var(--color-brand-highlight); box-shadow: none; } } diff --git a/apps/frontend/src/components/ui/Notifications.vue b/apps/frontend/src/components/ui/Notifications.vue index fc2ed6ec3..c66f59916 100644 --- a/apps/frontend/src/components/ui/Notifications.vue +++ b/apps/frontend/src/components/ui/Notifications.vue @@ -28,7 +28,7 @@ function stopTimer(notif) { .vue-notification { background: var(--color-blue) !important; border-left: 5px solid var(--color-blue) !important; - color: var(--color-brand-inverted) !important; + color: var(--color-accent-contrast) !important; box-sizing: border-box; text-align: left; diff --git a/apps/frontend/src/components/ui/Pagination.vue b/apps/frontend/src/components/ui/Pagination.vue index b04408887..cdf21d868 100644 --- a/apps/frontend/src/components/ui/Pagination.vue +++ b/apps/frontend/src/components/ui/Pagination.vue @@ -135,7 +135,7 @@ a { &.page-number.current { background: var(--color-brand); - color: var(--color-brand-inverted); + color: var(--color-accent-contrast); cursor: default; outline: 2px solid transparent; } diff --git a/apps/frontend/src/components/ui/ProjectMemberHeader.vue b/apps/frontend/src/components/ui/ProjectMemberHeader.vue index 087ddb73d..3b1a7ab8e 100644 --- a/apps/frontend/src/components/ui/ProjectMemberHeader.vue +++ b/apps/frontend/src/components/ui/ProjectMemberHeader.vue @@ -496,7 +496,7 @@ const submitForReview = async () => { &.done { --background-color: var(--color-green); - --content-color: var(--color-brand-inverted); + --content-color: var(--color-accent-contrast); } } } diff --git a/apps/frontend/src/layouts/default.vue b/apps/frontend/src/layouts/default.vue index 26befc746..17b5cee9c 100644 --- a/apps/frontend/src/layouts/default.vue +++ b/apps/frontend/src/layouts/default.vue @@ -1,5 +1,13 @@