⚑ → Language list

[VincentTam]

Description

Replaced flags with language name with code.

Motivation and Context

Resolve #61.

Screenshots (if appropriate):

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

• I have read the Contributing Document.
• My code follows the code style of this project.
• My change requires a change to the documentation.
• I have updated the documentation, including theme.toml, accordingly.

[pacollins]

Switched to keep the design the same (square in the navbar versus the full word). Only issue I see is when we have lang and locale code, which would make it 5 characters. But I figured that is such an edge case I'm fine with it. Still working on the CSS. I might do a quick one here and restructure the .flyout-menu in another PR.

[pacollins]

Done styling what is related to this PR. I force-pushed to try and clear the merge conflict manually (caused by #78) by adding the "newer" CSS and it still didn't like it, but I was able to do it here easily. Just something to note - having two css related PRs at a time with the pipe is going to be a little annoying since the conflict is hard to find and fix.

[VincentTam]

Done styling what is related to this PR. I force-pushed to try and clear the merge conflict manually (caused by #78) by adding the "newer" CSS and it still didn't like it, but I was able to do it here easily. Just something to note - having two css related PRs at a time with the pipe is going to be a little annoying since the conflict is hard to find and fix.

the fact that everything goes to one same big SCSS file might be contribute to the merge conflict, since in every diff hunk, the neighbouring three lines of each changed line are displayed. When two areas overlap, merge conflict would possibly occur. CSS is not (yet?) my thing, so I couldn't comment on the actual SCSS. What I put in https://github.com/pacollins/hugo-future-imperfect-slim/pull/80/files/65e4a5d904bedc0ac0a3822e8a67e9e367a3883f#diff-bbefc3ad9404805c599babc090218242 is simply a workaround to produce good-looking (IMO, at least) screenshots.

The actual rules for determining pulls and pushes can be much more difficult than we know, but I know that you've tried your best to push your work.

To revert merges, you might try git revert [commit hash] -m [1|2]. In the case of divergence of branches, you might try git pull --rebase or even git rebase -i to linearise the commit history graph so as to keep Git history down.

In case of divergence for the same file, you might want to record your changes first by git diff > my.[diff|patch] and hard reset to a previous verison by git checkout [commit hash] -- conflictFile. The double hyphen limits the scope of the Git command. Either git apply -3 my.patch, git am or patch -p1 < my.diff would do. In the perfect case, choose the first one. I've not tested the 2nd one. In a more complicated case, use the 3rd one.

[pacollins]

the fact that everything goes to one same big SCSS file might be contribute to the merge conflict, since in every diff hunk, the neighbouring three lines of each changed line are displayed.

#66 Since we are now using pipes, it might be worth while to split it into multiple scss files for clarity. I will explore this.

To revert merges, you might try git revert [commit hash] -m [1|2]. In the case of divergence of branches, you might try git pull --rebase or even git rebase -i to linearise the commit history graph so as to keep Git history down.
Thanks for increasing my git knowledge. Those two concepts have always been muddy for me.

I will try to go back and adjust this.

[VincentTam]

I think we don't need assets/scss/main.min.css, which has been introduced in #78? Compiled and compressed main CSS is already found under exampleSite/resources/_gen.

Thanks for increasing my git knowledge. Those two concepts have always been muddy for me.
I will try to go back and adjust this.

Given that you've already forced pushed stuff, let's keep its status quo. Oh-my-zsh can help the Git indexing: https://www.git-scm.com/book/en/v2/Appendix-A%3A-Git-in-Other-Environments-Git-in-Zsh, while tldr's abridged man pages are good enough for usual purposes.

[pacollins]

I think we don't need assets/scss/main.min.css, which has been introduced in #78? Compiled and compressed main CSS is already found under exampleSite/resources/_gen.

Good Catch! I have an auto-compiler set up that I forgot to remove when we switched to pipes!

[pacollins]

If you are good, this is ready to be merged.