Skip to content

Commit f7cf6d5

Browse files
committed
Extensions for web app.
1 parent d49ab80 commit f7cf6d5

11 files changed

Lines changed: 283 additions & 23 deletions

File tree

core/App.css

Lines changed: 50 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
--codiff-font-sans:
3333
Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
3434
--codiff-link: var(--tree-selection-focus);
35+
--codiff-tree-color-scheme: light;
3536
--danger: #a33a3a;
3637
--diff-addition: rgb(31 122 68);
3738
--diff-deletion: rgb(184 49 47);
@@ -60,6 +61,7 @@
6061
--app-bg: #141414;
6162
--code-bg: #1c1c1c;
6263
--codiff-link: var(--tree-selection-focus);
64+
--codiff-tree-color-scheme: dark;
6365
--danger: #e07878;
6466
--diff-addition: rgb(111 208 148);
6567
--diff-deletion: rgb(238 126 126);
@@ -82,10 +84,13 @@
8284
}
8385
}
8486

85-
:root[data-theme='light'] {
87+
:root[data-theme='light'],
88+
.app-shell[data-theme='light'],
89+
.plan-shell[data-theme='light'] {
8690
--app-bg: #f8f8f6;
8791
--code-bg: #ffffff;
8892
--codiff-link: var(--tree-selection-focus);
93+
--codiff-tree-color-scheme: light;
8994
--danger: #a33a3a;
9095
--diff-addition: rgb(31 122 68);
9196
--diff-deletion: rgb(184 49 47);
@@ -107,10 +112,13 @@
107112
color-scheme: light;
108113
}
109114

110-
:root[data-theme='dark'] {
115+
:root[data-theme='dark'],
116+
.app-shell[data-theme='dark'],
117+
.plan-shell[data-theme='dark'] {
111118
--app-bg: #141414;
112119
--code-bg: #1c1c1c;
113120
--codiff-link: var(--tree-selection-focus);
121+
--codiff-tree-color-scheme: dark;
114122
--danger: #e07878;
115123
--diff-addition: rgb(111 208 148);
116124
--diff-deletion: rgb(238 126 126);
@@ -359,7 +367,6 @@ html[data-codiff-platform='darwin'] .plan-header {
359367
.plan-comment-add:hover {
360368
background: color-mix(in srgb, var(--sidebar-ref) 12%, var(--code-bg));
361369
box-shadow:
362-
0 0 0 1px rgb(255 255 255 / 0.2) inset,
363370
0 10px 32px -24px rgb(0 0 0 / 0.92),
364371
0 8px 20px -16px rgb(0 0 0 / 0.82);
365372
transform: translateY(-2px) scale(1.08);
@@ -1092,6 +1099,16 @@ html[data-codiff-platform='darwin'] .sidebar {
10921099
opacity: 0.45;
10931100
}
10941101

1102+
.sidebar-settings-bar {
1103+
align-items: center;
1104+
border-top: 1px solid var(--sidebar-border);
1105+
display: flex;
1106+
flex: none;
1107+
height: 38px;
1108+
min-height: 38px;
1109+
padding: 4px 8px;
1110+
}
1111+
10951112
.sidebar-search {
10961113
-webkit-app-region: no-drag;
10971114
background: rgb(127 127 127 / 0.1);
@@ -1454,7 +1471,6 @@ html[data-codiff-platform='darwin'] .sidebar {
14541471
.commit-details-copy:hover {
14551472
background: rgb(127 127 127 / 0.11);
14561473
box-shadow:
1457-
0 0 0 1px rgb(255 255 255 / 0.2) inset,
14581474
0 10px 32px -24px rgb(0 0 0 / 0.92),
14591475
0 8px 20px -16px rgb(0 0 0 / 0.82);
14601476
color: var(--sidebar-ref);
@@ -1720,6 +1736,25 @@ html[data-codiff-platform='darwin'] .sidebar {
17201736
padding: 0 8px 8px 50px;
17211737
}
17221738

1739+
.codiff-source-description-footer-row {
1740+
align-items: stretch;
1741+
display: grid;
1742+
gap: 8px;
1743+
grid-template-columns: minmax(0, 1fr) minmax(260px, 320px);
1744+
}
1745+
1746+
.codiff-source-description-footer-main,
1747+
.codiff-source-description-footer-aside {
1748+
display: flex;
1749+
flex-direction: column;
1750+
min-width: 0;
1751+
}
1752+
1753+
.codiff-source-description-footer-main > *,
1754+
.codiff-source-description-footer-aside > * {
1755+
flex: 1;
1756+
}
1757+
17231758
.source-description-comment-anonymous + .codiff-source-description-footer {
17241759
padding-left: 8px;
17251760
}
@@ -1778,12 +1813,16 @@ html[data-codiff-platform='darwin'] .sidebar {
17781813
}
17791814

17801815
.pull-request-merge-panel {
1781-
display: block;
1816+
display: flex;
1817+
flex-direction: column;
1818+
min-height: 0;
17821819
}
17831820

17841821
.pull-request-merge-content {
17851822
display: flex;
1823+
flex: 1;
17861824
flex-direction: column;
1825+
min-height: 0;
17871826
min-width: 0;
17881827
}
17891828

@@ -1861,6 +1900,7 @@ html[data-codiff-platform='darwin'] .sidebar {
18611900
.pull-request-merge-controls {
18621901
border-top: 1px solid var(--file-border);
18631902
justify-content: flex-end;
1903+
margin-top: auto;
18641904
padding: 8px;
18651905
}
18661906

@@ -1917,7 +1957,11 @@ html[data-codiff-platform='darwin'] .sidebar {
19171957
color: var(--text);
19181958
}
19191959

1920-
@media (max-width: 760px) {
1960+
@media (max-width: 1024px) {
1961+
.codiff-source-description-footer-row {
1962+
grid-template-columns: minmax(0, 1fr);
1963+
}
1964+
19211965
.pull-request-merge-controls,
19221966
.pull-request-merge-actions {
19231967
justify-content: flex-start;
@@ -2936,7 +2980,6 @@ html[data-codiff-platform='darwin'] .sidebar {
29362980

29372981
.codiff-open-button:hover:not(:disabled) {
29382982
box-shadow:
2939-
0 0 0 1px rgb(255 255 255 / 0.2) inset,
29402983
0 10px 32px -24px rgb(0 0 0 / 0.92),
29412984
0 8px 20px -16px rgb(0 0 0 / 0.82);
29422985
transform: scale(1.05);
@@ -3178,7 +3221,6 @@ diffs-container .review-comment-thread {
31783221
.review-comment-action:not(:disabled):hover {
31793222
background: rgb(127 127 127 / 0.12);
31803223
box-shadow:
3181-
0 0 0 1px rgb(255 255 255 / 0.2) inset,
31823224
0 10px 32px -24px rgb(0 0 0 / 0.92),
31833225
0 8px 20px -16px rgb(0 0 0 / 0.82);
31843226
transform: scale(1.05);
@@ -3461,7 +3503,6 @@ diffs-container .review-comment-thread {
34613503

34623504
.copy-comments-button:hover {
34633505
box-shadow:
3464-
0 0 0 1px rgb(255 255 255 / 0.2) inset,
34653506
0 0 0 1px var(--file-border),
34663507
0 26px 96px -48px rgb(0 0 0 / 0.92),
34673508
0 22px 62px -30px rgb(0 0 0 / 0.82),
@@ -3596,7 +3637,6 @@ diffs-container .review-comment-thread {
35963637

35973638
.empty-panel-actions button:hover:not(:disabled) {
35983639
box-shadow:
3599-
0 0 0 1px rgb(255 255 255 / 0.2) inset,
36003640
0 10px 32px -24px rgb(0 0 0 / 0.92),
36013641
0 8px 20px -16px rgb(0 0 0 / 0.82);
36023642
transform: scale(1.05);

core/App.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2362,6 +2362,7 @@ export default function App() {
23622362
reviewStatus={state.source.type === 'pull-request' ? state.source.reviewStatus : undefined}
23632363
/>
23642364
) : undefined,
2365+
theme: preferences.theme,
23652366
viewed,
23662367
wordWrap,
23672368
};

0 commit comments

Comments
 (0)