From d436ded577a95a9cc3d43f4ece8f848b524ce430 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Tue, 7 Jun 2016 17:55:06 +0200 Subject: [PATCH] Collapse some equivalent rules to reference files only once --- .../base/browser/ui/findinput/findInput.css | 16 +----- src/vs/base/parts/tree/browser/tree.css | 5 +- .../contrib/find/browser/findWidget.css | 57 +++---------------- .../contrib/folding/browser/folding.css | 11 +--- .../parameterHints/browser/parameterHints.css | 10 +--- .../zoneWidget/browser/peekViewWidget.css | 12 +--- 6 files changed, 18 insertions(+), 93 deletions(-) diff --git a/src/vs/base/browser/ui/findinput/findInput.css b/src/vs/base/browser/ui/findinput/findInput.css index 62beb468251..8ab39a347e4 100644 --- a/src/vs/base/browser/ui/findinput/findInput.css +++ b/src/vs/base/browser/ui/findinput/findInput.css @@ -75,27 +75,17 @@ background: #555; } +.hc-black .monaco-findInput > .controls > .custom-checkbox.case-sensitive, .vs-dark .monaco-findInput > .controls > .custom-checkbox.case-sensitive { background: url('case-sensitive-dark.svg') center center no-repeat; } +.hc-black .monaco-findInput > .controls > .custom-checkbox.whole-word, .vs-dark .monaco-findInput > .controls > .custom-checkbox.whole-word { background: url('whole-word-dark.svg') center center no-repeat; } +.hc-black .monaco-findInput > .controls > .custom-checkbox.regex, .vs-dark .monaco-findInput > .controls > .custom-checkbox.regex { background: url('regex-dark.svg') center center no-repeat; } - -/* High Contrast Theming */ -.hc-black .monaco-findInput > .controls > .custom-checkbox.case-sensitive:before { - content: url('case-sensitive-dark.svg'); -} - -.hc-black .monaco-findInput > .controls > .custom-checkbox.whole-word:before { - content: url('whole-word-dark.svg'); -} - -.hc-black .monaco-findInput > .controls > .custom-checkbox.regex:before { - content: url('regex-dark.svg'); -} \ No newline at end of file diff --git a/src/vs/base/parts/tree/browser/tree.css b/src/vs/base/parts/tree/browser/tree.css index c0b5fe6e493..1f932ed2483 100644 --- a/src/vs/base/parts/tree/browser/tree.css +++ b/src/vs/base/parts/tree/browser/tree.css @@ -227,10 +227,7 @@ background: url('CollapseAll.svg') center center no-repeat; } +.hc-black .monaco-tree-action.collapse-all, .vs-dark .monaco-tree-action.collapse-all { background: url('CollapseAll_inverse.svg') center center no-repeat; } - -.hc-black .monaco-tree-action.collapse-all:before { - content: url('CollapseAll_inverse.svg'); -} \ No newline at end of file diff --git a/src/vs/editor/contrib/find/browser/findWidget.css b/src/vs/editor/contrib/find/browser/findWidget.css index 100a656a2ae..6ce452dcec3 100644 --- a/src/vs/editor/contrib/find/browser/findWidget.css +++ b/src/vs/editor/contrib/find/browser/findWidget.css @@ -279,14 +279,17 @@ box-shadow: 0 2px 8px #000; } +.monaco-editor.hc-black .find-widget .previous, .monaco-editor.vs-dark .find-widget .previous { background-image: url('images/previous-inverse.svg'); } +.monaco-editor.hc-black .find-widget .next, .monaco-editor.vs-dark .find-widget .next { background-image: url('images/next-inverse.svg'); } +.monaco-editor.hc-black .find-widget .monaco-checkbox .label, .monaco-editor.vs-dark .find-widget .monaco-checkbox .label { background-image: url('images/cancelSelectionFind-inverse.svg'); } @@ -299,26 +302,32 @@ background-color: rgba(150, 150, 150, 0.3); } +.monaco-editor.hc-black .find-widget .close-fw, .monaco-editor.vs-dark .find-widget .close-fw { background-image: url('images/close-dark.svg'); } +.monaco-editor.hc-black .find-widget .replace, .monaco-editor.vs-dark .find-widget .replace { background-image: url('images/replace-inverse.svg'); } +.monaco-editor.hc-black .find-widget .replace-all, .monaco-editor.vs-dark .find-widget .replace-all { background-image: url('images/replace-all-inverse.svg'); } +.monaco-editor.hc-black .find-widget .expand, .monaco-editor.vs-dark .find-widget .expand { background-image: url('images/expando-expanded-dark.svg'); } +.monaco-editor.hc-black .find-widget .collapse, .monaco-editor.vs-dark .find-widget .collapse { background-image: url('images/expando-collapsed-dark.svg'); } +.monaco-editor.hc-black .find-widget .button:not(.disabled):hover, .monaco-editor.vs-dark .find-widget .button:not(.disabled):hover { background-color: #2f3334; } @@ -343,64 +352,16 @@ box-shadow: none; } -.monaco-editor.hc-black .find-widget .button:not(.disabled):hover { - background: none; -} - -.monaco-editor.hc-black .find-widget .button { - background: none; -} - .monaco-editor.hc-black .find-widget .button:before { position: relative; top: 1px; left: 2px; } -.monaco-editor.hc-black .find-widget .previous:before { - content: url('images/previous-inverse.svg'); -} - -.monaco-editor.hc-black .find-widget .next:before { - content: url('images/next-inverse.svg'); -} - -.monaco-editor.hc-black .find-widget .replace:before { - content: url('images/replace-inverse.svg'); -} - -.monaco-editor.hc-black .find-widget .replace-all:before { - content: url('images/replace-all-inverse.svg'); -} - -.monaco-editor.hc-black .find-widget .monaco-checkbox .label { - content: url('images/cancelSelectionFind-inverse.svg'); - top: 1px; - left: 2px; -} - .monaco-editor.hc-black .find-widget .monaco-checkbox .checkbox:checked + .label { background-color: rgba(150, 150, 150, 0.3); } -.monaco-editor.hc-black .find-widget .close-fw:before { - content: url('images/close-dark.svg'); - top: 1px; - left: 0px; -} - -.monaco-editor.hc-black .find-widget .expand:before { - content: url('images/expando-expanded-dark.svg'); - top: 38%; - left: 40% -} - -.monaco-editor.hc-black .find-widget .collapse:before { - content: url('images/expando-collapsed-dark.svg'); - top: 30%; - left: 40%; -} - .monaco-editor.hc-black .findMatch { background: none; border: 1px dotted #f38518; diff --git a/src/vs/editor/contrib/folding/browser/folding.css b/src/vs/editor/contrib/folding/browser/folding.css index 18ca1744e91..4d04b623c35 100644 --- a/src/vs/editor/contrib/folding/browser/folding.css +++ b/src/vs/editor/contrib/folding/browser/folding.css @@ -20,23 +20,16 @@ background-image: url('arrow-collapse.svg'); } +.monaco-editor.hc-black .margin-view-overlays:hover .folding, .monaco-editor.vs-dark .margin-view-overlays:hover .folding { background-image: url('arrow-expand-dark.svg'); } +.monaco-editor.hc-black .margin-view-overlays .folding.collapsed, .monaco-editor.vs-dark .margin-view-overlays .folding.collapsed { background-image: url('arrow-collapse-dark.svg'); } -/* High-contrast theme */ -.monaco-editor.hc-black .margin-view-overlays:hover .folding { - background-image: url('arrow-expand-dark.svg'); -} - -.monaco-editor.hc-black .margin-view-overlays .folding.collapsed { - background-image: url('arrow-collapse-dark.svg'); -} - .monaco-editor .inline-folded:after { color: grey; margin: 0.1em 0.2em 0 0.2em; diff --git a/src/vs/editor/contrib/parameterHints/browser/parameterHints.css b/src/vs/editor/contrib/parameterHints/browser/parameterHints.css index 950f1e6c26d..b41ff1005c1 100644 --- a/src/vs/editor/contrib/parameterHints/browser/parameterHints.css +++ b/src/vs/editor/contrib/parameterHints/browser/parameterHints.css @@ -114,10 +114,12 @@ color: #C07A7A; } +.monaco-editor.hc-black .parameter-hints-widget .button.previous, .monaco-editor.vs-dark .parameter-hints-widget .button.previous { background-image: url('arrow-up-dark.svg'); } +.monaco-editor.hc-black .parameter-hints-widget .button.next, .monaco-editor.vs-dark .parameter-hints-widget .button.next { background-image: url('arrow-down-dark.svg'); } @@ -131,11 +133,3 @@ .monaco-editor.hc-black .parameter-hints-widget .documentation { color: #C07A7A; } - -.monaco-editor.hc-black .parameter-hints-widget .button.previous:before { - content: url('arrow-up-dark.svg'); -} - -.monaco-editor.hc-black .parameter-hints-widget .button.next:before { - content: url('arrow-down-dark.svg'); -} \ No newline at end of file diff --git a/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.css b/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.css index 62cc7c28bb8..85a486bd883 100644 --- a/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.css +++ b/src/vs/editor/contrib/zoneWidget/browser/peekViewWidget.css @@ -58,6 +58,7 @@ background-color: #1E1E1E; } +.monaco-editor.hc-black .peekview-widget .head .peekview-actions .action-label.icon.close-peekview-action, .monaco-editor.vs-dark .peekview-widget .head .peekview-actions .action-label.icon.close-peekview-action { background: url('media/close-inverse.svg') center center no-repeat; } @@ -85,17 +86,6 @@ opacity: 0.6; } -.monaco-editor.hc-black .peekview-widget .head .peekview-actions .action-label.icon.close-peekview-action { - background: none; -} - -.monaco-editor.hc-black .peekview-widget .head .peekview-actions .action-label.icon.close-peekview-action:before { - content: url('media/close-inverse.svg'); - display: inline-block; - height: 16px; - width: 16px; -} - .monaco-editor.hc-black .peekview-widget > .body { border-color: #6FC3DF; } \ No newline at end of file