Skip to content

Commit b5e9cb5

Browse files
committed
Merge branch 'joao/scm-editor'
2 parents f3f6b96 + 3d8d3d9 commit b5e9cb5

3 files changed

Lines changed: 229 additions & 54 deletions

File tree

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

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -173,20 +173,48 @@
173173
display: none;
174174
}
175175

176-
.scm-viewlet .scm-editor > .monaco-inputbox {
176+
.scm-viewlet .scm-editor-container {
177+
padding: 1px;
178+
position: relative;
179+
outline-offset: -1px;
180+
}
181+
182+
.scm-viewlet .scm-editor-container > .scm-editor-validation {
183+
position: absolute;
177184
width: 100%;
185+
z-index: 10;
186+
left: 0px;
187+
box-sizing: border-box;
188+
font-size: 0.9em;
189+
padding: 1px 3px;
190+
display: none;
191+
}
192+
193+
.scm-viewlet .scm-editor-container.synthetic-focus > .scm-editor-validation {
194+
display: block;
178195
}
179196

180-
.scm-viewlet .scm-editor > .monaco-inputbox > .wrapper > .mirror {
181-
max-height: 134px;
197+
.scm-viewlet .scm-editor-placeholder {
198+
position: absolute;
199+
pointer-events: none;
200+
z-index: 1;
201+
margin: 1px;
202+
padding: 3px 4px;
203+
box-sizing: border-box;
204+
width: 100%;
205+
overflow: hidden;
206+
white-space: nowrap;
207+
text-overflow: ellipsis;
182208
}
183209

184-
.scm-viewlet .scm-editor > .monaco-inputbox > .wrapper > textarea.input {
185-
min-height: 26px;
210+
.scm-viewlet .scm-editor-placeholder.hidden {
211+
display: none;
186212
}
187213

188-
.scm-viewlet .scm-editor.scroll > .monaco-inputbox > .wrapper > textarea.input {
189-
overflow-y: scroll;
214+
.scm-viewlet .scm-editor-container .monaco-editor-background,
215+
.scm-viewlet .scm-editor-container .monaco-editor,
216+
.scm-viewlet .scm-editor-container .mtk1 {
217+
color: inherit;
190218
}
191219

192220
.scm-viewlet .list-view-mode .monaco-tl-twistie:not(.force-twistie):not(.collapsible) {

0 commit comments

Comments
 (0)