9
66
Fork
You've already forked Bolt
11

refactor(ui): simplify BoltApp structure and add TextArea component #23

Open
Panku wants to merge 10 commits from Panku/Bolt:user/dwa/minor-ui-improvements into master
pull from: Panku/Bolt:user/dwa/minor-ui-improvements
merge into: Adamcake:master
Adamcake:master
Adamcake:zigify
First-time contributor
Copy link

While looking at ways to clean up the UI, I saw some parts of the front-end HTML structure that could use some TLC.
These changes are pretty insignificant and could probably be apart of an app-wide cleanup effort rather than these random tid-bits I nitpicked.

This PR changes...

  • BoltApp.svelte to be less complex.
    • Pair with changing the body element to be more dynamic so children content grows accordingly.
  • Adds new TextArea component to try and reduce tailwind noise from copy/paste.
  • Adds "empty logs" to log component.
  • "Fix" some buttons code styling.

RSS enabled.
image

RSS disabled.
image

PSA with RSS enabled.
image

PSA with RSS disabled.
image

OSRS config dialog.
image

RS3 config dialog.
image

LogView scrolls its contents.
image

While looking at ways to clean up the UI, I saw some parts of the front-end HTML structure that could use some TLC. These changes are pretty insignificant and could probably be apart of an app-wide cleanup effort rather than these random tid-bits I nitpicked. This PR changes... - BoltApp.svelte to be less complex. - Pair with changing the `body` element to be more dynamic so children content grows accordingly. - Adds new `TextArea` component to _try_ and reduce tailwind noise from copy/paste. - Adds "empty logs" to log component. - "Fix" some buttons code styling. **RSS enabled.** ![image](/attachments/b46e3f02-0da5-4680-afda-78dfba287935) **RSS disabled.** ![image](/attachments/dc5217b5-7d2b-4c14-8716-6c268939ec48) **PSA with RSS enabled.** ![image](/attachments/9a02ed12-2e08-4aea-b025-929d10358576) **PSA with RSS disabled.** ![image](/attachments/44ed1f1d-f423-425b-94a2-78638649223a) **OSRS config dialog.** ![image](/attachments/7e3f7573-ed37-4e89-9a23-298176820fe2) **RS3 config dialog.** ![image](/attachments/c12087ab-a9b7-46c9-9459-d74f462f2a0b) **LogView scrolls its contents.** ![image](/attachments/39cabac8-5e36-4a66-924b-c5538326b3af)
Author
First-time contributor
Copy link

Immediately see Rider converted tabs to 2 spaces. 🤦🤦🤦
If that is a show stopper, let me know. I see there's an editorconfig for C/++ but not for TS.

Immediately see Rider converted tabs to 2 spaces. 🤦🤦🤦 If that is a show stopper, let me know. I see there's an editorconfig for C/++ but not for TS.
This pull request has changes conflicting with the target branch.
  • app/dist/index.html
  • app/src/BoltApp.svelte
  • app/src/lib/Components/Launch.svelte
  • app/src/lib/Components/Settings/GeneralSettingsTab.svelte
  • app/src/lib/Components/Settings/OsrsSettingsTab.svelte
  • app/src/lib/Components/Settings/Rs3SettingsTab.svelte
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u user/dwa/minor-ui-improvements:Panku-user/dwa/minor-ui-improvements
git switch Panku-user/dwa/minor-ui-improvements

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff Panku-user/dwa/minor-ui-improvements
git switch Panku-user/dwa/minor-ui-improvements
git rebase master
git switch master
git merge --ff-only Panku-user/dwa/minor-ui-improvements
git switch Panku-user/dwa/minor-ui-improvements
git rebase master
git switch master
git merge --no-ff Panku-user/dwa/minor-ui-improvements
git switch master
git merge --squash Panku-user/dwa/minor-ui-improvements
git switch master
git merge --ff-only Panku-user/dwa/minor-ui-improvements
git switch master
git merge Panku-user/dwa/minor-ui-improvements
git push origin master
Sign in to join this conversation.
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
Adamcake/Bolt!23
Reference in a new issue
Adamcake/Bolt
No description provided.
Delete branch "Panku/Bolt:user/dwa/minor-ui-improvements"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?