-
Notifications
You must be signed in to change notification settings - Fork 85
[7307] Dark Mode #7360
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.
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
Open
n-lark
wants to merge
10
commits into
main
Choose a base branch
from
7307-dark-mode
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
[7307] Dark Mode #7360
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
e7dc553
Add light/dark theme system with palette tokens, lint enforcement, an…
n-lark d34427b
Merge remote-tracking branch 'origin/main' into 7307-dark-mode
n-lark 5c9520a
Fix dark-mode text/danger ladder collapses and accent-hover no-op, an…
n-lark 6a25375
Simplify theme store try/catch with optional binding and document hig…
n-lark d320f08
Merge remote-tracking branch 'origin/main' into 7307-dark-mode
n-lark 35185a7
Soften dark-theme text and status colors, lift slate ramp, and split …
n-lark 0626496
Add tokens for table styling and darken table header in dark mode
n-lark 3810f18
Swap tree-view icon for share icon so dark theme can be respected
n-lark bb96999
Darken slate-3-dark to ground all elevated card surfaces in dark mode
n-lark b4e98e2
Collapse dark bg-surface onto bg-app to eliminate the row-vs-wrapper …
n-lark File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
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
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
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,29 +1,38 @@ | ||
| <template> | ||
| <div | ||
| class="ff-loading grow flex flex-col items-center justify-center mx-auto" | ||
| :class="{'theme-light': color == 'black', 'theme-dark': color == 'white'}" | ||
| :class="{'theme-light': resolvedColor == 'black', 'theme-dark': resolvedColor == 'white'}" | ||
| data-el="loading" | ||
| > | ||
| <div class="text-center w-64"> | ||
| <lottie-animation v-if="color == 'white'" :animationData="require('../images/lottie/ff-loading-white.json')" :loop="true" /> | ||
| <lottie-animation v-else-if="color == 'black'" :animationData="require('../images/lottie/ff-loading-black.json')" :loop="true" /> | ||
| <lottie-animation v-if="resolvedColor == 'white'" :animationData="require('../images/lottie/ff-loading-white.json')" :loop="true" /> | ||
| <lottie-animation v-else :animationData="require('../images/lottie/ff-loading-black.json')" :loop="true" /> | ||
| <h4>{{ message || 'Loading...' }}</h4> | ||
| </div> | ||
| </div> | ||
| </template> | ||
| <script> | ||
| import { mapState } from 'pinia' | ||
|
|
||
| import { useThemeStore } from '@/stores/theme.ts' | ||
|
|
||
| export default { | ||
| name: 'ff-loading', | ||
| props: { | ||
| color: { | ||
| default: 'black', // 'white', 'black' | ||
| default: null, | ||
| type: String | ||
| }, | ||
| message: { | ||
| default: null, | ||
| type: String | ||
| } | ||
| }, | ||
| computed: { | ||
| ...mapState(useThemeStore, ['effective']), | ||
| resolvedColor () { | ||
| return this.color || (this.effective === 'dark' ? 'white' : 'black') | ||
| } | ||
| } | ||
| } | ||
| </script> |
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 was deleted.
Oops, something went wrong.
Oops, something went wrong.
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.
Just dropping comment so I don't forget - we need to sync up the Node-RED instances settings for 5.0 and others for themes to sync.
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.
Moved this work into its own ticket since we will need Node-RED changes: Sync FlowFuse dark theme preference with Node-RED 5+ #7380