-
Notifications
You must be signed in to change notification settings - Fork 9.3k
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
Preferences redesign #8813
Merged
Merged
Preferences redesign #8813
Changes from 41 commits
Commits
Show all changes
42 commits
Select commit
Hold shift + click to select a range
27532d8
Separate out Integrations tab
kuychaco b9be775
Include footer for Integrations tab
kuychaco feddfad
Add "Applications" header to Integrations tab
kuychaco be54b99
Make Advanced tab less redundant
kuychaco 222b8b8
Add section in Advanced for handling changes when switching branches
kuychaco a397784
Wire up radio buttons, store value in local storage
kuychaco 54eb1c9
Add getUncommittedChangesStrategy helper
kuychaco 74a6408
Default to selected uncommittedChangesStrategy in app store methods
kuychaco fe54a35
Use uncommittedChangesStragety selected when switching branches
kuychaco b89ecbd
Use uncommittedChangesStrategy selected when creating new branch
kuychaco a9b202b
Verticalize tab bar
kuychaco a83f84a
Add icons
kuychaco e37b78b
Make dialog width wider for new sidebar
kuychaco 77af3a4
Update styles for selected item
kuychaco ca3d5ba
Style icons
kuychaco 211f5a0
Fix spacing
kuychaco 14fd997
Border radius
kuychaco 13e7516
Fix width of tab-container
kuychaco ff7cd2c
Merge branch 'development' into ku-preferences-redesign
kuychaco c97f005
Fix styling
kuychaco 3c72edd
Use arrow up/down for navigation
kuychaco 76afcf6
Stash only if changes exist
kuychaco eeb0589
Prompt before overwriting current stash
kuychaco bc7c047
Only prompt if there are changes
kuychaco a60d295
Merge branch 'development' into ku-preferences-redesign
kuychaco 4c5ac1d
Tiny spacing tweaks
ampinsk a5454b0
Styling tweaks
kuychaco d7bed4e
Extract styles to shared base class
kuychaco 4cd70f2
Fix tab bar background color
kuychaco 7e50c7d
Align text next to icons
kuychaco 5bbc79d
Fix spacing of Advanced section
kuychaco 3acdd9a
Merge branch 'development' into ku-preferences-redesign
kuychaco 48d3a65
Make non-selected icons gray
kuychaco 1a56994
Merge branch 'development' into ku-preferences-redesign
kuychaco 77354a6
:fire: unnecessary code
kuychaco fe21309
add a parse method for uncommittedChangesStrategyKind
outofambit f2aeb50
some docs for getUncommittedChangesStrategy
outofambit 09e954c
remove extra line
outofambit 8cee164
hasChagnesAndStash --> couldOverwriteStash
kuychaco 6d70d14
Merge branch 'development' into ku-preferences-redesign
kuychaco 564be7f
lint
outofambit 79dc0d4
Merge remote-tracking branch 'origin/development' into ku-preferences…
outofambit 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 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 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 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,6 +1,7 @@ | ||
export enum PreferencesTab { | ||
Accounts = 0, | ||
Git = 1, | ||
Appearance = 2, | ||
Advanced = 3, | ||
Integrations = 1, | ||
Git = 2, | ||
Appearance = 3, | ||
Advanced = 4, | ||
} |
This file contains 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 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 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 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 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.
😋