Skip to content

Commit

Permalink
Flip the colors of the branches
Browse files Browse the repository at this point in the history 
(cherry picked from commit ce45d0e)
  • Loading branch information
@ivangrek @RussKie
ivangrek authored and RussKie committed Feb 22, 2021
1 parent a1b2c5c commit eea10a7
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions GitExtUtils/GitUI/Theming/AppColorDefaults.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ public static class AppColorDefaults
{ AppColor.HighlightAllOccurences, Color.LightYellow },
{ AppColor.Tag, Color.DarkBlue },
{ AppColor.Graph, Color.DarkRed },
{ AppColor.Branch, Color.DarkRed },
{ AppColor.RemoteBranch, Color.Green },
{ AppColor.Branch, Color.Green },
{ AppColor.RemoteBranch, Color.DarkRed },
{ AppColor.DiffSection, Color.FromArgb(230, 230, 230) },
{ AppColor.DiffRemoved, Color.FromArgb(255, 200, 200) },
{ AppColor.DiffRemovedExtra, Color.FromArgb(255, 165, 165) },
Expand Down
2 changes: 1 addition & 1 deletion GitUI/Themes/bright.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/* Application colors */
.Graph { color: #8a0000; } /* hsl(0, 100%, 27%) */
.Graph.colorblind { color: #0600a8; } /* hsl(242, 100%, 33%) */
.Branch { color: #8a0000; } /* hsl(0, 100%, 27%) */
.RemoteBranch { color: #8a0000; } /* hsl(0, 100%, 27%) */
.Branch.colorblind { color: #0600a8; } /* hsl(242, 100%, 33%) */
.DiffRemoved { color: #ffc7c7; } /* hsl(0, 100%, 89%) */
.DiffRemoved.colorblind { color: #94cbff; } /* hsl(209, 100%, 79%) */
Expand Down
4 changes: 2 additions & 2 deletions GitUI/Themes/dark.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
.HighlightAllOccurences { color: #606020; }
.Tag { color: #408080; }
.Graph { color: #882d00; }
.Branch { color: #ff8080; } /* hsl(0, 100%, 75%) */
.Branch { color: #00d76b; }
.Branch.colorblind { color: #0080ff; } /* hsl(210, 100%, 50%) */
.RemoteBranch { color: #00d76b; }
.RemoteBranch { color: #ff8080; } /* hsl(0, 100%, 75%) */
.DiffSection { color: #4f4f4f; }
.DiffRemoved { color: #4b0606; } /* hsl(0, 85%, 16%) */
.DiffRemoved.colorblind { color: #080646; } /* hsl(242, 84%, 15%) */
Expand Down
4 changes: 2 additions & 2 deletions GitUI/Themes/darksilver.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@
.HighlightAllOccurences { color: #606020; }
.Tag { color: #408080; }
.Graph { color: #882d00; }
.RemoteBranch { color: #00d76b; }
.RemoteBranch { color: #ff8080; } /* hsl(0, 100%, 75%) */
.DiffSection { color: #4f4f4f; }
.DiffAdded { color: #054e2a; }
.DiffAddedExtra { color: #058545; }

.Branch { color: #ff8080; } /* hsl(0, 100%, 75%) */
.Branch { color: #00d76b; }
.Branch.colorblind { color: #0080ff; } /* hsl(210, 100%, 50%) */
.DiffRemoved { color: #5a0707; } /* hsl(0, 86%, 19%) */
.DiffRemoved.colorblind { color: #090755; } /* hsl(242, 85%, 18%) */
Expand Down
4 changes: 2 additions & 2 deletions GitUI/Themes/invariant.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
.HighlightAllOccurences { color: #ffffe0; }
.Tag { color: #00008b; }
.Graph { color: #8b0000; }
.Branch { color: #8b0000; }
.RemoteBranch { color: #008000; }
.Branch { color: #008000; }
.RemoteBranch { color: #8b0000; }
.DiffSection { color: #e6e6e6; }
.DiffRemoved { color: #ffc8c8; }
.DiffRemovedExtra { color: #ffa5a5; }
Expand Down

12 comments on commit eea10a7

@gerhardol
Copy link
Member

Choose a reason for hiding this comment

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

Should this really be in 3.5?
With this I get a massive red blob for some repos (when submodule changes are tested on them), green looked better.

Following Git for functionality is one thing, colors and design is another...

@RussKie
Copy link
Member

@RussKie RussKie commented on eea10a7 Feb 23, 2021 via email

Choose a reason for hiding this comment

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

@gerhardol
Copy link
Member

Choose a reason for hiding this comment

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

This has not been more than a few days in master. I am tempted to request a revert in the default setup...
There is not much time for feedback for release candidates.

@pmiossec
Copy link
Member

Choose a reason for hiding this comment

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

@gerhardol Do you have the possibility to share a screenshot so that everyone could make its own point of view on the case you encounter?

@gerhardol
Copy link
Member

Choose a reason for hiding this comment

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

I can add local branches to every commit and flip back the colors, but that is for tonight

@RussKie
Copy link
Member

@RussKie RussKie commented on eea10a7 Feb 23, 2021 via email

Choose a reason for hiding this comment

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

@gerhardol
Copy link
Member

Choose a reason for hiding this comment

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

Any specific reason to carry so many branches?

A "product" repo has certain configuration many submodules consisting of build system, applications and platform functionality.
In other SW, the submodules would basically be libraries. This is embedded SW though, so many changes will affect the configuration and code in the product repo. Some of these updates can take a long time, there are different strategies to prefill caches for these progression builds.
So basically every push to the submodules are testes on the product repo in progression builds, to give feedback to the submodule developers.

So there are a lot of branches in the product repos.
Branch names are generated, often total over 100 chars.
So with this you get a big red text in your face, the green was more welcoming.

@gerhardol
Copy link
Member

Choose a reason for hiding this comment

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

faked labels, it looks more intimating with different names

image

image

@RussKie
Copy link
Member

Choose a reason for hiding this comment

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

image

😉

@pmiossec
Copy link
Member

Choose a reason for hiding this comment

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

When I see that, I think perhaps he wants the same kind of options that we have for repository path:

image

@gerhardol
Copy link
Member

Choose a reason for hiding this comment

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

😉

But I want to see the remote branches...

When I see that, I think perhaps he wants the same kind of options that we have for repository path:

Almost, but there is a tail I omitted "/on/master", "on/release/3.5" so it is not exactly the last part...
Limit to last 32 chars or so would be OK for me.

#8900 looks better though

@RussKie
Copy link
Member

@RussKie RussKie commented on eea10a7 Feb 28, 2021 via email

Choose a reason for hiding this comment

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

Please sign in to comment.