From 89d594a4d348e038c89e11aa00b4cdd1babfcfad Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Fri, 6 Jan 2017 11:46:04 +0100 Subject: [PATCH] Small css tweaks --- src/vs/editor/browser/view/viewImpl.ts | 1 + src/vs/editor/browser/view/viewOverlays.ts | 12 ++---------- .../viewParts/contentWidgets/contentWidgets.css | 8 -------- .../viewParts/contentWidgets/contentWidgets.ts | 3 ++- .../currentLineHighlight/currentLineHighlight.css | 8 ++++---- .../currentLineMarginHighlight.css | 8 ++++---- .../currentLineMarginHighlight.ts | 2 +- src/vs/editor/browser/viewParts/lines/viewLine.ts | 12 ++---------- src/vs/editor/browser/viewParts/lines/viewLines.css | 5 ----- .../themes/electron-browser/stylesContributions.ts | 3 ++- 10 files changed, 18 insertions(+), 44 deletions(-) delete mode 100644 src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.css diff --git a/src/vs/editor/browser/view/viewImpl.ts b/src/vs/editor/browser/view/viewImpl.ts index 4084eb9362d..b38afa64ef0 100644 --- a/src/vs/editor/browser/view/viewImpl.ts +++ b/src/vs/editor/browser/view/viewImpl.ts @@ -114,6 +114,7 @@ export class View extends ViewEventHandler implements editorBrowser.IView, IDisp // These two dom nodes must be constructed up front, since references are needed in the layout provider (scrolling & co.) this.linesContent = document.createElement('div'); this.linesContent.className = editorBrowser.ClassNames.LINES_CONTENT + ' monaco-editor-background'; + this.linesContent.style.position = 'absolute'; this.domNode = document.createElement('div'); this.domNode.className = configuration.editor.viewInfo.editorClassName; diff --git a/src/vs/editor/browser/view/viewOverlays.ts b/src/vs/editor/browser/view/viewOverlays.ts index 365ce8d81c4..1f4137a582e 100644 --- a/src/vs/editor/browser/view/viewOverlays.ts +++ b/src/vs/editor/browser/view/viewOverlays.ts @@ -159,17 +159,9 @@ export class ViewOverlayLine implements IVisibleLineData { } getLineOuterHTML(out: string[], lineNumber: number, deltaTop: number): void { - out.push('
'); + out.push(`
`); out.push(this.getLineInnerHTML(lineNumber)); - out.push('
'); + out.push(`
`); } getLineInnerHTML(lineNumber: number): string { diff --git a/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.css b/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.css deleted file mode 100644 index f21db4ff118..00000000000 --- a/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.css +++ /dev/null @@ -1,8 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -.monaco-editor .contentWidgets { - position: absolute; - top: 0; -} \ No newline at end of file diff --git a/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts b/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts index 17055c57040..a2a0d00ab5c 100644 --- a/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts +++ b/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts @@ -5,7 +5,6 @@ 'use strict'; -import 'vs/css!./contentWidgets'; import * as dom from 'vs/base/browser/dom'; import { StyleMutator } from 'vs/base/browser/styleMutator'; import * as editorCommon from 'vs/editor/common/editorCommon'; @@ -68,6 +67,8 @@ export class ViewContentWidgets extends ViewPart { this.domNode = document.createElement('div'); this.domNode.className = ClassNames.CONTENT_WIDGETS; + this.domNode.style.position = 'absolute'; + this.domNode.style.top = '0'; this.overflowingContentWidgetsDomNode = document.createElement('div'); this.overflowingContentWidgetsDomNode.className = ClassNames.OVERFLOWING_CONTENT_WIDGETS; diff --git a/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.css b/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.css index 9ab0a39ef65..f9575e6b526 100644 --- a/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.css +++ b/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.css @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -.monaco-editor .current-line { +.monaco-editor .view-overlays .current-line { display: block; position: absolute; left: 0; @@ -11,14 +11,14 @@ box-sizing: border-box; } -.monaco-editor.vs .current-line { +.monaco-editor.vs .view-overlays .current-line { border: 2px solid #eee; } -.monaco-editor.vs-dark .current-line { +.monaco-editor.vs-dark .view-overlays .current-line { border: 2px solid #282828; } -.monaco-editor.hc-black .current-line { +.monaco-editor.hc-black .view-overlays .current-line { border: 2px solid #f38518; } diff --git a/src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.css b/src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.css index 9ab0a39ef65..12817520df5 100644 --- a/src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.css +++ b/src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.css @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -.monaco-editor .current-line { +.monaco-editor .margin-view-overlays .current-line-margin { display: block; position: absolute; left: 0; @@ -11,14 +11,14 @@ box-sizing: border-box; } -.monaco-editor.vs .current-line { +.monaco-editor.vs .margin-view-overlays .current-line-margin { border: 2px solid #eee; } -.monaco-editor.vs-dark .current-line { +.monaco-editor.vs-dark .margin-view-overlays .current-line-margin { border: 2px solid #282828; } -.monaco-editor.hc-black .current-line { +.monaco-editor.hc-black .margin-view-overlays .current-line-margin { border: 2px solid #f38518; } diff --git a/src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.ts b/src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.ts index ab422810c5c..77e71f3f900 100644 --- a/src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.ts +++ b/src/vs/editor/browser/viewParts/currentLineMarginHighlight/currentLineMarginHighlight.ts @@ -93,7 +93,7 @@ export class CurrentLineMarginHighlightOverlay extends DynamicViewOverlay { if (lineNumber === this._primaryCursorLineNumber) { if (this._shouldShowCurrentLine()) { return ( - '
'); + out.push(`
`); out.push(this.getLineInnerHTML(lineNumber)); - out.push('
'); + out.push(`
`); } public getLineInnerHTML(lineNumber: number): string { diff --git a/src/vs/editor/browser/viewParts/lines/viewLines.css b/src/vs/editor/browser/viewParts/lines/viewLines.css index d26b34f8597..5ad9dcc0659 100644 --- a/src/vs/editor/browser/viewParts/lines/viewLines.css +++ b/src/vs/editor/browser/viewParts/lines/viewLines.css @@ -47,11 +47,6 @@ width: 100%; } -.monaco-editor .lines-content { - position: absolute; - top: 0; -} - /* TODO@tokenization bootstrap fix */ /*.monaco-editor .view-line > span > span { float: none; diff --git a/src/vs/workbench/services/themes/electron-browser/stylesContributions.ts b/src/vs/workbench/services/themes/electron-browser/stylesContributions.ts index 3ca5e07d64c..474cbf07347 100644 --- a/src/vs/workbench/services/themes/electron-browser/stylesContributions.ts +++ b/src/vs/workbench/services/themes/electron-browser/stylesContributions.ts @@ -278,7 +278,8 @@ class EditorReferenceSearchStyleRules extends EditorStyleRules { class EditorLineHighlightStyleRules extends EditorStyleRules { public getCssRules(theme: Theme, cssRules: string[]): void { if (theme.getGlobalSettings().lineHighlight) { - cssRules.push(`.monaco-editor.${theme.getSelector()} .current-line { background-color: ${new Color(theme.getGlobalSettings().lineHighlight)}; border: none; }`); + cssRules.push(`.monaco-editor.${theme.getSelector()} .view-overlays .current-line { background-color: ${new Color(theme.getGlobalSettings().lineHighlight)}; border: none; }`); + cssRules.push(`.monaco-editor.${theme.getSelector()} .margin-view-overlays .current-line-margin { background-color: ${new Color(theme.getGlobalSettings().lineHighlight)}; border: none; }`); } this.addBackgroundColorRule(theme, '.rangeHighlight', theme.getGlobalSettings().rangeHighlight, cssRules); } -- GitLab