Skip to content

G
gitlab-ce
Commit b4f7fa0e authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files
Options

Merge branch 'remove-scss-variables-5' into 'master' 

Finish cleaning up reassigned variables

Closes #49807

See merge request gitlab-org/gitlab-ce!21349
parents bde1bdae 496c3779
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 118 deletions
app/assets/stylesheets/framework/callout.scss
View file @ b4f7fa0e
...@@ -25,25 +25,25 @@ ...@@ -25,25 +25,25 @@
/* Variations */ /* Variations */
.bs-callout-danger { .bs-callout-danger {
background-color: $callout-danger-bg; background-color: $red-100;
border-color: $callout-danger-border; border-color: $red-200;
color: $callout-danger-color; color: $red-700;
} }
.bs-callout-warning { .bs-callout-warning {
background-color: $callout-warning-bg; background-color: $orange-100;
border-color: $callout-warning-border; border-color: $orange-200;
color: $callout-warning-color; color: $orange-700;
} }
.bs-callout-info { .bs-callout-info {
background-color: $callout-info-bg; background-color: $blue-100;
border-color: $callout-info-border; border-color: $blue-200;
color: $callout-info-color; color: $blue-700;
} }
.bs-callout-success { .bs-callout-success {
background-color: $callout-success-bg; background-color: $green-100;
border-color: $callout-success-border; border-color: $green-200;
color: $callout-success-color; color: $green-700;
} }
app/assets/stylesheets/framework/common.scss
View file @ b4f7fa0e
/** COLORS **/ /** COLORS **/
.cgray { color: $common-gray; } .cgray { color: $gl-text-color; }
.clgray { color: $common-gray-light; } .clgray { color: $common-gray-light; }
.cred { color: $common-red; } .cred { color: $red-500; }
.cgreen { color: $common-green; } .cgreen { color: $green-600; }
.cdark { color: $common-gray-dark; } .cdark { color: $common-gray-dark; }
.text-plain, .text-plain,
...@@ -44,10 +44,10 @@ ...@@ -44,10 +44,10 @@
} }
.hint { font-style: italic; color: $hint-color; } .hint { font-style: italic; color: $hint-color; }
.light { color: $common-gray; } .light { color: $gl-text-color; }
.slead { .slead {
color: $common-gray; color: $gl-text-color;
font-size: 14px; font-size: 14px;
margin-bottom: 12px; margin-bottom: 12px;
font-weight: $gl-font-weight-normal; font-weight: $gl-font-weight-normal;
......
app/assets/stylesheets/framework/dropdowns.scss
View file @ b4f7fa0e
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
} }
@mixin dropdown-item-hover { @mixin dropdown-item-hover {
background-color: $dropdown-item-hover-bg; background-color: $gray-darker;
color: $gl-text-color; color: $gl-text-color;
outline: 0; outline: 0;
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
text-decoration: none; text-decoration: none;
.badge.badge-pill { .badge.badge-pill {
background-color: darken($dropdown-link-hover-bg, 5%); background-color: darken($blue-50, 5%);
} }
} }
...@@ -233,7 +233,7 @@ ...@@ -233,7 +233,7 @@
font-weight: $gl-font-weight-normal; font-weight: $gl-font-weight-normal;
padding: 8px 0; padding: 8px 0;
background-color: $white-light; background-color: $white-light;
border: 1px solid $dropdown-border-color; border: 1px solid $border-color;
border-radius: $border-radius-base; border-radius: $border-radius-base;
box-shadow: 0 2px 4px $dropdown-shadow-color; box-shadow: 0 2px 4px $dropdown-shadow-color;
...@@ -874,7 +874,7 @@ header.header-content .dropdown-menu.frequent-items-dropdown-menu { ...@@ -874,7 +874,7 @@ header.header-content .dropdown-menu.frequent-items-dropdown-menu {
overflow-y: auto; overflow-y: auto;
li.section-empty.section-failure { li.section-empty.section-failure {
color: $callout-danger-color; color: $red-700;
} }
.frequent-items-list-item-container a { .frequent-items-list-item-container a {
......
app/assets/stylesheets/framework/feature_highlight.scss
View file @ b4f7fa0e
...@@ -72,11 +72,11 @@ ...@@ -72,11 +72,11 @@
.feature-highlight-popover { .feature-highlight-popover {
width: 240px; width: 240px;
padding: 0; padding: 0;
border: 1px solid $dropdown-border-color; border: 1px solid $border-color;
box-shadow: 0 2px 4px $dropdown-shadow-color; box-shadow: 0 2px 4px $dropdown-shadow-color;
&.right > .arrow { &.right > .arrow {
border-right-color: $dropdown-border-color; border-right-color: $border-color;
} }
.popover-body { .popover-body {
......
app/assets/stylesheets/framework/files.scss
View file @ b4f7fa0e
...@@ -312,11 +312,11 @@ span.idiff { ...@@ -312,11 +312,11 @@ span.idiff {
text-decoration: none; text-decoration: none;
.new-file { .new-file {
color: $notify-new-file; color: $green-600;
} }
.deleted-file { .deleted-file {
color: $notify-deleted-file; color: $red-700;
} }
} }
} }
......
app/assets/stylesheets/framework/forms.scss
View file @ b4f7fa0e
...@@ -8,7 +8,7 @@ input { ...@@ -8,7 +8,7 @@ input {
input[type='text'].danger { input[type='text'].danger {
background: $input-danger-bg !important; background: $input-danger-bg !important;
border-color: $input-danger-border; border-color: $red-400;
text-shadow: 0 1px 1px $white-light; text-shadow: 0 1px 1px $white-light;
} }
......
app/assets/stylesheets/framework/selects.scss
View file @ b4f7fa0e
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
.select2-drop.select2-drop-above { .select2-drop.select2-drop-above {
box-shadow: 0 2px 4px $dropdown-shadow-color; box-shadow: 0 2px 4px $dropdown-shadow-color;
border-radius: $border-radius-base; border-radius: $border-radius-base;
border: 1px solid $dropdown-border-color; border: 1px solid $border-color;
min-width: 175px; min-width: 175px;
color: $gl-text-color; color: $gl-text-color;
z-index: 999; z-index: 999;
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
} }
.select2-drop.select2-drop-above.select2-drop-active { .select2-drop.select2-drop-above.select2-drop-active {
border-top: 1px solid $dropdown-border-color; border-top: 1px solid $border-color;
margin-top: -6px; margin-top: -6px;
} }
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
color: $gl-text-color; color: $gl-text-color;
.select2-result-label { .select2-result-label {
background: $dropdown-item-hover-bg; background: $gray-darker;
} }
} }
......
app/assets/stylesheets/framework/variables.scss
View file @ b4f7fa0e
...@@ -319,7 +319,6 @@ $line-select-yellow-dark: #f0e2bd; ...@@ -319,7 +319,6 @@ $line-select-yellow-dark: #f0e2bd;
$dark-diff-match-bg: rgba(255, 255, 255, 0.3); $dark-diff-match-bg: rgba(255, 255, 255, 0.3);
$dark-diff-match-color: rgba(255, 255, 255, 0.1); $dark-diff-match-color: rgba(255, 255, 255, 0.1);
$file-mode-changed: #777; $file-mode-changed: #777;
$file-mode-changed: #777;
$diff-image-info-color: gray; $diff-image-info-color: gray;
$diff-swipe-border: #999; $diff-swipe-border: #999;
$diff-view-modes-color: gray; $diff-view-modes-color: gray;
...@@ -342,9 +341,7 @@ $dropdown-min-height: 40px; ...@@ -342,9 +341,7 @@ $dropdown-min-height: 40px;
$dropdown-max-height: 312px; $dropdown-max-height: 312px;
$dropdown-vertical-offset: 4px; $dropdown-vertical-offset: 4px;
$dropdown-link-color: #555; $dropdown-link-color: #555;
$dropdown-link-hover-bg: $blue-50;
$dropdown-empty-row-bg: rgba(#000, 0.04); $dropdown-empty-row-bg: rgba(#000, 0.04);
$dropdown-border-color: $border-color;
$dropdown-shadow-color: rgba(#000, 0.1); $dropdown-shadow-color: rgba(#000, 0.1);
$dropdown-divider-color: rgba(#000, 0.1); $dropdown-divider-color: rgba(#000, 0.1);
$dropdown-title-btn-color: #bfbfbf; $dropdown-title-btn-color: #bfbfbf;
...@@ -354,7 +351,6 @@ $dropdown-input-focus-shadow: rgba($blue-300, 0.4); ...@@ -354,7 +351,6 @@ $dropdown-input-focus-shadow: rgba($blue-300, 0.4);
$dropdown-loading-bg: rgba(#fff, 0.6); $dropdown-loading-bg: rgba(#fff, 0.6);
$dropdown-chevron-size: 10px; $dropdown-chevron-size: 10px;
$dropdown-toggle-active-border-color: darken($border-color, 14%); $dropdown-toggle-active-border-color: darken($border-color, 14%);
$dropdown-item-hover-bg: $gray-darker;
$dropdown-fade-mask-height: 32px; $dropdown-fade-mask-height: 32px;
$dropdown-member-form-control-width: 163px; $dropdown-member-form-control-width: 163px;
...@@ -495,22 +491,6 @@ $blame-blue: #254e77; ...@@ -495,22 +491,6 @@ $blame-blue: #254e77;
*/ */
$builds-trace-bg: #111; $builds-trace-bg: #111;
/*
* Callout
*/
$callout-danger-bg: $red-100;
$callout-danger-border: $red-200;
$callout-danger-color: $red-700;
$callout-warning-bg: $orange-100;
$callout-warning-border: $orange-200;
$callout-warning-color: $orange-700;
$callout-info-bg: $blue-100;
$callout-info-border: $blue-200;
$callout-info-color: $blue-700;
$callout-success-bg: $green-100;
$callout-success-border: $green-200;
$callout-success-color: $green-700;
/* /*
* Commit Page * Commit Page
*/ */
...@@ -520,16 +500,8 @@ $commit-message-text-area-bg: rgba(0, 0, 0, 0); ...@@ -520,16 +500,8 @@ $commit-message-text-area-bg: rgba(0, 0, 0, 0);
/* /*
* Common * Common
*/ */
$common-gray: $gl-text-color;
$common-gray-light: #bbb; $common-gray-light: #bbb;
$common-gray-dark: #444; $common-gray-dark: #444;
$common-red: $red-500;
$common-green: $green-600;
/*
* Editor
*/
$editor-cancel-color: $red-600;
/* /*
* Events * Events
...@@ -550,7 +522,6 @@ $logs-p-color: #333; ...@@ -550,7 +522,6 @@ $logs-p-color: #333;
*/ */
$input-height: 34px; $input-height: 34px;
$input-danger-bg: #f2dede; $input-danger-bg: #f2dede;
$input-danger-border: $red-400;
$input-group-addon-bg: #f7f8fa; $input-group-addon-bg: #f7f8fa;
$gl-field-focus-shadow: rgba(0, 0, 0, 0.075); $gl-field-focus-shadow: rgba(0, 0, 0, 0.075);
$gl-field-focus-shadow-error: rgba($red-500, 0.6); $gl-field-focus-shadow-error: rgba($red-500, 0.6);
...@@ -596,17 +567,10 @@ $fade-in-duration: 200ms; ...@@ -596,17 +567,10 @@ $fade-in-duration: 200ms;
$fade-mask-transition-duration: 0.1s; $fade-mask-transition-duration: 0.1s;
$fade-mask-transition-curve: ease-in-out; $fade-mask-transition-curve: ease-in-out;
/*
* Lint
*/
$lint-incorrect-color: $red-500;
$lint-correct-color: $green-500;
/* /*
* Login * Login
*/ */
$login-brand-holder-color: #888; $login-brand-holder-color: #888;
$login-devise-error-color: $red-700;
/* /*
* Nav * Nav
...@@ -619,15 +583,12 @@ $nav-toggle-gray: #666; ...@@ -619,15 +583,12 @@ $nav-toggle-gray: #666;
*/ */
$notify-details: #777; $notify-details: #777;
$notify-footer: #777; $notify-footer: #777;
$notify-new-file: $green-600;
$notify-deleted-file: $red-700;
/* /*
* Projects * Projects
*/ */
$project-option-descr-color: #54565b; $project-option-descr-color: #54565b;
$project-breadcrumb-color: #999; $project-breadcrumb-color: #999;
$project-private-forks-notice-odd: $green-600;
$project-network-controls-color: #888; $project-network-controls-color: #888;
$feature-toggle-color: #fff; $feature-toggle-color: #fff;
...@@ -635,22 +596,11 @@ $feature-toggle-text-color: #fff; ...@@ -635,22 +596,11 @@ $feature-toggle-text-color: #fff;
$feature-toggle-color-disabled: #999; $feature-toggle-color-disabled: #999;
$feature-toggle-color-enabled: #4a8bee; $feature-toggle-color-enabled: #4a8bee;
/*
* Runners
*/
$runner-state-shared-bg: $green-400;
$runner-state-specific-bg: $blue-400;
$runner-status-online-color: $green-600;
$runner-status-offline-color: $gray-darkest;
$runner-status-paused-color: $red-500;
/* /*
Stat Graph Stat Graph
*/ */
$stat-graph-common-bg: #f3f3f3; $stat-graph-common-bg: #f3f3f3;
$stat-graph-area-fill: $green-500;
$stat-graph-axis-fill: #aaa; $stat-graph-axis-fill: #aaa;
$stat-graph-orange-fill: $orange-500;
$stat-graph-selection-fill: #333; $stat-graph-selection-fill: #333;
$stat-graph-selection-stroke: #333; $stat-graph-selection-stroke: #333;
...@@ -663,7 +613,6 @@ $select2-drop-shadow2: rgba(31, 37, 50, 0.317647); ...@@ -663,7 +613,6 @@ $select2-drop-shadow2: rgba(31, 37, 50, 0.317647);
/* /*
* Todo * Todo
*/ */
$todo-alert-blue: $blue-500;
$todo-body-pre-color: #777; $todo-body-pre-color: #777;
$todo-body-border: #ddd; $todo-body-border: #ddd;
...@@ -686,7 +635,6 @@ $ui-dev-kit-example-border: #ddd; ...@@ -686,7 +635,6 @@ $ui-dev-kit-example-border: #ddd;
/* /*
Pipeline Graph Pipeline Graph
*/ */
$stage-hover-bg: $gray-darker;
$ci-action-icon-size: 22px; $ci-action-icon-size: 22px;
$ci-action-icon-size-lg: 24px; $ci-action-icon-size-lg: 24px;
$pipeline-dropdown-line-height: 20px; $pipeline-dropdown-line-height: 20px;
...@@ -713,13 +661,6 @@ Animation Functions ...@@ -713,13 +661,6 @@ Animation Functions
*/ */
$dropdown-animation-timing: cubic-bezier(0.23, 1, 0.32, 1); $dropdown-animation-timing: cubic-bezier(0.23, 1, 0.32, 1);
/*
Convdev Index
*/
$color-high-score: $green-400;
$color-average-score: $orange-400;
$color-low-score: $red-400;
/* /*
Performance Bar Performance Bar
*/ */
...@@ -761,9 +702,5 @@ Modals ...@@ -761,9 +702,5 @@ Modals
*/ */
$modal-body-height: 134px; $modal-body-height: 134px;
/*
Prometheus
*/
$prometheus-table-row-highlight-color: $theme-gray-100;
$priority-label-empty-state-width: 114px; $priority-label-empty-state-width: 114px;
app/assets/stylesheets/pages/builds.scss
View file @ b4f7fa0e
...@@ -397,7 +397,7 @@ ...@@ -397,7 +397,7 @@
} }
&:hover { &:hover {
background-color: $dropdown-item-hover-bg; background-color: $gray-darker;
} }
.icon-retry { .icon-retry {
......
app/assets/stylesheets/pages/convdev_index.scss
View file @ b4f7fa0e
...@@ -80,7 +80,7 @@ $space-between-cards: 8px; ...@@ -80,7 +80,7 @@ $space-between-cards: 8px;
} }
.convdev-card-low { .convdev-card-low {
border-top-color: $color-low-score; border-top-color: $red-400;
.board-card-score-big { .board-card-score-big {
background-color: $red-50; background-color: $red-50;
...@@ -88,7 +88,7 @@ $space-between-cards: 8px; ...@@ -88,7 +88,7 @@ $space-between-cards: 8px;
} }
.convdev-card-average { .convdev-card-average {
border-top-color: $color-average-score; border-top-color: $orange-400;
.board-card-score-big { .board-card-score-big {
background-color: $orange-50; background-color: $orange-50;
...@@ -96,7 +96,7 @@ $space-between-cards: 8px; ...@@ -96,7 +96,7 @@ $space-between-cards: 8px;
} }
.convdev-card-high { .convdev-card-high {
border-top-color: $color-high-score; border-top-color: $green-400;
.board-card-score-big { .board-card-score-big {
background-color: $green-50; background-color: $green-50;
...@@ -243,13 +243,13 @@ $space-between-cards: 8px; ...@@ -243,13 +243,13 @@ $space-between-cards: 8px;
} }
.convdev-high-score { .convdev-high-score {
color: $color-high-score; color: $green-400;
} }
.convdev-average-score { .convdev-average-score {
color: $color-average-score; color: $orange-400;
} }
.convdev-low-score { .convdev-low-score {
color: $color-low-score; color: $red-400;
} }
app/assets/stylesheets/pages/editor.scss
View file @ b4f7fa0e
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
} }
.cancel-btn { .cancel-btn {
color: $editor-cancel-color; color: $red-600;
&:hover { &:hover {
color: $editor-cancel-color; color: $red-600;
} }
} }
......
app/assets/stylesheets/pages/environments.scss
View file @ b4f7fa0e
...@@ -501,5 +501,5 @@ ...@@ -501,5 +501,5 @@
} }
.prometheus-table-row-highlight { .prometheus-table-row-highlight {
background-color: $prometheus-table-row-highlight-color; background-color: $theme-gray-100;
} }
app/assets/stylesheets/pages/login.scss
View file @ b4f7fa0e
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
h2 { h2 {
margin-top: 0; margin-top: 0;
font-size: 14px; font-size: 14px;
color: $login-devise-error-color; color: $red-700;
} }
} }
} }
......
app/assets/stylesheets/pages/pipelines.scss
View file @ b4f7fa0e
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
background-color: $white-light; background-color: $white-light;
&:hover { &:hover {
background-color: $stage-hover-bg; background-color: $gray-darker;
border: 1px solid $dropdown-toggle-active-border-color; border: 1px solid $dropdown-toggle-active-border-color;
color: $gl-text-color; color: $gl-text-color;
} }
...@@ -595,7 +595,7 @@ ...@@ -595,7 +595,7 @@
a.build-content:hover, a.build-content:hover,
button.build-content:hover { button.build-content:hover {
background-color: $stage-hover-bg; background-color: $gray-darker;
border: 1px solid $dropdown-toggle-active-border-color; border: 1px solid $dropdown-toggle-active-border-color;
} }
...@@ -668,7 +668,7 @@ ...@@ -668,7 +668,7 @@
display: block; display: block;
&:hover { &:hover {
background-color: $stage-hover-bg; background-color: $gray-darker;
border: 1px solid $dropdown-toggle-active-border-color; border: 1px solid $dropdown-toggle-active-border-color;
svg { svg {
...@@ -835,7 +835,7 @@ button.mini-pipeline-graph-dropdown-toggle { ...@@ -835,7 +835,7 @@ button.mini-pipeline-graph-dropdown-toggle {
display: block; display: block;
&:hover { &:hover {
background-color: $stage-hover-bg; background-color: $gray-darker;
border: 1px solid $dropdown-toggle-active-border-color; border: 1px solid $dropdown-toggle-active-border-color;
svg { svg {
...@@ -934,7 +934,7 @@ button.mini-pipeline-graph-dropdown-toggle { ...@@ -934,7 +934,7 @@ button.mini-pipeline-graph-dropdown-toggle {
&:focus { &:focus {
outline: none; outline: none;
text-decoration: none; text-decoration: none;
background-color: $stage-hover-bg; background-color: $gray-darker;
} }
} }
} }
......
app/assets/stylesheets/pages/projects.scss
View file @ b4f7fa0e
...@@ -900,7 +900,7 @@ pre.light-well { ...@@ -900,7 +900,7 @@ pre.light-well {
.private-forks-notice .private-fork-icon { .private-forks-notice .private-fork-icon {
i:nth-child(1) { i:nth-child(1) {
color: $project-private-forks-notice-odd; color: $green-600;
} }
i:nth-child(2) { i:nth-child(2) {
...@@ -1128,12 +1128,12 @@ pre.light-well { ...@@ -1128,12 +1128,12 @@ pre.light-well {
.project-ci-body { .project-ci-body {
.incorrect-syntax { .incorrect-syntax {
font-size: 18px; font-size: 18px;
color: $lint-incorrect-color; color: $red-500;
} }
.correct-syntax { .correct-syntax {
font-size: 18px; font-size: 18px;
color: $lint-correct-color; color: $green-500;
} }
} }
......
app/assets/stylesheets/pages/runners.scss
View file @ b4f7fa0e
...@@ -4,24 +4,24 @@ ...@@ -4,24 +4,24 @@
color: $white-light; color: $white-light;
&.runner-state-shared { &.runner-state-shared {
background: $runner-state-shared-bg; background: $green-400;
} }
&.runner-state-specific { &.runner-state-specific {
background: $runner-state-specific-bg; background: $blue-400;
} }
} }
.runner-status-online { .runner-status-online {
color: $runner-status-online-color; color: $green-600;
} }
.runner-status-offline { .runner-status-offline {
color: $runner-status-offline-color; color: $gray-darkest;
} }
.runner-status-paused { .runner-status-paused {
color: $runner-status-paused-color; color: $red-500;
} }
.runner { .runner {
......
app/assets/stylesheets/pages/stat_graph.scss
View file @ b4f7fa0e
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
} }
.area { .area {
fill: $stat-graph-area-fill; fill: $green-500;
fill-opacity: 0.5; fill-opacity: 0.5;
} }
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
} }
.area-contributor { .area-contributor {
fill: $stat-graph-orange-fill; fill: $orange-500;
} }
} }
} }
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7