From c4b514244e2651117b9990295730265f5b902436 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Mon, 14 Mar 2016 22:24:35 +0100 Subject: [PATCH] Fixes #2670: reference search tree css rules overwrite suggest widget css rules --- .../browser/referenceSearchWidget.css | 46 +++++++++---------- .../browser/referenceSearchWidget.ts | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/vs/editor/contrib/referenceSearch/browser/referenceSearchWidget.css b/src/vs/editor/contrib/referenceSearch/browser/referenceSearchWidget.css index ee11c0187b68c..c9be5baf6f0c2 100644 --- a/src/vs/editor/contrib/referenceSearch/browser/referenceSearchWidget.css +++ b/src/vs/editor/contrib/referenceSearch/browser/referenceSearchWidget.css @@ -52,7 +52,7 @@ background-color: rgba(245, 216, 2, 0.87); } -.monaco-editor .reference-zone-widget .tree { +.monaco-editor .reference-zone-widget .ref-tree { background-color: #F3F3F3; width: 20%; color: #646465; @@ -61,50 +61,50 @@ font-size: 13px; } -.monaco-editor .reference-zone-widget .tree .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected:not(.highlighted) { +.monaco-editor .reference-zone-widget .ref-tree .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected:not(.highlighted) { background-color: rgba(51, 153, 255, .2); color: #6C6C6C !important; } -.monaco-editor .reference-zone-widget .tree .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected.has-children > .content:before { +.monaco-editor .reference-zone-widget .ref-tree .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected.has-children > .content:before { border-left-color: #A6A6A6; } -.monaco-editor .reference-zone-widget .tree .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected.has-children > .content:after { +.monaco-editor .reference-zone-widget .ref-tree .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected.has-children > .content:after { border-left-color: rgba(51, 153, 255, .2); } -.monaco-editor .reference-zone-widget .tree .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected.expanded > .content:before { +.monaco-editor .reference-zone-widget .ref-tree .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected.expanded > .content:before { border-right-color: #646465; border-left-color: transparent; } -.monaco-editor .reference-zone-widget .tree .reference { +.monaco-editor .reference-zone-widget .ref-tree .reference { text-overflow: ellipsis; overflow: hidden; } -.monaco-editor .reference-zone-widget .tree .reference-file { +.monaco-editor .reference-zone-widget .ref-tree .reference-file { position: relative; line-height: 22px; color: #1E1E1E; } -.monaco-editor .reference-zone-widget .tree .reference-file .directory { +.monaco-editor .reference-zone-widget .ref-tree .reference-file .directory { opacity: 0.7; margin-left: 0.5em; font-size: 0.9em; } -.monaco-editor .reference-zone-widget .tree .reference .lineNumber { +.monaco-editor .reference-zone-widget .ref-tree .reference .lineNumber { color: #A8A8A8; } -.monaco-editor .reference-zone-widget .tree .selected .reference .lineNumber { +.monaco-editor .reference-zone-widget .ref-tree .selected .reference .lineNumber { color: white; } -.monaco-editor .reference-zone-widget .tree .referenceMatch { +.monaco-editor .reference-zone-widget .ref-tree .referenceMatch { background-color: rgba(234, 92, 0, 0.3); } @@ -114,7 +114,7 @@ /* dark room */ -.monaco-editor.vs-dark .reference-zone-widget .tree .block, +.monaco-editor.vs-dark .reference-zone-widget .ref-tree .block, .monaco-editor.vs-dark .reference-zone-widget .overlay { background-color: #1e1e1e; } @@ -128,12 +128,12 @@ background-color: #001F33; } -.monaco-editor.vs-dark .reference-zone-widget .tree { +.monaco-editor.vs-dark .reference-zone-widget .ref-tree { background-color: #252526; color: #BBB; } -.monaco-editor.vs-dark .reference-zone-widget .tree .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected:not(.highlighted) { +.monaco-editor.vs-dark .reference-zone-widget .ref-tree .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected:not(.highlighted) { color: #FFF !important; } @@ -141,20 +141,20 @@ background-color: rgba(255, 143, 0, 0.6); } -.monaco-editor.vs-dark .reference-zone-widget .tree .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected.has-children > .content:before { +.monaco-editor.vs-dark .reference-zone-widget .ref-tree .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected.has-children > .content:before { border-left-color: white; } -.monaco-editor.vs-dark .reference-zone-widget .tree .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected.has-children > .content:after { +.monaco-editor.vs-dark .reference-zone-widget .ref-tree .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected.has-children > .content:after { border-left-color: rgba(51, 153, 255, .2); } -.monaco-editor.vs-dark .reference-zone-widget .tree .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected.expanded > .content:before { +.monaco-editor.vs-dark .reference-zone-widget .ref-tree .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected.expanded > .content:before { border-right-color: white; border-left-color: transparent; } -.monaco-editor.vs-dark .reference-zone-widget .tree .reference-file { +.monaco-editor.vs-dark .reference-zone-widget .ref-tree .reference-file { color: #FFF; } @@ -173,27 +173,27 @@ box-sizing: border-box; } -.monaco-editor.hc-black .reference-zone-widget .tree { +.monaco-editor.hc-black .reference-zone-widget .ref-tree { background-color: #000; color: #fff; } -.monaco-editor.hc-black .reference-zone-widget .tree .reference-file { +.monaco-editor.hc-black .reference-zone-widget .ref-tree .reference-file { color: #fff; line-height: 20px; font-weight: bold; } -.monaco-editor.hc-black .reference-zone-widget .tree .reference-file .directory { +.monaco-editor.hc-black .reference-zone-widget .ref-tree .reference-file .directory { font-weight: normal; } -.monaco-editor.hc-black .reference-zone-widget .tree .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected:not(.highlighted) { +.monaco-editor.hc-black .reference-zone-widget .ref-tree .monaco-tree.focused .monaco-tree-rows > .monaco-tree-row.selected:not(.highlighted) { background: none; color: #FFF !important; } -.monaco-editor.hc-black .reference-zone-widget .tree .referenceMatch { +.monaco-editor.hc-black .reference-zone-widget .ref-tree .referenceMatch { background: none; border: 1px dotted #f38518; } \ No newline at end of file diff --git a/src/vs/editor/contrib/referenceSearch/browser/referenceSearchWidget.ts b/src/vs/editor/contrib/referenceSearch/browser/referenceSearchWidget.ts index 2868601942a68..d7168594a52e5 100644 --- a/src/vs/editor/contrib/referenceSearch/browser/referenceSearchWidget.ts +++ b/src/vs/editor/contrib/referenceSearch/browser/referenceSearchWidget.ts @@ -450,7 +450,7 @@ export class ReferenceWidget extends PeekViewWidget { }); // tree - container.div({ 'class': 'tree inline' }, (div:Builder) => { + container.div({ 'class': 'ref-tree inline' }, (div:Builder) => { var config = { dataSource: this.instantiationService.createInstance(DataSource), renderer: this.instantiationService.createInstance(Renderer, this.editor),