diff options
Diffstat (limited to 'src/vs/workbench/contrib/mergeEditor/browser/view/media/mergeEditor.css')
| -rw-r--r-- | src/vs/workbench/contrib/mergeEditor/browser/view/media/mergeEditor.css | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/media/mergeEditor.css b/src/vs/workbench/contrib/mergeEditor/browser/view/media/mergeEditor.css index b832e88bd84..e9c0ada7df3 100644 --- a/src/vs/workbench/contrib/mergeEditor/browser/view/media/mergeEditor.css +++ b/src/vs/workbench/contrib/mergeEditor/browser/view/media/mergeEditor.css @@ -8,11 +8,27 @@ height: 30px; display: flex; align-content: center; - justify-content: space-between; } -.monaco-workbench .merge-editor .code-view > .title .monaco-icon-label { - margin: auto 0; +.monaco-workbench .merge-editor .code-view > .title>SPAN { + align-self: center; + text-overflow: ellipsis; + overflow: hidden; + padding-right: 6px; +} + +.monaco-workbench .merge-editor .code-view > .title>SPAN.title { + flex-shrink: 0; +} + +.monaco-workbench .merge-editor .code-view > .title>SPAN.description { + opacity: 0.7; + font-size: 90%; +} + +.monaco-workbench .merge-editor .code-view > .title>SPAN.detail { + margin-left: auto; + flex-shrink: 0; } .monaco-workbench .merge-editor .code-view > .container { |