Commit 0965ca8d authored by Martin Wortschack's avatar Martin Wortschack

Merge branch '217432-dark-theme-css-cleanup' into 'master'

Move some css variables from _ide_theme_overrides.scss file to ide.scss

See merge request gitlab-org/gitlab!31865
parents 226bd0cc d13ac0d6
...@@ -148,19 +148,6 @@ export default { ...@@ -148,19 +148,6 @@ export default {
cursor: pointer; cursor: pointer;
} }
.file-row:hover,
.file-row:focus {
background: #f2f2f2;
}
.file-row:active {
background: #dfdfdf;
}
.file-row.is-active {
background: #f2f2f2;
}
.file-row-name-container { .file-row-name-container {
display: flex; display: flex;
width: 100%; width: 100%;
......
...@@ -16,18 +16,11 @@ ...@@ -16,18 +16,11 @@
.md table:not(.code), .md table:not(.code),
.md, .md,
.md p, .md p,
.ide-view,
.context-header > a, .context-header > a,
.ide-sidebar-link,
.multi-file-tab-close,
.ide-tree-header button,
.ide-status-bar,
input, input,
textarea, textarea,
.md-area.is-focused, .md-area.is-focused,
.ide-entry-dropdown-toggle,
.dropdown-menu li button, .dropdown-menu li button,
.ide-merge-request-project-path,
.dropdown-menu-selectable li a.is-active, .dropdown-menu-selectable li a.is-active,
.dropdown-menu-inner-title, .dropdown-menu-inner-title,
.dropdown-menu-inner-content, .dropdown-menu-inner-content,
...@@ -36,9 +29,7 @@ ...@@ -36,9 +29,7 @@
.nav-links:not(.quick-links) li:not(.md-header-toolbar) a.active .badge.badge-pill, .nav-links:not(.quick-links) li:not(.md-header-toolbar) a.active .badge.badge-pill,
.nav-links:not(.quick-links) li:not(.md-header-toolbar) a:hover .badge.badge-pill, .nav-links:not(.quick-links) li:not(.md-header-toolbar) a:hover .badge.badge-pill,
.badge.badge-pill, .badge.badge-pill,
.ide-navigator-button,
.bs-callout, .bs-callout,
.ide-navigator-btn,
.ide-pipeline .top-bar, .ide-pipeline .top-bar,
.ide-pipeline .top-bar .controllers .controllers-buttons { .ide-pipeline .top-bar .controllers .controllers-buttons {
color: var(--ide-text-color); color: var(--ide-text-color);
...@@ -49,29 +40,14 @@ ...@@ -49,29 +40,14 @@
background-color: var(--ide-dropdown-hover-background); background-color: var(--ide-dropdown-hover-background);
} }
.dropdown-menu-toggle svg,
.dropdown-menu-toggle svg:hover,
.ide-tree-header:not(.ide-pipeline-header) svg,
.file-row .file-row-icon svg, .file-row .file-row-icon svg,
.file-row:hover .file-row-icon svg, .file-row:hover .file-row-icon svg,
.controllers-buttons svg { .controllers-buttons svg {
fill: var(--ide-text-color); color: var(--ide-text-color-secondary);
}
.ide-pipeline svg {
--svg-status-bg: var(--ide-background);
}
.multi-file-tab-close:hover {
background-color: var(--ide-input-border);
}
.ide-review-sub-header:hover {
color: var(--ide-input-border);
} }
.text-secondary { .text-secondary {
color: var(--ide-text-color) !important; color: var(--ide-text-color-secondary) !important;
} }
input[type='search']::placeholder, input[type='search']::placeholder,
...@@ -82,23 +58,10 @@ ...@@ -82,23 +58,10 @@
} }
.ide-nav-form .input-icon { .ide-nav-form .input-icon {
fill: var(--ide-input-border); color: var(--ide-input-border);
} }
code, code,
.multi-file-commit-panel,
.multi-file-tabs,
.multi-file-tabs li,
.file-row:hover,
.file-row:focus,
.multi-file-commit-list-path:hover,
.multi-file-commit-list-path:focus,
.multi-file-commit-list-path.is-active,
.file-row.is-active,
.ide-commit-editor-header,
.ide-file-templates,
.ide-entry-dropdown-toggle,
.ide-staged-action-btn,
.badge.badge-pill, .badge.badge-pill,
.card-header, .card-header,
.bs-callout, .bs-callout,
...@@ -119,80 +82,33 @@ ...@@ -119,80 +82,33 @@
border-color: var(--ide-dropdown-hover-background); border-color: var(--ide-dropdown-hover-background);
} }
.ide-sidebar-link:hover,
.multi-file-tabs li {
background-color: var(--ide-background-hover);
}
.common-note-form .md-area { .common-note-form .md-area {
border-color: var(--ide-input-border); border-color: var(--ide-input-border);
} }
&, &,
.md table:not(.code) tr th, .md table:not(.code) tr th,
.multi-file-commit-panel-inner-content,
.multi-file-commit-form,
.multi-file-tabs li.active,
.ide-sidebar-link.active,
.ide-sidebar-link.active::after,
.ide-right-sidebar .multi-file-commit-panel-inner,
.common-note-form .md-area, .common-note-form .md-area,
.ide-commit-message-field, .card {
.card,
.multi-file-commit-panel-success-message,
.ide-preview-header {
background-color: var(--ide-highlight-background); background-color: var(--ide-highlight-background);
} }
.multi-file-commit-panel {
padding-right: 0;
}
.ide-mode-tabs,
.multi-file-commit-panel-inner,
.multi-file-commit-panel-inner-content,
.multi-file-commit-form,
.multi-file-edit-pane,
.ide-right-sidebar .ide-activity-bar,
.ide-sidebar-link.active,
.multi-file-tabs li.active,
.multi-file-tabs li,
.ide-status-bar,
.ide-commit-editor-header,
.ide-file-templates,
.card, .card,
.card-header, .card-header,
.ide-job-item:not(:last-child),
.ide-terminal .top-bar, .ide-terminal .top-bar,
.ide-pipeline .top-bar { .ide-pipeline .top-bar {
border-color: var(--ide-border-color); border-color: var(--ide-border-color);
} }
hr,
.md h1, .md h1,
.md h2, .md h2,
.md blockquote, .md blockquote,
pre, pre,
.md table:not(.code) tbody td, .md table:not(.code) tbody td,
.md table:not(.code) tr th, .md table:not(.code) tr th,
.multi-file-commit-form > .commit-form-compact, .nav-links:not(.quick-links) {
.ide-tree-header, border-color: var(--ide-border-color-alt);
.multi-file-commit-panel-header,
.multi-file-commit-form > form,
.multi-file-commit-form hr,
.ide-commit-list-container.is-first,
.multi-file-commit-form .nav-links:not(.quick-links),
.ide-pipeline-list .nav-links:not(.quick-links),
.ide-preview-header {
border-color: var(--ide-background);
}
.multi-file-tabs li.active {
border-bottom-color: var(--ide-highlight-background);
}
.multi-file-tabs,
.ide-commit-editor-header {
box-shadow: inset 0 -1px var(--ide-border-color);
} }
.ide-sidebar-link.active { .ide-sidebar-link.active {
...@@ -219,10 +135,6 @@ ...@@ -219,10 +135,6 @@
} }
} }
.ide-status-bar {
background-color: var(--ide-footer-background);
}
input[type='text'], input[type='text'],
input[type='search'], input[type='search'],
.filtered-search-box { .filtered-search-box {
...@@ -251,10 +163,6 @@ ...@@ -251,10 +163,6 @@
} }
} }
.ide-entry-dropdown-toggle:hover {
background: var(--ide-file-row-btn-hover-background);
}
@function calc-btn-hover-padding($original-padding, $original-border: 1px) { @function calc-btn-hover-padding($original-padding, $original-border: 1px) {
@return calc(#{$original-padding + $original-border} - var(--ide-btn-hover-border-width)); @return calc(#{$original-padding + $original-border} - var(--ide-btn-hover-border-width));
} }
...@@ -313,10 +221,6 @@ ...@@ -313,10 +221,6 @@
border-color: var(--ide-highlight-accent); border-color: var(--ide-highlight-accent);
} }
.ide-nav-form .nav-links li a:not(.active) {
background-color: var(--ide-dropdown-background);
}
.nav-links:not(.quick-links) li:not(.md-header-toolbar) a { .nav-links:not(.quick-links) li:not(.md-header-toolbar) a {
color: var(--ide-text-color); color: var(--ide-text-color);
...@@ -367,18 +271,11 @@ ...@@ -367,18 +271,11 @@
color: var(--ide-btn-disabled-color) !important; color: var(--ide-btn-disabled-color) !important;
} }
.md-previewer,
pre code, pre code,
.md table:not(.code) tbody, .md table:not(.code) tbody {
.ide-empty-state {
background-color: var(--ide-border-color); background-color: var(--ide-border-color);
} }
.ide-tree-header svg:focus,
.ide-tree-header svg:hover {
color: var(--ide-link-color);
}
.animation-container { .animation-container {
[class^='skeleton-line-'] { [class^='skeleton-line-'] {
background-color: var(--ide-animation-gradient-1); background-color: var(--ide-animation-gradient-1);
......
...@@ -3,8 +3,10 @@ ...@@ -3,8 +3,10 @@
// ------- // -------
.ide.theme-dark { .ide.theme-dark {
--ide-border-color: #1d1f21; --ide-border-color: #1d1f21;
--ide-border-color-alt: #333;
--ide-highlight-accent: #fff; --ide-highlight-accent: #fff;
--ide-text-color: #ccc; --ide-text-color: #ccc;
--ide-text-color-secondary: #ccc;
--ide-background: #333; --ide-background: #333;
--ide-background-hover: #2d2d2d; --ide-background-hover: #2d2d2d;
--ide-highlight-background: #252526; --ide-highlight-background: #252526;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment