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

Update to chameleon theme #1138

Merged
merged 1 commit into from
Aug 1, 2022

Conversation

AirOnSkin
Copy link
Contributor

Hey @dandavison, here's an update for the chameleon theme after some time working with it. I've also added some merge conflict config.

This is how a normal diff looks:
ksnip_20220726-125310

This is how the merge conflict looks:
ksnip_20220726-131154

@AirOnSkin
Copy link
Contributor Author

I've removed all comments that are part of my config because other themes don't have them either, but as a reference I'll add them here:

[delta "chameleon"]
    # features
    dark = true
    line-numbers = true
    side-by-side = true
    keep-plus-minus-markers = false
    syntax-theme = Nord

    # file style
    file-style = "#434C5E" bold
    file-decoration-style = "#434C5E" ul
    file-added-label = [+]
    file-copied-label = [==]
    file-modified-label = [*]
    file-removed-label = [-]
    file-renamed-label = [->]

    # hunk header style
    hunk-header-style = omit

    # line numbers style
    line-numbers-left-format = " {nm:>3} │"
    line-numbers-left-style = red
    line-numbers-right-format = " {np:>3} │"
    line-numbers-right-style = green
    line-numbers-minus-style = red italic black
    line-numbers-plus-style = green italic black
    line-numbers-zero-style = "#434C5E" italic

    # diff style
    minus-style = bold red # line removed
    minus-emph-style = bold "#202020" "#FF5555" # changed part of line
    minus-non-emph-style = bold # changed line backdrop
    plus-style = bold green # line added
    plus-emph-style = bold "#202020" "#50FA7B" # changed part of line
    plus-non-emph-style = bold # changed line backdrop

    # unchanged lines style
    zero-style = syntax

    # style for git blame (Nord theme colors)
    blame-code-style = syntax
    blame-format = "{author:<18} ({commit:>9}) {timestamp:^16}"
    blame-palette = "#2E3440" "#3B4252" "#434C5E" "#4C566A"

    # merge conflict style (Nord theme colors)
    merge-conflict-begin-symbol = ~
    merge-conflict-end-symbol = ~
    merge-conflict-ours-diff-header-style = "#F1FA8C" bold
    merge-conflict-ours-diff-header-decoration-style = "#434C5E" box
    merge-conflict-theirs-diff-header-style = "#F1FA8C" bold
    merge-conflict-theirs-diff-header-decoration-style = "#434C5E" box

@dandavison dandavison merged commit 2d739d1 into dandavison:master Aug 1, 2022
@dandavison
Copy link
Owner

Very nice, thanks @AirOnSkin!

@AirOnSkin AirOnSkin deleted the chameleon-theme-update branch August 2, 2022 05:34
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.

None yet

2 participants