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.

Sign up for GitHub

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

Jump to bottom

Improves theme following on webviews #3737

Merged
merged 2 commits into from
Nov 13, 2024
Merged

Improves theme following on webviews #3737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d09bdbf
Improves theme following on webviews
nzaytsev Nov 13, 2024
93e7f6a
Prevents extra utility classes being loaded
d13 Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/webviews/apps/commitDetails/commitDetails.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
@use '../shared/styles/details-base';
@use '../shared/styles/utils';

.vscode-high-contrast,
.vscode-dark {
@include utils.dark-theme {
--gl-color-background-counter: #fff;
}

.vscode-high-contrast-light,
.vscode-light {
@include utils.light-theme {
--gl-color-background-counter: #000;
}

Expand Down
12 changes: 8 additions & 4 deletions src/webviews/apps/commitDetails/components/commit-action.css.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,21 @@ export const commitActionStyles = css`
text-decoration: none;
}

:host-context(.vscode-dark) .commit-action:hover {
:host-context(.vscode-dark) .commit-action:hover,
:host-context(.vscode-high-contrast:not(.vscode-high-contrast-light)) .commit-action:hover {
background-color: var(--color-background--lighten-15);
}
:host-context(.vscode-light) .commit-action:hover {
:host-context(.vscode-light) .commit-action:hover,
:host-context(.vscode-high-contrast-light) .commit-action:hover {
background-color: var(--color-background--darken-15);
}

:host-context(.vscode-dark) .commit-action.is-active {
:host-context(.vscode-dark) .commit-action.is-active,
:host-context(.vscode-high-contrast:not(.vscode-high-contrast-light)) .commit-action.is-active {
background-color: var(--color-background--lighten-10);
}
:host-context(.vscode-light) .commit-action.is-active {
:host-context(.vscode-light) .commit-action.is-active,
:host-context(.vscode-high-contrast-light) .commit-action.is-active {
background-color: var(--color-background--darken-10);
}

Expand Down
7 changes: 3 additions & 4 deletions src/webviews/apps/home/home.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
@use '../shared/styles/properties';
@use '../shared/styles/theme';
@use '../shared/styles/scrollbars';
@use '../shared/styles/utils';

.vscode-high-contrast,
.vscode-dark {
@include utils.dark-theme {
--popover-bg: var(--color-background--lighten-15);
--gl-card-background: color-mix(in lab, var(--vscode-sideBar-background) 100%, #fff 6%);
}

.vscode-high-contrast-light,
.vscode-light {
@include utils.light-theme {
--popover-bg: var(--color-background--darken-15);
--gl-card-background: color-mix(in lab, var(--vscode-sideBar-background) 100%, #000 4%);
}
Expand Down
11 changes: 5 additions & 6 deletions src/webviews/apps/plus/graph/graph.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use '../../shared/styles/theme';
@use '../../shared/styles/utils';
@import '../../shared/base';
@import '../../shared/codicons';
@import '../../shared/glicons';
Expand All @@ -18,14 +19,12 @@ menu-list {
}
}

.vscode-high-contrast,
.vscode-dark {
@include utils.dark-theme {
--popover-bg: var(--color-background--lighten-15);
--titlebar-bg: var(--color-background--lighten-075);
}

.vscode-high-contrast-light,
.vscode-light {
@include utils.light-theme {
--popover-bg: var(--color-background--darken-15);
--titlebar-bg: var(--color-background--darken-075);
}
Expand Down Expand Up @@ -120,15 +119,15 @@ menu-list {
--graph-column-scrollbar-thickness: 14px;
}

:root:has(.vscode-dark, .vscode-high-contrast) {
@include utils.dark-theme($selectorPrefix: ':root:has(', $selectorPostfix: ')') {
--graph-theme-opacity-factor: '1';

--color-graph-actionbar-background: color-mix(in srgb, #fff 5%, var(--color-background));
--color-graph-background: color-mix(in srgb, #fff 5%, var(--color-background));
--color-graph-background2: color-mix(in srgb, #fff 10%, var(--color-background));
}

:root:has(.vscode-light, .vscode-high-contrast-light) {
@include utils.light-theme($selectorPrefix: ':root:has(', $selectorPostfix: ')') {
--graph-theme-opacity-factor: '0.5';

--color-graph-actionbar-background: color-mix(in srgb, #000 5%, var(--color-background));
Expand Down
9 changes: 5 additions & 4 deletions src/webviews/apps/plus/patchDetails/patchDetails.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use '../../shared/styles/details-base';
@use '../../shared/styles/utils';

body {
--gk-menu-border-color: var(--vscode-menu-border);
Expand Down Expand Up @@ -48,19 +49,19 @@ gk-menu-item {
color: var(--vscode-foreground);
text-decoration: none;

.vscode-dark & {
@include utils.dark-theme($selectorPostfix: ' &') {
background-color: var(--color-background--lighten-15);
}
.vscode-light & {
@include utils.light-theme($selectorPostfix: ' &') {
background-color: var(--color-background--darken-15);
}
}

&.is-active {
.vscode-dark & {
@include utils.dark-theme($selectorPostfix: ' &') {
background-color: var(--color-background--lighten-10);
}
.vscode-light & {
@include utils.light-theme($selectorPostfix: ' &') {
background-color: var(--color-background--darken-10);
}
}
Expand Down
6 changes: 6 additions & 0 deletions src/webviews/apps/plus/shared/components/home-account-content.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ export class GLHomeAccountContent extends LitElement {
:host {
display: block;
margin-bottom: 1.3rem;
--gl-accordion-content-background: var(--vscode-sideBar-background);
--gl-accordion-header-background: var(--vscode-sideBarSectionHeader-background);
}

:host > * {
Expand All @@ -47,6 +49,10 @@ export class GLHomeAccountContent extends LitElement {
margin-bottom: 1.3rem;
}

gl-accordion {
border-top: 1px solid var(--vscode-sideBarSectionHeader-border);
}

.header {
display: flex;
align-items: center;
Expand Down
22 changes: 12 additions & 10 deletions src/webviews/apps/plus/timeline/chart.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use '../../shared/styles/utils';

.bb {
svg {
// font-size: 12px;
Expand All @@ -14,11 +16,11 @@
}

path.domain {
.vscode-dark & {
@include utils.dark-theme($selectorPostfix: ' &') {
stroke: var(--color-background--lighten-15);
}

.vscode-light & {
@include utils.light-theme($selectorPostfix: ' &') {
stroke: var(--color-background--darken-15);
}
}
Expand Down Expand Up @@ -93,15 +95,15 @@
pointer-events: none;

line {
.vscode-dark & {
@include utils.dark-theme($selectorPostfix: ' &') {
stroke: var(--color-background--lighten-05);

&.bb-ygrid {
stroke: var(--color-background--lighten-05);
}
}

.vscode-light & {
@include utils.light-theme($selectorPostfix: ' &') {
stroke: var(--color-background--darken-05);

&.bb-ygrid {
Expand All @@ -126,10 +128,10 @@

.bb-xgrid-focus {
line {
.vscode-dark & {
@include utils.dark-theme($selectorPostfix: ' &') {
stroke: var(--color-background--lighten-30);
}
.vscode-light & {
@include utils.light-theme($selectorPostfix: ' &') {
stroke: var(--color-background--darken-30);
}
}
Expand Down Expand Up @@ -173,11 +175,11 @@
// .bb-selected-circle {
// stroke-width: 2px;

// .vscode-dark & {
// @include utils.dark-theme($selectorPostfix: " &") {
// fill: rgba(255, 255, 255, 0.2);
// }

// .vscode-light & {
// @include utils.light-theme($selectorPostfix: " &") {
// fill: rgba(0, 0, 0, 0.1);
// }
// }
Expand Down Expand Up @@ -233,12 +235,12 @@

/*-- Zoom region --*/
.bb-zoom-brush {
.vscode-dark & {
@include utils.dark-theme($selectorPostfix: ' &') {
fill: white;
fill-opacity: 0.2;
}

.vscode-light & {
@include utils.light-theme($selectorPostfix: ' &') {
fill: black;
fill-opacity: 0.1;
}
Expand Down
7 changes: 3 additions & 4 deletions src/webviews/apps/plus/timeline/timeline.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
@use '../../shared/styles/properties';
@use '../../shared/styles/theme';
@use '../../shared/styles/utils';

* {
box-sizing: border-box;
}

.vscode-high-contrast,
.vscode-dark {
@include utils.dark-theme {
--progress-bar-color: var(--color-background--lighten-15);
--card-background: var(--color-background--lighten-075);
--card-hover-background: var(--color-background--lighten-10);
--popover-bg: var(--color-background--lighten-15);
}

.vscode-high-contrast-light,
.vscode-light {
@include utils.light-theme {
--progress-bar-color: var(--color-background--darken-15);
--card-background: var(--color-background--darken-075);
--card-hover-background: var(--color-background--darken-10);
Expand Down
37 changes: 27 additions & 10 deletions src/webviews/apps/rebase/rebase.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use '../shared/styles/theme';
@use '../shared/styles/utils';
@import '../shared/base';
@import '../shared/buttons';
@import '../shared/utils';
Expand All @@ -8,12 +9,15 @@ body {
overflow: overlay;
}

.vscode-dark {
@include utils.dark-theme {
--avatar-bg: var(--color-background--lighten-30);
}
.vscode-light {
--avatar-bg: var(--color-background--darken-30);
}
.vscode-high-contrast-light {
--avatar-bg: var(--color-foreground--50);
}

.container {
display: grid;
Expand Down Expand Up @@ -163,10 +167,10 @@ $entry-padding: 7px;
top: 0;
transform: translateX(-50%);

.vscode-dark & {
@include utils.dark-theme($selectorPostfix: ' &') {
border-right-color: var(--color-background--lighten-15);
}
.vscode-light & {
@include utils.light-theme($selectorPostfix: ' &') {
border-right-color: var(--color-background--darken-15);
}
}
Expand Down Expand Up @@ -313,12 +317,12 @@ $entry-padding: 7px;
.entry-blocked {
width: 100%;

.vscode-dark & {
@include utils.dark-theme($selectorPostfix: ' &') {
background: rgba(255, 255, 255, 0.1);
box-shadow: 0px -1px 0px 0px rgba(255, 255, 255, 0.2);
}

.vscode-light & {
@include utils.light-theme($selectorPostfix: ' &') {
background: rgba(0, 0, 0, 0.1);
box-shadow: 0px -1px 0px 0px rgba(0, 0, 0, 0.2);
}
Expand All @@ -342,11 +346,11 @@ $entry-padding: 7px;
margin-left: 10px;
cursor: ns-resize;

.vscode-dark & {
@include utils.dark-theme($selectorPostfix: ' &') {
border-color: var(--color-foreground--75);
}

.vscode-light & {
@include utils.light-theme($selectorPostfix: ' &') {
border-color: var(--color-foreground--75);
}
}
Expand Down Expand Up @@ -416,7 +420,7 @@ $entry-padding: 7px;
margin: 0 10px;
opacity: 0.5;

.vscode-light & {
@include utils.light-theme($selectorPostfix: ' &') {
opacity: 0.6;
}

Expand Down Expand Up @@ -475,8 +479,18 @@ $entry-padding: 7px;
display: block;
flex: none;
border-radius: 1em;
background-color: var(--color-background--lighten-075);
border: 1px solid var(--color-background--lighten-075);
.vscode-dark & {
background-color: var(--color-background--lighten-075);
border: 1px solid var(--color-background--lighten-075);
}
.vscode-light & {
background-color: var(--color-background--darken-075);
border: 1px solid var(--color-background--darken-075);
}
.vscode-high-contrast & {
background-color: none;
border: 1px solid var(--color-foreground);
}

&::before {
content: '';
Expand All @@ -487,6 +501,9 @@ $entry-padding: 7px;
height: 1.2em;
border-radius: 100%;
background-color: var(--color-button-foreground);
.vscode-high-contrast-light :not(:checked) ~ & {
background-color: var(--color-foreground);
}

:checked ~ & {
transform: translateX(1em);
Expand Down
Loading
Loading