Skip to content
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

Desktop Icons and Workspaces updates #457

Merged
merged 18 commits into from
Jan 17, 2024

Conversation

johnandmegh
Copy link
Contributor

@johnandmegh johnandmegh commented Jan 16, 2024

Description

I tried to use some tips on Stack Overflow to "squash" the GitHub commits on my own this time...and somehow I think I made it even messier? (I don't think the end result is changed, but please let me know if I need to go back to the drawing board on how this is submitted)

Also, if this style of update is OK, I could probably tackle the rest of that page - I'm new all of Solus and Budgie, but it seems like a few different settings-related functions got moved from being accessed via Raven to being accessed via the Budgie Menu > Settings? Those would seem easy enough for me to grab new screenshots for and update wording.

Thanks,

Edited a few minutes later: sorry, meant to mention, this is related to #131

Submitter Checklist

  • Squashed commits with git rebase -i (if needed)

@davidjharder
Copy link
Member

Git workflow stuff:

  • In this particular case, the mess is fine because I can squash it.
  • Are you using the github desktop client, the command line, or something else?
  • I would encourage you to experiment with grouping multiple changes onto a commit
  • "squashing" commits is actually using the rebase command to organize a pile of commits in a certain way. The most concise explanation I've found is here https://docs.github.com/en/get-started/using-git/about-git-rebase
  • For a more general git resource try https://git-scm.com/book/en/v2

Style:

  • The style seems fine. In my opinion It's more important to update these rather old pages
  • If you do want to take a deep dive into style, we recently published a style guide. Note that we haven't used it much yet https://help.getsol.us/docs/user/contributing/style

I'll review the content of your changes some time later; I wanted to respond to your questions first.

@johnandmegh
Copy link
Contributor Author

johnandmegh commented Jan 16, 2024

Thanks very much for the links, I will dig in!

I tried using the GitHub website for these edits because of the easy preview feature, but I'm realizing with so many manipulation pieces using the command line, I should probably be using a cloned repo and the command line?

@davidjharder
Copy link
Member

Yes, almost every guide and doc will assume you are using the cli on a cloned local repo, pushing to some remote like Github.

Many modern editors are git-aware out of the box. For example, if you use vscode, it has a "source control" tab that will do simple git operations for you.

I use the Github editing tools for small one-off edits. As soon as you are editing more than one file, or organizing commits in any way, you will have to get comfortable with the cli

@davidjharder
Copy link
Member

I should add: If you are struggling with something you can always ask for help in the Packaging or Development chat.

docs/user/editions/budgie/configuration.md Outdated Show resolved Hide resolved
docs/user/editions/budgie/configuration.md Outdated Show resolved Hide resolved
docs/user/editions/budgie/configuration.md Outdated Show resolved Hide resolved
docs/user/editions/budgie/configuration.md Outdated Show resolved Hide resolved
docs/user/editions/budgie/configuration.md Outdated Show resolved Hide resolved
docs/user/editions/budgie/configuration.md Outdated Show resolved Hide resolved
docs/user/editions/budgie/configuration.md Outdated Show resolved Hide resolved
@johnandmegh
Copy link
Contributor Author

Thanks! I think I addressed the wording/consistency issues that you mentioned, and I scanned for similar quotation mark issues in at least the portion included in this request - I'll check the other one I sent as well.

Copy link
Member

@davidjharder davidjharder left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@davidjharder davidjharder merged commit 59fb2e2 into getsolus:master Jan 17, 2024
1 check passed
@johnandmegh johnandmegh deleted the johnandmegh-patch-20240116 branch January 17, 2024 19:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants