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

Fix kanagawa theme lint and added git gutter colors #5273

Merged
merged 5 commits into from
Dec 28, 2022
Merged

Fix kanagawa theme lint and added git gutter colors #5273

merged 5 commits into from
Dec 28, 2022

Conversation

leonqadirie
Copy link
Contributor

@leonqadirie leonqadirie commented Dec 24, 2022

This comprises 4 changes:

  1. added "sumiInk3" as ui.cursorline.primary bg color (in line with original)
  2. swapped the cursor bg and fg colors (to maintain readability with cursorline; now in line with original)
  3. added ui.menu and ui.menu.selected colors (should be close to original)
  4. separated ui.selection and ui.selection.primary

@zetashift please take a look; especially regarding my choice of color for change 4.

--
Edit: now 8 changes:
5. added the theme's official git gutter colors to address kanagawa's share of #4972
6. added "sumiInk4" as ui.virtual.indent-guide
7. added "roninYellow" as ui.linenr.selected
8. set ui.help bg to "sumiInk1"

Comprises 4 changes:
1. added "sumiInk3" as ui.cursorline.primary bg color
2. switched the cursor bg and fg colors (now in line with original theme)
3. added ui.menu and ui.selected colors
4. separated ui.selection and ui.selection.primary
In line with original:
autumnGreen for adds
autumnRed for deletes
autumnYellow for changes
@leonqadirie leonqadirie changed the title Fix kanagawa theme lint Fix kanagawa theme lint and added git gutter colors Dec 24, 2022
@the-mikedavis the-mikedavis added A-theme Area: Theme and appearence related S-waiting-on-review Status: Awaiting review from a maintainer. labels Dec 24, 2022
* indent-guides are sumiInk4
* Add ui.linenr.selected is roninYellow
Copy link
Contributor

@zetashift zetashift left a comment

Choose a reason for hiding this comment

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

Sorry for the late review, I was sick for a bit.

Just for some more context, when I made the initial version, it was a crude attempt, because I don't know all that much about the Helix options.

These changes look good to me however, I like the Git additions.

EDIT: I am no official reviewer tho, so I'll wait till somebody with rights can look at this

@the-mikedavis the-mikedavis merged commit 7ac72a3 into helix-editor:master Dec 28, 2022
@leonqadirie leonqadirie deleted the fix-kanagawa-theme-lint branch December 28, 2022 12:07
semin-park pushed a commit to semin-park/helix that referenced this pull request Jan 4, 2023
* Fix kanagawa theme lint

Comprises 4 changes:
1. added "sumiInk3" as ui.cursorline.primary bg color
2. switched the cursor bg and fg colors (now in line with original theme)
3. added ui.menu and ui.selected colors
4. separated ui.selection and ui.selection.primary

* Add git gutter colors to kanagawa theme

In line with original:
autumnGreen for adds
autumnRed for deletes
autumnYellow for changes

* Add indent-guides and linenr.selected to kanagawa

* indent-guides are sumiInk4
* Add ui.linenr.selected is roninYellow

* Set ui.help bg to sumiInk1
hadronized pushed a commit to hadronized/helix that referenced this pull request Jan 4, 2023
* Fix kanagawa theme lint

Comprises 4 changes:
1. added "sumiInk3" as ui.cursorline.primary bg color
2. switched the cursor bg and fg colors (now in line with original theme)
3. added ui.menu and ui.selected colors
4. separated ui.selection and ui.selection.primary

* Add git gutter colors to kanagawa theme

In line with original:
autumnGreen for adds
autumnRed for deletes
autumnYellow for changes

* Add indent-guides and linenr.selected to kanagawa

* indent-guides are sumiInk4
* Add ui.linenr.selected is roninYellow

* Set ui.help bg to sumiInk1
freqmod pushed a commit to freqmod/helix that referenced this pull request Feb 8, 2023
* Fix kanagawa theme lint

Comprises 4 changes:
1. added "sumiInk3" as ui.cursorline.primary bg color
2. switched the cursor bg and fg colors (now in line with original theme)
3. added ui.menu and ui.selected colors
4. separated ui.selection and ui.selection.primary

* Add git gutter colors to kanagawa theme

In line with original:
autumnGreen for adds
autumnRed for deletes
autumnYellow for changes

* Add indent-guides and linenr.selected to kanagawa

* indent-guides are sumiInk4
* Add ui.linenr.selected is roninYellow

* Set ui.help bg to sumiInk1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-theme Area: Theme and appearence related S-waiting-on-review Status: Awaiting review from a maintainer.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants