Skip to content

Commit e886bf5

Browse files
d13eamodio
authored andcommitted
Updates themes for composer items EVEN MORE
1 parent 6c09d23 commit e886bf5

File tree

4 files changed

+17
-12
lines changed

4 files changed

+17
-12
lines changed

src/webviews/apps/plus/composer/components/commit-item.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ export class CommitItem extends LitElement {
137137
<div class="composer-item__body change-stats">
138138
<div class="file-count">${this.fileCount} ${this.fileCount === 1 ? 'file' : 'files'}</div>
139139
<div class="diff-stats">
140-
<span class="additions">+${this.additions}</span>
141-
<span class="deletions">-${this.deletions}</span>
140+
<span class="diff-stats__additions">+${this.additions}</span>
141+
<span class="diff-stats__deletions">-${this.deletions}</span>
142142
</div>
143143
</div>
144144
</div>

src/webviews/apps/plus/composer/components/commits-panel.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -924,8 +924,8 @@ export class CommitsPanel extends LitElement {
924924
>${section.fileCount} ${section.fileCount === 1 ? 'file' : 'files'}</span
925925
>
926926
<span class="diff-stats">
927-
<span class="additions">+${section.changes.additions}</span>
928-
<span class="deletions">-${section.changes.deletions}</span>
927+
<span class="diff-stats__additions">+${section.changes.additions}</span>
928+
<span class="diff-stats__deletions">-${section.changes.deletions}</span>
929929
</span>
930930
</div>
931931
${when(

src/webviews/apps/plus/composer/components/composer.css.ts

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ export const composerItemStyles = css`
1010
--composer-item-background: var(--composer-background-05);
1111
--composer-item-border: transparent;
1212
--composer-item-radius: 1.2rem;
13-
/* --composer-item-border: var(--vscode-contrastActiveBorder, var(--vscode-list-inactiveFocusOutline)); */
1413
--composer-item-color: var(--vscode-foreground);
1514
--composer-item-icon-color: var(--vscode-icon-foreground);
1615
@@ -31,13 +30,9 @@ export const composerItemStyles = css`
3130
}
3231
3332
.composer-item.is-selected {
34-
--composer-item-background: var(--vscode-list-activeSelectionBackground var(--vscode-background));
33+
--composer-item-background: var(--vscode-list-activeSelectionBackground, var(--color-background));
3534
--composer-item-icon-color: var(--vscode-list-activeSelectionForeground, var(--vscode-foreground));
3635
--composer-item-color: var(--vscode-list-activeSelectionForeground);
37-
/* --composer-item-border: var(
38-
--vscode-list-focusAndSelectionOutline,
39-
var(--vscode-contrastActiveBorder, var(--vscode-list-focusOutline))
40-
); */
4136
}
4237
4338
:host-context(.vscode-high-contrast) .composer-item.is-selected {
@@ -186,11 +181,19 @@ export const composerItemContentStyles = css`
186181
font-weight: 500;
187182
}
188183
189-
.diff-stats .additions {
184+
.diff-stats__additions {
190185
color: var(--vscode-gitDecoration-addedResourceForeground);
186+
color: light-dark(
187+
color-mix(in srgb, #fff 40%, var(--vscode-gitDecoration-addedResourceForeground)),
188+
var(--vscode-gitDecoration-addedResourceForeground)
189+
);
191190
}
192191
193-
.diff-stats .deletions {
192+
.diff-stats__deletions {
194193
color: var(--vscode-gitDecoration-deletedResourceForeground);
194+
color: light-dark(
195+
color-mix(in srgb, #fff 40%, var(--vscode-gitDecoration-deletedResourceForeground)),
196+
var(--vscode-gitDecoration-deletedResourceForeground)
197+
);
195198
}
196199
`;

src/webviews/apps/plus/composer/composer.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
@use '../../shared/styles/utils';
66

77
@include utils.dark-theme {
8+
color-scheme: dark;
89
--composer-background-05: var(--color-background--lighten-05);
910
}
1011
@include utils.light-theme {
12+
color-scheme: light;
1113
--composer-background-05: var(--color-background--darken-05);
1214
}
1315

0 commit comments

Comments
 (0)