提交 d36d7b31 编写于 作者: M Martin Aeschlimann

vs/vs-dark/hc-black are now on same element as monaco-workbench

上级 2ce7b4c7
......@@ -101,7 +101,7 @@
}
/* Hides active elements in high contrast mode */
.hc-black .monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.checked .active-item-indicator {
.hc-black.monaco-workbench .activitybar > .content :not(.monaco-menu) > .monaco-action-bar .action-item.checked .active-item-indicator {
display: none;
}
......@@ -120,8 +120,8 @@
}
/* Hides outline on HC as focus is handled by border */
.hc-black .monaco-workbench .activitybar.left > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus:before,
.hc-black .monaco-workbench .activitybar.right > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus:before {
.hc-black.monaco-workbench .activitybar.left > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus:before,
.hc-black.monaco-workbench .activitybar.right > .content :not(.monaco-menu) > .monaco-action-bar .action-item:focus:before {
outline: none;
}
......
......@@ -211,7 +211,7 @@
text-overflow: clip;
}
.hc-black .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink > .monaco-icon-label > .monaco-icon-label-container {
.hc-black.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.sizing-shrink > .monaco-icon-label > .monaco-icon-label-container {
text-overflow: ellipsis;
}
......
......@@ -40,8 +40,8 @@
background-repeat: no-repeat;
}
.hc-black .monaco-workbench .part.editor > .content .editor-group-container > .title .title-actions .action-label,
.hc-black .monaco-workbench .part.editor > .content .editor-group-container > .title .editor-actions .action-label:not(.codicon) {
.hc-black.monaco-workbench .part.editor > .content .editor-group-container > .title .title-actions .action-label,
.hc-black.monaco-workbench .part.editor > .content .editor-group-container > .title .editor-actions .action-label:not(.codicon) {
line-height: initial;
}
......
......@@ -70,10 +70,10 @@
min-width: 16px;
}
.vs-dark .monaco-workbench .bulk-edit-panel .monaco-tl-contents.category .uri-icon,
.hc-black .monaco-workbench .bulk-edit-panel .monaco-tl-contents.category .uri-icon,
.vs-dark .monaco-workbench .bulk-edit-panel .monaco-tl-contents.textedit .uri-icon,
.hc-black .monaco-workbench .bulk-edit-panel .monaco-tl-contents.textedit .uri-icon
.vs-dark.monaco-workbench .bulk-edit-panel .monaco-tl-contents.category .uri-icon,
.hc-black.monaco-workbench .bulk-edit-panel .monaco-tl-contents.category .uri-icon,
.vs-dark.monaco-workbench .bulk-edit-panel .monaco-tl-contents.textedit .uri-icon,
.hc-black.monaco-workbench .bulk-edit-panel .monaco-tl-contents.textedit .uri-icon
{
background-image: var(--background-dark);
}
......
......@@ -115,7 +115,8 @@
}
/* Theming */
.vs .monaco-workbench .feedback-form .feedback-alias, .vs .monaco-workbench .feedback-form .feedback-description {
.vs.monaco-workbench .feedback-form .feedback-alias,
.vs.monaco-workbench .feedback-form .feedback-description {
font-family: inherit;
border: 1px solid transparent;
}
......@@ -167,16 +168,17 @@
background-color: #E51400;
}
.vs-dark .monaco-workbench .feedback-form h3 {
.vs-dark.monaco-workbench .feedback-form h3 {
font-weight: normal;
font-size: 1.2em;
}
.vs-dark .monaco-workbench .feedback-form .sentiment:hover {
.vs-dark.monaco-workbench .feedback-form .sentiment:hover {
background-color: rgba(30,30,30,0.8);
}
.vs-dark .monaco-workbench .feedback-form .feedback-alias, .vs-dark .monaco-workbench .feedback-form .feedback-description {
.vs-dark.monaco-workbench .feedback-form .feedback-alias,
.vs-dark.monaco-workbench .feedback-form .feedback-description {
font-family: inherit;
}
......@@ -193,28 +195,29 @@
}
/* High Contrast Theming */
.hc-black .monaco-workbench .feedback-form {
.hc-black.monaco-workbench .feedback-form {
outline: 2px solid #6fc3df;
outline-offset: -2px;
}
.hc-black .monaco-workbench .feedback-form .feedback-alias, .hc-black .monaco-workbench .feedback-form .feedback-description {
.hc-black.monaco-workbench .feedback-form .feedback-alias,
.hc-black.monaco-workbench .feedback-form .feedback-description {
font-family: inherit;
}
.hc-black .monaco-workbench .feedback-form .content .contactus {
.hc-black.monaco-workbench .feedback-form .content .contactus {
padding: 10px;
float: right;
}
.hc-black .monaco-workbench .feedback-form .form-buttons .send,
.hc-black .monaco-workbench .feedback-form .form-buttons .send.in-progress,
.hc-black .monaco-workbench .feedback-form .form-buttons .send.success {
.hc-black.monaco-workbench .feedback-form .form-buttons .send,
.hc-black.monaco-workbench .feedback-form .form-buttons .send.in-progress,
.hc-black.monaco-workbench .feedback-form .form-buttons .send.success {
background-color: #0C141F;
color: #D4D4D4;
border: 1px solid #6FC3DF;
}
.hc-black .monaco-workbench .feedback-form .form-buttons .send:hover {
.hc-black.monaco-workbench .feedback-form .form-buttons .send:hover {
background-color: #0C141F;
}
......@@ -95,6 +95,6 @@
}
/* High Contrast Theming */
.hc-black .monaco-workbench .explorer-viewlet .explorer-item {
.hc-black.monaco-workbench .explorer-viewlet .explorer-item {
line-height: 20px;
}
......@@ -81,7 +81,7 @@
overflow: hidden;
}
.hc-black .monaco-workbench .open-editors .open-editor,
.hc-black .monaco-workbench .open-editors .editor-group {
.hc-black.monaco-workbench .open-editors .open-editor,
.hc-black.monaco-workbench .open-editors .editor-group {
line-height: 20px;
}
......@@ -282,8 +282,8 @@
white-space: pre;
}
.hc-black .monaco-workbench .search-view .replaceMatch,
.hc-black .monaco-workbench .search-view .findInFileMatch {
.hc-black.monaco-workbench .search-view .replaceMatch,
.hc-black.monaco-workbench .search-view .findInFileMatch {
background: none !important;
box-sizing: border-box;
}
......@@ -309,9 +309,9 @@
/* High Contrast Theming */
.hc-black .monaco-workbench .search-view .foldermatch,
.hc-black .monaco-workbench .search-view .filematch,
.hc-black .monaco-workbench .search-view .linematch {
.hc-black.monaco-workbench .search-view .foldermatch,
.hc-black.monaco-workbench .search-view .filematch,
.hc-black.monaco-workbench .search-view .linematch {
line-height: 20px;
}
......
......@@ -119,8 +119,8 @@
outline: none;
}
.hc-black .monaco-workbench .pane-body.integrated-terminal .xterm.focus::before,
.hc-black .monaco-workbench .pane-body.integrated-terminal .xterm:focus::before {
.hc-black.monaco-workbench .pane-body.integrated-terminal .xterm.focus::before,
.hc-black.monaco-workbench .pane-body.integrated-terminal .xterm:focus::before {
display: block;
content: "";
border: 1px solid;
......@@ -132,8 +132,8 @@
z-index: 10;
}
.hc-black .monaco-workbench .pane-body.integrated-terminal .monaco-split-view2.horizontal .split-view-view:not(:only-child) .xterm.focus::before,
.hc-black .monaco-workbench .pane-body.integrated-terminal .monaco-split-view2.horizontal .split-view-view:not(:only-child) .xterm:focus::before {
.hc-black.monaco-workbench .pane-body.integrated-terminal .monaco-split-view2.horizontal .split-view-view:not(:only-child) .xterm.focus::before,
.hc-black.monaco-workbench .pane-body.integrated-terminal .monaco-split-view2.horizontal .split-view-view:not(:only-child) .xterm:focus::before {
right: 0;
}
......@@ -147,8 +147,8 @@
opacity: 0 !important;
}
.vs-dark .monaco-workbench.mac .pane-body.integrated-terminal .terminal-outer-container:not(.alt-active) .terminal:not(.enable-mouse-events),
.hc-black .monaco-workbench.mac .pane-body.integrated-terminal .terminal-outer-container:not(.alt-active) .terminal:not(.enable-mouse-events) {
.vs-dark.monaco-workbench.mac .pane-body.integrated-terminal .terminal-outer-container:not(.alt-active) .terminal:not(.enable-mouse-events),
.hc-black.monaco-workbench.mac .pane-body.integrated-terminal .terminal-outer-container:not(.alt-active) .terminal:not(.enable-mouse-events) {
cursor: -webkit-image-set(url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAAL0lEQVQoz2NgCD3x//9/BhBYBWdhgFVAiVW4JBFKGIa4AqD0//9D3pt4I4tAdAMAHTQ/j5Zom30AAAAASUVORK5CYII=') 1x, url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAQAAADZc7J/AAAAz0lEQVRIx2NgYGBY/R8I/vx5eelX3n82IJ9FxGf6tksvf/8FiTMQAcAGQMDvSwu09abffY8QYSAScNk45G198eX//yev73/4///701eh//kZSARckrNBRvz//+8+6ZohwCzjGNjdgQxkAg7B9WADeBjIBqtJCbhRA0YNoIkBSNmaPEMoNmA0FkYNoFKhapJ6FGyAH3nauaSmPfwI0v/3OukVi0CIZ+F25KrtYcx/CTIy0e+rC7R1Z4KMICVTQQ14feVXIbR695u14+Ir4gwAAD49E54wc1kWAAAAAElFTkSuQmCC') 2x) 5 8, text;
}
......
......@@ -1484,8 +1484,8 @@ registerThemingParticipant((theme: IColorTheme, collector: ICssStyleCollector) =
const border = theme.getColor(activeContrastBorder);
if (border) {
collector.addRule(`
.hc-black .monaco-workbench .pane-body.integrated-terminal .xterm.focus::before,
.hc-black .monaco-workbench .pane-body.integrated-terminal .xterm:focus::before { border-color: ${border}; }`
.hc-black.monaco-workbench .pane-body.integrated-terminal .xterm.focus::before,
.hc-black.monaco-workbench .pane-body.integrated-terminal .xterm:focus::before { border-color: ${border}; }`
);
}
......
......@@ -60,15 +60,15 @@
color: rgba(0,0,0,.68);
}
.vs-dark .monaco-workbench .part.editor > .content.empty > .watermark dt,
.vs-dark .monaco-workbench .part.editor > .content.empty > .watermark dl {
.vs-dark.monaco-workbench .part.editor > .content.empty > .watermark dt,
.vs-dark.monaco-workbench .part.editor > .content.empty > .watermark dl {
color: rgba(255,255,255,.6);
}
.hc-black .monaco-workbench .part.editor > .content.empty > .watermark dt {
.hc-black.monaco-workbench .part.editor > .content.empty > .watermark dt {
color: #FFF;
}
.hc-black .monaco-workbench .part.editor > .content.empty > .watermark dl {
.hc-black.monaco-workbench .part.editor > .content.empty > .watermark dl {
color: #FFF;
opacity: 1;
}
......@@ -26,9 +26,9 @@
opacity: .4;
}
.hc-black .monaco-workbench.blur-background #workbench\.parts\.panel,
.hc-black .monaco-workbench.blur-background #workbench\.parts\.sidebar,
.hc-black .monaco-workbench.blur-background #workbench\.parts\.editor {
.hc-black.monaco-workbench.blur-background #workbench\.parts\.panel,
.hc-black.monaco-workbench.blur-background #workbench\.parts\.sidebar,
.hc-black.monaco-workbench.blur-background #workbench\.parts\.editor {
opacity: .2;
}
......@@ -154,8 +154,8 @@
background-size: 100%;
}
.vs-dark .monaco-workbench > .welcomeOverlay > .commandPalettePlaceholder,
.hc-black .monaco-workbench > .welcomeOverlay > .commandPalettePlaceholder {
.vs-dark.monaco-workbench > .welcomeOverlay > .commandPalettePlaceholder,
.hc-black.monaco-workbench > .welcomeOverlay > .commandPalettePlaceholder {
background-image: url('media/commandpalette-dark.svg');
}
@media screen and (max-width: 880px) {
......@@ -169,4 +169,4 @@
top: 10px;
left: 50%;
}
}
\ No newline at end of file
}
......@@ -76,7 +76,7 @@
display: block;
}
.hc-black .monaco-workbench .part.editor > .content .welcomePage .subtitle {
.hc-black.monaco-workbench .part.editor > .content .welcomePage .subtitle {
font-weight: 200;
}
......@@ -184,7 +184,7 @@
border: none;
}
.hc-black .monaco-workbench .part.editor > .content .welcomePage .commands .item button > h3 {
.hc-black.monaco-workbench .part.editor > .content .welcomePage .commands .item button > h3 {
font-weight: bold;
}
......@@ -193,12 +193,12 @@
outline-width: 1px;
}
.hc-black .monaco-workbench .part.editor > .content .welcomePage .commands .item button {
.hc-black.monaco-workbench .part.editor > .content .welcomePage .commands .item button {
border-width: 1px;
border-style: solid;
}
.hc-black .monaco-workbench .part.editor > .content .welcomePage .commands .item button:hover {
.hc-black.monaco-workbench .part.editor > .content .welcomePage .commands .item button:hover {
outline-width: 1px;
outline-style: dashed;
outline-offset: -5px;
......
......@@ -134,7 +134,7 @@
display: initial;
}
.hc-black .monaco-workbench .part.editor > .content .walkThroughContent .monaco-editor {
.hc-black.monaco-workbench .part.editor > .content .walkThroughContent .monaco-editor {
border-width: 1px;
border-style: solid;
}
......@@ -427,7 +427,6 @@ export class WorkbenchThemeService implements IWorkbenchThemeService {
} else {
removeClasses(this.container, VS_DARK_THEME, VS_LIGHT_THEME, VS_HC_THEME);
}
console.log(newTheme.id);
addClasses(this.container, newTheme.id);
this.currentColorTheme.clearCaches();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册