refactor: improve stage-web color palette settings readability #1671
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,26 +40,15 @@ const cardStore = useAiriCardStore() | |
| const analyticsStore = useSharedAnalyticsStore() | ||
| const inferencePreload = useInferencePreload() | ||
|
|
||
| const getCSSVar = (variableName: string) => getComputedStyle(document.documentElement).getPropertyValue(variableName).trim() | ||
|
|
||
| const colors = computed(() => { | ||
| return [ | ||
| getCSSVar('--primary-color'), | ||
|
drHuangMHT marked this conversation as resolved.
|
||
| getCSSVar('--secondary-color'), | ||
| getCSSVar('--tertiary-color'), | ||
|
drHuangMHT marked this conversation as resolved.
Comment on lines
+50
to
+52
There was a problem hiding this comment.
This computed now snapshots resolved CSS colors via Useful? React with 👍 / 👎.
Contributor
Author
There was a problem hiding this comment. who would ever want an interface with flashy RGB effects🤦 does the original code also watch this change? @codex
Contributor
Author
There was a problem hiding this comment. the css variable returns what's in |
||
| isDark.value ? '#121212' : '#FFFFFF', | ||
| ] | ||
| }) | ||
|
drHuangMHT marked this conversation as resolved.
|
||
|
|
||
| const onboardingExtraSteps = computed(() => { | ||
|
|
@@ -119,9 +108,6 @@ function handleSetupSkipped() { | |
|
|
||
| <template> | ||
| <StageTransitionGroup | ||
| :colors="colors" | ||
| :z-index="100" | ||
| :disable-transitions="settings.disableTransitions.value" | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| :root { | ||
| /* Light mode defaults */ | ||
| --chromatic-hue: 0; | ||
| --chromatic-chroma-900: 0.15; | ||
|
Member
There was a problem hiding this comment. This is controlled and injected by https://github.com/proj-airi/chromatic. We should not define this here. |
||
| --is-dark: 0; | ||
|
|
||
| --primary-color: color-mix( | ||
| in srgb, | ||
| oklch(95% var(--chromatic-chroma-900) calc(var(--chromatic-hue) + 0)) 90%, | ||
| oklch(90% 0 360) | ||
| ); | ||
|
|
||
| --secondary-color: color-mix( | ||
| in srgb, | ||
| oklch(95% var(--chromatic-chroma-900) calc(var(--chromatic-hue) + 180)) 90%, | ||
| oklch(90% 0 360) | ||
| ); | ||
|
|
||
| --tertiary-color: color-mix( | ||
| in srgb, | ||
| oklch(95% var(--chromatic-chroma-900) calc(var(--chromatic-hue) + 60)) 90%, | ||
| oklch(90% 0 360) | ||
| ); | ||
| } | ||
|
|
||
| @media (prefers-color-scheme: dark) { | ||
| :root { | ||
|
drHuangMHT marked this conversation as resolved.
|
||
| --is-dark: 1; | ||
|
|
||
| --primary-color: color-mix( | ||
| in srgb, | ||
| oklch(95% var(--chromatic-chroma-900) calc(var(--chromatic-hue) + 0)) 70%, | ||
| oklch(50% 0 360) | ||
| ); | ||
|
|
||
| --secondary-color: color-mix( | ||
| in srgb, | ||
| oklch(95% var(--chromatic-chroma-900) calc(var(--chromatic-hue) + 180)) 70%, | ||
| oklch(50% 0 360) | ||
| ); | ||
|
|
||
| --tertiary-color: color-mix( | ||
| in srgb, | ||
| oklch(95% var(--chromatic-chroma-900) calc(var(--chromatic-hue) + 60)) 70%, | ||
| oklch(50% 0 360) | ||
| ); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,22 @@ | ||
| <script setup lang="ts"> | ||
| import type { StageTransitionCommonParams } from '.' | ||
|
|
||
| import { useCssVariables } from './useCssVar' | ||
|
|
||
| const { | ||
| primaryColor = '#666', | ||
| secondaryColor = '#ccc', | ||
| zIndex = 100, | ||
| } = defineProps<Omit<StageTransitionCommonParams, 'name'>>() | ||
|
Comment on lines
+6
to
+10
Member
There was a problem hiding this comment.
Contributor
Author
There was a problem hiding this comment. we are using vue |
||
|
|
||
| useCssVariables(() => ({ | ||
| 'overlay-color-1': primaryColor, | ||
| 'overlay-color-2': secondaryColor, | ||
| }), { prefix: '--stage-transition-3-' }) | ||
|
Comment on lines
+12
to
+15
Member
There was a problem hiding this comment. What is the purpose of this?
Contributor
Author
There was a problem hiding this comment. improve code readability. |
||
| </script> | ||
|
|
||
| <template> | ||
| <div class="stage-transition-3" :style="{ zIndex }" /> | ||
| </template> | ||
|
|
||
| <style scoped> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,36 @@ | ||
| <script setup lang="ts"> | ||
| import { useCssVariables } from './useCssVar' | ||
|
|
||
| interface TransitionParams { | ||
| colors?: string[] | ||
| delay?: number | ||
| duration?: number | ||
| zIndex?: number | ||
| } | ||
|
|
||
| const { | ||
| colors = ['#eee', '#ebcb8b', '#c56370', '#3f3b52'], | ||
| delay = 0, | ||
| duration = 0.4, | ||
| zIndex = 100, | ||
| } = defineProps<TransitionParams>() | ||
|
Comment on lines
+11
to
+16
Member
There was a problem hiding this comment. withDefaults should be used as https://vuejs.org/guide/typescript/composition-api.html#props-default-values explained. |
||
|
|
||
| function getCssVar() { | ||
| const record: Record<string, string> = { | ||
| delay: `${delay}s`, | ||
| duration: `${duration}s`, | ||
| } | ||
| colors.forEach((color, index) => { | ||
| record[`color-${index + 1}`] = color | ||
| }) | ||
| return record | ||
| } | ||
|
|
||
| useCssVariables(getCssVar, { prefix: '--circle-expansion-' }) | ||
| </script> | ||
|
|
||
| <template> | ||
| <div class="circle-expansion-transition" :style="{ zIndex }"> | ||
| <div v-for="(_, index) in colors" :key="index" /> | ||
| </div> | ||
| </template> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,47 @@ | ||
| <script setup lang="ts"> | ||
| import { computed } from 'vue' | ||
|
|
||
| import { useCssVariables } from './useCssVar' | ||
|
|
||
| interface TransitionParams { | ||
| primaryColor?: string | ||
| duration?: number | ||
| delay?: number | ||
| direction?: 'up' | 'down' | 'left' | 'right' | ||
| borderRadius?: { | ||
| sm?: string | ||
| md?: string | ||
| lg?: string | ||
| } | ||
| zIndex?: number | ||
| } | ||
|
|
||
| const { | ||
| direction = 'up', | ||
| primaryColor = '#eee', | ||
| duration = 0.6, | ||
| delay = 0, | ||
| borderRadius = { sm: '14rem', md: '14rem', lg: '50%' }, | ||
| zIndex = 100, | ||
| } = defineProps<TransitionParams>() | ||
|
Comment on lines
+19
to
+26
Member
There was a problem hiding this comment. withDefaults should be used as https://vuejs.org/guide/typescript/composition-api.html#props-default-values explained. |
||
| const directionClass = computed(() => `fantasy-fall-${direction}`) | ||
|
|
||
| useCssVariables(() => ({ | ||
| 'color': primaryColor, | ||
| 'duration': `${duration}s`, | ||
| 'delay': `${delay}s`, | ||
| 'radius-sm': borderRadius?.sm ?? '14rem', | ||
| 'radius-md': borderRadius?.md ?? '14rem', | ||
| 'radius-lg': borderRadius?.lg ?? '50%', | ||
| }), { prefix: '--fantasy-fall-' }) | ||
| </script> | ||
|
|
||
| <template> | ||
| <div | ||
| class="fantasy-fall-transition" | ||
| :class="directionClass" | ||
| :style="{ zIndex }" | ||
| /> | ||
| </template> | ||
|
|
||
| <style scoped> | ||
|
|
@@ -53,7 +64,8 @@ onMounted(() => { | |
| transform: translateY(-100%); | ||
| border-bottom-left-radius: var(--fantasy-fall-radius-sm); | ||
| border-bottom-right-radius: var(--fantasy-fall-radius-sm); | ||
| animation: fantasy-fall-up var(--fantasy-fall-duration) ease-out | ||
| var(--fantasy-fall-delay) forwards; | ||
| } | ||
|
|
||
| /* Bottom direction */ | ||
|
|
@@ -69,7 +81,8 @@ onMounted(() => { | |
| transform: translateY(100%); | ||
| border-top-left-radius: var(--fantasy-fall-radius-sm); | ||
| border-top-right-radius: var(--fantasy-fall-radius-sm); | ||
| animation: fantasy-fall-down var(--fantasy-fall-duration) ease-out | ||
| var(--fantasy-fall-delay) forwards; | ||
| } | ||
|
|
||
| /* Left direction */ | ||
|
|
@@ -85,7 +98,8 @@ onMounted(() => { | |
| transform: translateX(-100%); | ||
| border-top-right-radius: var(--fantasy-fall-radius-sm); | ||
| border-bottom-right-radius: var(--fantasy-fall-radius-sm); | ||
| animation: fantasy-fall-left var(--fantasy-fall-duration) ease-out | ||
| var(--fantasy-fall-delay) forwards; | ||
| } | ||
|
|
||
| /* Right direction */ | ||
|
|
@@ -101,7 +115,8 @@ onMounted(() => { | |
| transform: translateX(100%); | ||
| border-top-left-radius: var(--fantasy-fall-radius-sm); | ||
| border-bottom-left-radius: var(--fantasy-fall-radius-sm); | ||
| animation: fantasy-fall-right var(--fantasy-fall-duration) ease-out | ||
| var(--fantasy-fall-delay) forwards; | ||
| } | ||
|
|
||
| /* Responsive border radius adjustments */ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be replaced with the new https://github.com/proj-airi/chromatic/blob/3be1f5990069fa5dd006ae314c979ef54906d1e5/packages/chromatic/src/index.ts#L148-L198