Skip to content

Commit f765ae1

Browse files
committed
Make status section scrollable
Fixes #5947
1 parent 45710f8 commit f765ae1

File tree

2 files changed

+42
-36
lines changed

2 files changed

+42
-36
lines changed

webviews/components/merge.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ export const MergeSelect = React.forwardRef<HTMLSelectElement, MergeSelectProps>
509509
);
510510

511511
const StatusCheckDetails = ( { statuses }: { statuses: PullRequestCheckStatus[] }) => (
512-
<div>
512+
<div className='status-scroll'>
513513
{statuses.map(s => (
514514
<div key={s.id} className="status-check">
515515
<div className="status-check-details">

webviews/editorWebview/index.css

+41-35
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ body .comment-container.review {
132132
position: relative;
133133
}
134134

135-
body #main > .comment-container > .review-comment-container > .review-comment-header:not(:nth-last-child(2)) {
135+
body #main>.comment-container>.review-comment-container>.review-comment-header:not(:nth-last-child(2)) {
136136
border-bottom: 1px solid var(--vscode-editorHoverWidget-border);
137137
}
138138

@@ -178,6 +178,11 @@ body .comment-container .review-comment-header {
178178
height: 14px;
179179
}
180180

181+
.status-scroll {
182+
max-height: 220px;
183+
overflow-y: auto;
184+
}
185+
181186
.status-check {
182187
display: flex;
183188
align-items: center;
@@ -325,11 +330,11 @@ button.input-box {
325330
border-bottom-right-radius: 3px;
326331
}
327332

328-
#status-checks .merge-select-container > * {
333+
#status-checks .merge-select-container>* {
329334
margin-right: 5px;
330335
}
331336

332-
#status-checks .merge-select-container > select {
337+
#status-checks .merge-select-container>select {
333338
margin-left: 5px;
334339
}
335340

@@ -343,10 +348,10 @@ button.input-box {
343348
padding: 16px;
344349
}
345350

346-
body .comment-container .review-comment-header > span,
347-
body .comment-container .review-comment-header > a,
348-
body .commit .commit-message > a,
349-
body .merged .merged-message > a {
351+
body .comment-container .review-comment-header>span,
352+
body .comment-container .review-comment-header>a,
353+
body .commit .commit-message>a,
354+
body .merged .merged-message>a {
350355
margin-right: 6px;
351356
}
352357

@@ -370,7 +375,8 @@ body .diff .diffPath {
370375
margin-right: 4px;
371376
}
372377

373-
.comment-container form, #merge-comment-form {
378+
.comment-container form,
379+
#merge-comment-form {
374380
padding: 16px;
375381
background-color: var(--vscode-editorWidget-background);
376382
}
@@ -388,16 +394,16 @@ body .comment-container .review-comment-container .review-comment-body {
388394
border: none;
389395
}
390396

391-
body .comment-container .comment-body > p,
392-
body .comment-container .comment-body > div > p,
393-
.comment-container .review-body > p {
397+
body .comment-container .comment-body>p,
398+
body .comment-container .comment-body>div>p,
399+
.comment-container .review-body>p {
394400
margin-top: 0;
395401
line-height: 1.5em;
396402
}
397403

398-
body .comment-container .comment-body > p:last-child,
399-
body .comment-container .comment-body > div > p:last-child,
400-
.comment-container .review-body > p:last-child {
404+
body .comment-container .comment-body>p:last-child,
405+
body .comment-container .comment-body>div>p:last-child,
406+
.comment-container .review-body>p:last-child {
401407
margin-bottom: 0;
402408
}
403409

@@ -496,7 +502,7 @@ body button .icon {
496502
padding: 0 5px;
497503
}
498504

499-
:not(.status-item) > .small-button {
505+
:not(.status-item)>.small-button {
500506
font-weight: 600;
501507
}
502508

@@ -697,7 +703,7 @@ body button .icon {
697703
border: none;
698704
}
699705

700-
.comment-container[data-type='commit'] + .comment-container[data-type='commit'] {
706+
.comment-container[data-type='commit']+.comment-container[data-type='commit'] {
701707
border-top: none;
702708
}
703709

@@ -773,8 +779,8 @@ textarea {
773779
justify-content: flex-end;
774780
}
775781

776-
.comment-form .form-actions > button,
777-
.comment-form .form-actions > input[type='submit'] {
782+
.comment-form .form-actions>button,
783+
.comment-form .form-actions>input[type='submit'] {
778784
margin-right: 0;
779785
margin-left: 0;
780786
}
@@ -797,7 +803,7 @@ textarea {
797803
flex-direction: row-reverse;
798804
}
799805

800-
.main-comment-form > .form-actions {
806+
.main-comment-form>.form-actions {
801807
margin-bottom: 10px;
802808
}
803809

@@ -866,19 +872,19 @@ h3 {
866872
border-collapse: collapse;
867873
}
868874

869-
.comment-body table > thead > tr > th {
875+
.comment-body table>thead>tr>th {
870876
text-align: left;
871877
border-bottom: 1px solid;
872878
}
873879

874-
.comment-body table > thead > tr > th,
875-
.comment-body table > thead > tr > td,
876-
.comment-body table > tbody > tr > th,
877-
.comment-body table > tbody > tr > td {
880+
.comment-body table>thead>tr>th,
881+
.comment-body table>thead>tr>td,
882+
.comment-body table>tbody>tr>th,
883+
.comment-body table>tbody>tr>td {
878884
padding: 5px 10px;
879885
}
880886

881-
.comment-body table > tbody > tr + tr > td {
887+
.comment-body table>tbody>tr+tr>td {
882888
border-top: 1px solid;
883889
}
884890

@@ -918,7 +924,7 @@ code {
918924
}
919925

920926
.comment-body pre:not(.hljs),
921-
.comment-body pre.hljs code > div {
927+
.comment-body pre.hljs code>div {
922928
padding: 16px;
923929
border-radius: 3px;
924930
overflow: auto;
@@ -942,12 +948,12 @@ code {
942948
}
943949

944950
.vscode-light .comment-body pre:not(.hljs),
945-
.vscode-light .comment-body code > div {
951+
.vscode-light .comment-body code>div {
946952
background-color: rgba(220, 220, 220, 0.4);
947953
}
948954

949955
.vscode-dark .comment-body pre:not(.hljs),
950-
.vscode-dark .comment-body code > div {
956+
.vscode-dark .comment-body code>div {
951957
background-color: rgba(10, 10, 10, 0.4);
952958
}
953959

@@ -972,23 +978,23 @@ code {
972978
border: 1px solid var(--vscode-panel-border);
973979
}
974980

975-
.vscode-light .comment-body table > thead > tr > th {
981+
.vscode-light .comment-body table>thead>tr>th {
976982
border-color: rgba(0, 0, 0, 0.69);
977983
}
978984

979-
.vscode-dark .comment-body table > thead > tr > th {
985+
.vscode-dark .comment-body table>thead>tr>th {
980986
border-color: rgba(255, 255, 255, 0.69);
981987
}
982988

983989
.vscode-light .comment-body h1,
984990
.vscode-light .comment-body hr,
985-
.vscode-light .comment-body table > tbody > tr + tr > td {
991+
.vscode-light .comment-body table>tbody>tr+tr>td {
986992
border-color: rgba(0, 0, 0, 0.18);
987993
}
988994

989995
.vscode-dark .comment-body h1,
990996
.vscode-dark .comment-body hr,
991-
.vscode-dark .comment-body table > tbody > tr + tr > td {
997+
.vscode-dark .comment-body table>tbody>tr+tr>td {
992998
border-color: rgba(255, 255, 255, 0.18);
993999
}
9941000

@@ -1188,8 +1194,8 @@ code {
11881194
min-width: 42px;
11891195
}
11901196

1191-
.action-bar > button,
1192-
.flex-action-bar > button {
1197+
.action-bar>button,
1198+
.flex-action-bar>button {
11931199
margin-left: 4px;
11941200
margin-right: 4px;
11951201
}
@@ -1198,7 +1204,7 @@ code {
11981204
flex-grow: 1;
11991205
}
12001206

1201-
.title-editing-form > .form-actions {
1207+
.title-editing-form>.form-actions {
12021208
margin-left: 0;
12031209
}
12041210

0 commit comments

Comments
 (0)