Skip to content

Commit 30fb16b

Browse files
authored
Merge pull request #13130 from gitbutlerapp/add-change-status-tokens
fix(ui): add change status tokens
2 parents f582c0a + 36406a8 commit 30fb16b

6 files changed

Lines changed: 17 additions & 25 deletions

File tree

apps/desktop/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"devDependencies": {
2222
"@anthropic-ai/sdk": "^0.80.0",
2323
"@gitbutler/core": "workspace:*",
24-
"@gitbutler/design-core": "2.0.0",
24+
"@gitbutler/design-core": "2.2.1",
2525
"@gitbutler/shared": "workspace:*",
2626
"@gitbutler/svelte-comment-injector": "workspace:*",
2727
"@gitbutler/ui": "workspace:*",

apps/web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"devDependencies": {
1717
"@csstools/postcss-global-data": "^3.0.0",
1818
"@gitbutler/core": "workspace:*",
19-
"@gitbutler/design-core": "2.0.0",
19+
"@gitbutler/design-core": "2.2.1",
2020
"@gitbutler/shared": "workspace:*",
2121
"@gitbutler/ui": "workspace:*",
2222
"@playwright/test": "1.58.2",

packages/ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
},
3535
"devDependencies": {
3636
"@csstools/postcss-bundler": "^2.0.8",
37-
"@gitbutler/design-core": "2.0.0",
37+
"@gitbutler/design-core": "2.2.1",
3838
"@playwright/experimental-ct-svelte": "^1.58.2",
3939
"@storybook/addon-docs": "^10.2.19",
4040
"@storybook/addon-links": "^10.2.19",

packages/ui/src/lib/components/file/FileListItem.svelte

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -300,14 +300,6 @@
300300
color: var(--fill-pop-fg);
301301
}
302302
303-
/* &.notched {
304-
padding-left: 18px;
305-
}
306-
307-
&.notched .draggable-handle {
308-
left: 8px;
309-
} */
310-
311303
& .draggable-handle {
312304
display: none;
313305
position: absolute;
@@ -352,7 +344,7 @@
352344
353345
& .locked {
354346
display: flex;
355-
color: var(--fill-warn-bg);
347+
color: var(--change-status-modification);
356348
}
357349
}
358350
</style>

packages/ui/src/lib/components/file/FileStatusBadge.svelte

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,16 +92,16 @@
9292
9393
/* MODIFIERS */
9494
.status-dot-wrap.added {
95-
--file-dot-color: var(--fill-safe-bg);
95+
--file-dot-color: var(--change-status-addition);
9696
}
9797
.status-dot-wrap.modified {
98-
--file-dot-color: var(--fill-warn-bg);
98+
--file-dot-color: var(--change-status-modification);
9999
}
100100
.status-dot-wrap.deleted {
101-
--file-dot-color: var(--fill-danger-bg);
101+
--file-dot-color: var(--change-status-deletion);
102102
}
103103
.status-dot-wrap.renamed {
104-
--file-dot-color: var(--fill-purple-bg);
104+
--file-dot-color: var(--change-status-rename);
105105
}
106106
107107
/* FULL-LARGE VARIANT */

pnpm-lock.yaml

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)