Skip to content

Commit 874af24

Browse files
committed
render scm input in its own row
1 parent 796a969 commit 874af24

5 files changed

Lines changed: 138 additions & 81 deletions

File tree

src/vs/workbench/contrib/scm/browser/media/scm.css

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,39 +34,35 @@
3434
display: flex;
3535
flex-direction: column;
3636
height: 100%;
37-
}
38-
39-
.scm-viewlet .scm-provider > .header {
40-
display: flex;
4137
align-items: center;
4238
flex-flow: nowrap;
4339
}
4440

45-
.scm-viewlet .scm-provider > .header > .icon {
41+
.scm-viewlet .scm-provider > .icon {
4642
margin-right: 4px;
4743
}
4844

49-
.scm-viewlet .scm-provider > .header > .label {
45+
.scm-viewlet .scm-provider > .label {
5046
display: flex;
5147
flex-shrink: 1;
5248
overflow: hidden;
5349
}
5450

55-
.scm-viewlet .scm-provider > .header > .label > .name {
51+
.scm-viewlet .scm-provider > .label > .name {
5652
text-decoration: underline;
5753
}
5854

59-
.scm-viewlet .scm-provider > .header > .label > .description {
55+
.scm-viewlet .scm-provider > .label > .description {
6056
opacity: 0.7;
6157
margin-left: 0.5em;
6258
font-size: 0.9em;
6359
}
6460

65-
.scm-viewlet .scm-provider > .header > .monaco-action-bar {
61+
.scm-viewlet .scm-provider > .monaco-action-bar {
6662
flex: 1;
6763
}
6864

69-
.scm-viewlet .scm-provider > .header > .monaco-action-bar .action-item {
65+
.scm-viewlet .scm-provider > .monaco-action-bar .action-item {
7066
margin-left: 4px;
7167
overflow: hidden;
7268
text-overflow: ellipsis;
@@ -75,19 +71,19 @@
7571
min-width: 14px;
7672
}
7773

78-
.scm-viewlet .scm-provider > .header > .monaco-action-bar .action-label {
74+
.scm-viewlet .scm-provider > .monaco-action-bar .action-label {
7975
text-overflow: ellipsis;
8076
overflow: hidden;
8177
min-width: 14px; /* minimum size of icons */
8278
}
8379

84-
.scm-viewlet .scm-provider > .header > .monaco-action-bar .action-label .codicon {
80+
.scm-viewlet .scm-provider > .monaco-action-bar .action-label .codicon {
8581
font-size: 14px;
8682
vertical-align: sub;
8783
display: inline-flex;
8884
}
8985

90-
.scm-viewlet .scm-provider > .header > .monaco-action-bar .action-item:last-of-type {
86+
.scm-viewlet .scm-provider > .monaco-action-bar .action-item:last-of-type {
9187
padding-right: 0;
9288
}
9389

@@ -180,6 +176,10 @@
180176
line-height: 22px;
181177
}
182178

179+
.scm-viewlet .scm-input {
180+
height: 100%;
181+
}
182+
183183
.scm-viewlet .scm-editor {
184184
box-sizing: border-box;
185185
width: 100%;
@@ -209,6 +209,7 @@
209209
font-size: 0.9em;
210210
padding: 1px 3px;
211211
display: none;
212+
top: calc(100%);
212213
}
213214

214215
.scm-viewlet .scm-editor-container.synthetic-focus > .scm-editor-validation {

0 commit comments

Comments
 (0)