diff --git a/css/xterm.css b/css/xterm.css index b3aa9e08..819654e4 100644 --- a/css/xterm.css +++ b/css/xterm.css @@ -224,17 +224,17 @@ /* Derived from vs/base/browser/ui/scrollbar/media/scrollbar.css */ /* xterm.js customization: Override xterm's cursor style */ -.xterm .monaco-scrollable-element > .scrollbar { +.xterm .xterm-scrollable-element > .scrollbar { cursor: default; } /* Arrows */ -.xterm .monaco-scrollable-element > .scrollbar > .scra { +.xterm .xterm-scrollable-element > .scrollbar > .scra { cursor: pointer; font-size: 11px !important; } -.xterm .monaco-scrollable-element > .visible { +.xterm .xterm-scrollable-element > .visible { opacity: 1; /* Background rule added for IE9 - to allow clicks on dom node */ @@ -244,20 +244,20 @@ /* In front of peek view */ z-index: 11; } -.xterm .monaco-scrollable-element > .invisible { +.xterm .xterm-scrollable-element > .invisible { opacity: 0; pointer-events: none; } -.xterm .monaco-scrollable-element > .invisible.fade { +.xterm .xterm-scrollable-element > .invisible.fade { transition: opacity 800ms linear; } /* Scrollable Content Inset Shadow */ -.xterm .monaco-scrollable-element > .shadow { +.xterm .xterm-scrollable-element > .shadow { position: absolute; display: none; } -.xterm .monaco-scrollable-element > .shadow.top { +.xterm .xterm-scrollable-element > .shadow.top { display: block; top: 0; left: 3px; @@ -265,7 +265,7 @@ width: 100%; box-shadow: var(--vscode-scrollbar-shadow, #000) 0 6px 6px -6px inset; } -.xterm .monaco-scrollable-element > .shadow.left { +.xterm .xterm-scrollable-element > .shadow.left { display: block; top: 3px; left: 0; @@ -273,13 +273,13 @@ width: 3px; box-shadow: var(--vscode-scrollbar-shadow, #000) 6px 0 6px -6px inset; } -.xterm .monaco-scrollable-element > .shadow.top-left-corner { +.xterm .xterm-scrollable-element > .shadow.top-left-corner { display: block; top: 0; left: 0; height: 3px; width: 3px; } -.xterm .monaco-scrollable-element > .shadow.top.left { +.xterm .xterm-scrollable-element > .shadow.top.left { box-shadow: var(--vscode-scrollbar-shadow, #000) 6px 0 6px -6px inset; } diff --git a/src/browser/Viewport.ts b/src/browser/Viewport.ts index 212ed49c..9deed71e 100644 --- a/src/browser/Viewport.ts +++ b/src/browser/Viewport.ts @@ -75,13 +75,13 @@ export class Viewport extends Disposable { this.register(toDisposable(() => this._styleElement.remove())); this.register(runAndSubscribe(themeService.onChangeColors, () => { this._styleElement.textContent = [ - `.xterm .monaco-scrollable-element > .scrollbar > .slider {`, + `.xterm .xterm-scrollable-element > .scrollbar > .slider {`, ` background: ${themeService.colors.scrollbarSliderBackground.css};`, `}`, - `.xterm .monaco-scrollable-element > .scrollbar > .slider:hover {`, + `.xterm .xterm-scrollable-element > .scrollbar > .slider:hover {`, ` background: ${themeService.colors.scrollbarSliderHoverBackground.css};`, `}`, - `.xterm .monaco-scrollable-element > .scrollbar > .slider.active {`, + `.xterm .xterm-scrollable-element > .scrollbar > .slider.active {`, ` background: ${themeService.colors.scrollbarSliderActiveBackground.css};`, `}` ].join('\n'); diff --git a/src/vs/base/browser/touch.ts b/src/vs/base/browser/touch.ts index c8541605..a4e8dffa 100644 --- a/src/vs/base/browser/touch.ts +++ b/src/vs/base/browser/touch.ts @@ -12,11 +12,11 @@ import { Disposable, IDisposable, markAsSingleton, toDisposable } from 'vs/base/ import { LinkedList } from 'vs/base/common/linkedList'; export namespace EventType { - export const Tap = '-monaco-gesturetap'; - export const Change = '-monaco-gesturechange'; - export const Start = '-monaco-gesturestart'; - export const End = '-monaco-gesturesend'; - export const Contextmenu = '-monaco-gesturecontextmenu'; + export const Tap = '-xterm-gesturetap'; + export const Change = '-xterm-gesturechange'; + export const Start = '-xterm-gesturestart'; + export const End = '-xterm-gesturesend'; + export const Contextmenu = '-xterm-gesturecontextmenu'; } interface TouchData { diff --git a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts index 14edb371..d7d77e6f 100644 --- a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts +++ b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts @@ -225,7 +225,7 @@ export abstract class AbstractScrollableElement extends Widget { this._horizontalScrollbar = this._register(new HorizontalScrollbar(this._scrollable, this._options, scrollbarHost)); this._domNode = document.createElement('div'); - this._domNode.className = 'monaco-scrollable-element ' + this._options.className; + this._domNode.className = 'xterm-scrollable-element ' + this._options.className; this._domNode.setAttribute('role', 'presentation'); this._domNode.style.position = 'relative'; this._domNode.style.overflow = 'hidden'; @@ -312,7 +312,7 @@ export abstract class AbstractScrollableElement extends Widget { if (platform.isMacintosh) { this._options.className += ' mac'; } - this._domNode.className = 'monaco-scrollable-element ' + this._options.className; + this._domNode.className = 'xterm-scrollable-element ' + this._options.className; } /** diff --git a/yarn.lock b/yarn.lock index e353d8ab..5925b86d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3677,7 +3677,7 @@ semver@^7.3.4, semver@^7.5.3, semver@^7.5.4: dependencies: lru-cache "^6.0.0" -semver@^7.6.0, semver@^7.6.2: +semver@^7.6.0: version "7.6.2" resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13" integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==