Skip to content

Commit 838fa1c

Browse files
committed
Fixes button colors on welcome/settings pages
They now follow the theme properly
1 parent f5c6905 commit 838fa1c

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
66

7+
## [Unreleased]
8+
### Fixed
9+
- Fixes button colors on the Welcome and Settings pages to follow the color theme properly
10+
711
## [8.0.1] - 2018-02-18
812
### Added
913
- Adds *Compare Index (HEAD) with Branch or Tag...* (`gitlens.explorers.diffHeadWithBranch`) command - compares the index (HEAD) to the selected branch or tag — thanks to [PR #278](https://github.com/eamodio/vscode-gitlens/pull/278) by Geoffrey ([@g3offrey](https://github.com/g3offrey))!

src/ui/scss/main.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ ul {
190190
}
191191

192192
.button--flat-primary {
193-
background-color: #914db3;
194-
border: 1px solid #914db3;
193+
background-color: var(--link-color--darken-20);
194+
border: 1px solid var(--link-color--darken-20);
195195
color: white !important;
196196
font-weight: 600;
197197
transition: background-color 250ms, border-color 250ms, color 250ms;
@@ -309,8 +309,8 @@ ul {
309309
}
310310

311311
.changelog__version {
312-
background-color: #914db3;
313-
border-bottom: 2px solid #914db3;
312+
background-color: var(--link-color--darken-20);
313+
border-bottom: 2px solid var(--link-color--darken-20);
314314
border-radius: 3px;
315315
color: #f2f2f2;
316316
margin: 0 0.25em;

src/ui/shared/colors.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ export function initializeColorPalette() {
4646
bodyStyle.setProperty('--background-color--darken-15', darken(color, 15));
4747
bodyStyle.setProperty('--background-color--lighten-30', lighten(color, 30));
4848
bodyStyle.setProperty('--background-color--darken-30', darken(color, 30));
49+
50+
color = computedStyle.getPropertyValue('--link-color').trim();
51+
bodyStyle.setProperty('--link-color--darken-20', darken(color, 20));
4952
};
5053

5154
const observer = new MutationObserver(onColorThemeChanged);

0 commit comments

Comments
 (0)