Skip to content

G
gitlab-ce
Commit ac38fed1 authored by Clement Ho's avatar Clement Ho
Browse files
Options

Merge branch 'ee-50632-combine-color-duplicates' into 'master' 

EE port of 50632-combine-color-duplicates

See merge request gitlab-org/gitlab-ee!6982
parents 5ee05bbb 70231fc0
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 258 deletions
app/assets/stylesheets/framework.scss
View file @ ac38fed1
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
@import 'framework/header'; @import 'framework/header';
@import 'framework/highlight'; @import 'framework/highlight';
@import 'framework/issue_box'; @import 'framework/issue_box';
@import 'framework/jquery';
@import 'framework/lists'; @import 'framework/lists';
@import 'framework/logo'; @import 'framework/logo';
@import 'framework/markdown_area'; @import 'framework/markdown_area';
......
app/assets/stylesheets/framework/avatar.scss
View file @ ac38fed1
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
.identicon { .identicon {
text-align: center; text-align: center;
vertical-align: top; vertical-align: top;
color: $identicon-fg-color; color: $gl-gray-700;
background-color: $gray-darker; background-color: $gray-darker;
// Sizes // Sizes
......
app/assets/stylesheets/framework/buttons.scss
View file @ ac38fed1
...@@ -369,7 +369,7 @@ ...@@ -369,7 +369,7 @@
} }
.clone-dropdown-btn a { .clone-dropdown-btn a {
color: $dropdown-link-color; color: $gl-gray-700;
&:hover { &:hover {
text-decoration: none; text-decoration: none;
......
app/assets/stylesheets/framework/common.scss
View file @ ac38fed1
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
color: $brand-info; color: $brand-info;
} }
.hint { font-style: italic; color: $hint-color; } .hint { font-style: italic; color: $gl-gray-400; }
.light { color: $gl-text-color; } .light { color: $gl-text-color; }
.slead { .slead {
...@@ -70,13 +70,6 @@ pre { ...@@ -70,13 +70,6 @@ pre {
padding: 0; padding: 0;
} }
&.card.card-body-pre {
border: 1px solid $gray-darker;
background: $gray-light;
border-radius: 0;
color: $well-pre-color;
}
&.wrap { &.wrap {
word-break: break-word; word-break: break-word;
white-space: pre-wrap; white-space: pre-wrap;
...@@ -121,49 +114,24 @@ hr { ...@@ -121,49 +114,24 @@ hr {
text-decoration: none; text-decoration: none;
} }
.back-link {
font-size: 14px;
}
table { table {
a code { a code {
position: relative; position: relative;
top: -2px; top: -2px;
margin-right: 3px; margin-right: 3px;
} }
td.permission-x {
background: $table-permission-x-bg !important;
text-align: center;
}
} }
.loading { .loading {
margin: 20px auto; margin: 20px auto;
height: 40px; height: 40px;
color: $loading-color; color: $gl-gray-700;
font-size: 32px; font-size: 32px;
text-align: center; text-align: center;
} }
span.update-author {
display: block;
color: $update-author-color;
font-weight: $gl-font-weight-normal;
font-style: italic;
strong {
font-weight: $gl-font-weight-bold;
font-style: normal;
}
}
.field_with_errors {
display: inline;
}
p.time { p.time {
color: $time-color; color: $gl-gray-400;
font-size: 90%; font-size: 90%;
margin: 30px 3px 3px 2px; margin: 30px 3px 3px 2px;
} }
...@@ -197,40 +165,11 @@ li.note { ...@@ -197,40 +165,11 @@ li.note {
background-color: inherit; background-color: inherit;
} }
.project_member_show {
td:first-child {
color: $project-member-show-color;
}
}
.rss-icon {
img {
width: 24px;
vertical-align: top;
}
strong {
line-height: 24px;
}
}
.show-suppressed-diff, .show-suppressed-diff,
.show-all-commits { .show-all-commits {
cursor: pointer; cursor: pointer;
} }
.git_error_tips {
@extend .col-lg-6;
text-align: left;
margin-top: 40px;
pre {
background: $white-light;
border: 0;
font-size: 12px;
}
}
.error-message { .error-message {
padding: 10px; padding: 10px;
background: $red-400; background: $red-400;
...@@ -258,7 +197,7 @@ li.note { ...@@ -258,7 +197,7 @@ li.note {
.gitlab-promo { .gitlab-promo {
a { a {
color: $gl-promo-color; color: $gl-gray-350;
margin-right: 30px; margin-right: 30px;
} }
} }
...@@ -271,19 +210,6 @@ li.note { ...@@ -271,19 +210,6 @@ li.note {
} }
} }
.control-group {
.controls {
span {
&.descr {
position: relative;
top: 2px;
left: 5px;
color: $control-group-descr-color;
}
}
}
}
img.emoji { img.emoji {
height: 20px; height: 20px;
vertical-align: top; vertical-align: top;
...@@ -302,12 +228,6 @@ img.emoji { ...@@ -302,12 +228,6 @@ img.emoji {
margin-bottom: 10px; margin-bottom: 10px;
} }
.side-filters {
fieldset {
margin-bottom: 15px;
}
}
.footer-links { .footer-links {
margin-bottom: 20px; margin-bottom: 20px;
...@@ -329,25 +249,6 @@ img.emoji { ...@@ -329,25 +249,6 @@ img.emoji {
text-align: center; text-align: center;
} }
.header-with-avatar {
h3 {
margin: 0;
font-weight: $gl-font-weight-bold;
}
.username {
font-size: 18px;
color: $username-color;
margin-top: 8px;
}
.description {
font-size: $gl-font-size;
color: $description-color;
margin-top: 8px;
}
}
.dropzone .dz-preview .dz-progress { .dropzone .dz-preview .dz-progress {
border-color: $border-color !important; border-color: $border-color !important;
...@@ -386,16 +287,6 @@ img.emoji { ...@@ -386,16 +287,6 @@ img.emoji {
} }
} }
.content-separator {
margin-left: -$gl-padding;
margin-right: -$gl-padding;
border-top: 1px solid $border-color;
}
.hide-bottom-border {
border-bottom: 0 !important;
}
.gl-accessibility { .gl-accessibility {
&:focus { &:focus {
display: flex; display: flex;
......
app/assets/stylesheets/framework/dropdowns.scss
View file @ ac38fed1
...@@ -607,25 +607,25 @@ ...@@ -607,25 +607,25 @@
width: 100%; width: 100%;
min-height: 30px; min-height: 30px;
padding: 0 7px; padding: 0 7px;
color: $dropdown-input-color; color: $gl-gray-700;
line-height: 30px; line-height: 30px;
border: 1px solid $dropdown-divider-color; border: 1px solid $dropdown-divider-color;
border-radius: 2px; border-radius: 2px;
outline: 0; outline: 0;
&:focus { &:focus {
color: $dropdown-link-color; color: $gl-gray-700;
border-color: $blue-300; border-color: $blue-300;
box-shadow: 0 0 4px $dropdown-input-focus-shadow; box-shadow: 0 0 4px $dropdown-input-focus-shadow;
~ .fa { ~ .fa {
color: $dropdown-link-color; color: $gl-gray-700;
} }
} }
&:hover { &:hover {
~ .fa { ~ .fa {
color: $dropdown-link-color; color: $gl-gray-700;
} }
} }
} }
...@@ -890,7 +890,7 @@ header.header-content .dropdown-menu.frequent-items-dropdown-menu { ...@@ -890,7 +890,7 @@ header.header-content .dropdown-menu.frequent-items-dropdown-menu {
position: absolute; position: absolute;
top: 13px; top: 13px;
right: 25px; right: 25px;
color: $md-area-border; color: $gray-100;
} }
} }
...@@ -929,7 +929,7 @@ header.header-content .dropdown-menu.frequent-items-dropdown-menu { ...@@ -929,7 +929,7 @@ header.header-content .dropdown-menu.frequent-items-dropdown-menu {
&:hover { &:hover {
.frequent-items-item-avatar-container .avatar { .frequent-items-item-avatar-container .avatar {
border-color: $md-area-border; border-color: $gray-100;
} }
} }
......
app/assets/stylesheets/framework/files.scss
View file @ ac38fed1
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
&.line-numbers { &.line-numbers {
float: none; float: none;
border-left: 1px solid $blame-line-numbers-border; border-left: 1px solid $gl-gray-100;
i { i {
float: none; float: none;
......
app/assets/stylesheets/framework/jquery.scss deleted 100644 → 0
View file @ 5ee05bbb
.ui-widget {
font-family: $regular-font;
font-size: $font-size-base;
.ui-state-default {
border: 1px solid $white-light;
background: $white-light;
color: $jq-ui-default-color;
}
.ui-state-highlight {
border: 0;
background: transparent;
}
}
app/assets/stylesheets/framework/markdown_area.scss
View file @ ac38fed1
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
.markdown-area { .markdown-area {
border-radius: 0; border-radius: 0;
background: $white-light; background: $white-light;
border: 1px solid $md-area-border; border: 1px solid $gray-100;
min-height: 140px; min-height: 140px;
max-height: 500px; max-height: 500px;
padding: 5px; padding: 5px;
......
app/assets/stylesheets/framework/mixins.scss
View file @ ac38fed1
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
display: inline-block; display: inline-block;
overflow-x: auto; overflow-x: auto;
border: 0; border: 0;
border-color: $md-area-border; border-color: $gray-100;
@supports (width: fit-content) { @supports (width: fit-content) {
display: block; display: block;
...@@ -29,11 +29,11 @@ ...@@ -29,11 +29,11 @@
tr { tr {
th { th {
border-bottom: solid 2px $md-area-border; border-bottom: solid 2px $gray-100;
} }
td { td {
border-color: $md-area-border; border-color: $gray-100;
} }
} }
} }
......
app/assets/stylesheets/framework/selects.scss
View file @ ac38fed1
...@@ -237,7 +237,7 @@ ...@@ -237,7 +237,7 @@
} }
.group-path { .group-path {
color: $group-path-color; color: $gl-gray-400;
} }
} }
...@@ -247,7 +247,7 @@ ...@@ -247,7 +247,7 @@
} }
.project-path { .project-path {
color: $project-path-color; color: $gl-gray-400;
} }
} }
...@@ -268,7 +268,7 @@ ...@@ -268,7 +268,7 @@
.namespace-result { .namespace-result {
.namespace-kind { .namespace-kind {
color: $namespace-kind-color; color: $gl-gray-350;
font-weight: $gl-font-weight-normal; font-weight: $gl-font-weight-normal;
} }
......
app/assets/stylesheets/framework/toggle.scss
View file @ ac38fed1
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
height: 24px; height: 24px;
cursor: pointer; cursor: pointer;
user-select: none; user-select: none;
background: $feature-toggle-color-disabled; background: $gl-gray-400;
border-radius: 12px; border-radius: 12px;
padding: 3px; padding: 3px;
transition: all .4s ease; transition: all .4s ease;
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
} }
.toggle-icon-svg { .toggle-icon-svg {
fill: $feature-toggle-color-disabled; fill: $gl-gray-400;
} }
.toggle-status-checked { .toggle-status-checked {
......
app/assets/stylesheets/framework/typography.scss
View file @ ac38fed1
...@@ -61,12 +61,12 @@ ...@@ -61,12 +61,12 @@
padding: 3px 5px; padding: 3px 5px;
font-size: 11px; font-size: 11px;
line-height: 10px; line-height: 10px;
color: $kdb-color; color: $gl-gray-700;
vertical-align: middle; vertical-align: middle;
background-color: $kdb-bg; background-color: $kdb-bg;
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;
border-color: $kdb-border $kdb-border $kdb-border-bottom; border-color: $gl-gray-200 $gl-gray-200 $kdb-border-bottom;
border-image: none; border-image: none;
border-radius: 3px; border-radius: 3px;
box-shadow: 0 -1px 0 $kdb-shadow inset; box-shadow: 0 -1px 0 $kdb-shadow inset;
......
app/assets/stylesheets/framework/variables.scss
View file @ ac38fed1
...@@ -32,6 +32,14 @@ $gray-dark: darken($gray-light, $darken-dark-factor); ...@@ -32,6 +32,14 @@ $gray-dark: darken($gray-light, $darken-dark-factor);
$gray-darker: #eee; $gray-darker: #eee;
$gray-darkest: #c4c4c4; $gray-darkest: #c4c4c4;
$gl-gray-100: #dddddd;
$gl-gray-200: #cccccc;
$gl-gray-350: #aaaaaa;
$gl-gray-400: #999999;
$gl-gray-500: #777777;
$gl-gray-600: #666666;
$gl-gray-700: #555555;
$green-50: #f1fdf6; $green-50: #f1fdf6;
$green-100: #dcf5e7; $green-100: #dcf5e7;
$green-200: #b3e6c8; $green-200: #b3e6c8;
...@@ -207,11 +215,6 @@ $gl-header-color: #4c4e54; ...@@ -207,11 +215,6 @@ $gl-header-color: #4c4e54;
$list-border: rgba(0, 0, 0, 0.05); $list-border: rgba(0, 0, 0, 0.05);
$list-text-height: 42px; $list-text-height: 42px;
/*
* Markdown
*/
$md-area-border: #ddd;
/* /*
* Code * Code
*/ */
...@@ -242,7 +245,6 @@ $input-horizontal-padding: 12px; ...@@ -242,7 +245,6 @@ $input-horizontal-padding: 12px;
/* /*
* Misc * Misc
*/ */
$progress-color: #c0392b;
$header-height: 40px; $header-height: 40px;
$header-height-pod-logs: 75px; $header-height-pod-logs: 75px;
$ide-statusbar-height: 25px; $ide-statusbar-height: 25px;
...@@ -258,15 +260,7 @@ $btn-side-margin: 10px; ...@@ -258,15 +260,7 @@ $btn-side-margin: 10px;
$btn-sm-side-margin: 7px; $btn-sm-side-margin: 7px;
$btn-margin-5: 5px; $btn-margin-5: 5px;
$sidebar-block-hover-color: #ebebeb; $sidebar-block-hover-color: #ebebeb;
$group-path-color: #999;
$project-path-color: #999;
$namespace-kind-color: #aaa;
$panel-heading-link-color: #777;
$graph-author-email-color: #777;
$count-arrow-border: #dce0e5; $count-arrow-border: #dce0e5;
$save-project-loader-color: #555;
$divergence-graph-bar-bg: #ccc;
$divergence-graph-separator-bg: #ccc;
$general-hover-transition-duration: 100ms; $general-hover-transition-duration: 100ms;
$general-hover-transition-curve: linear; $general-hover-transition-curve: linear;
$highlight-changes-color: rgb(235, 255, 232); $highlight-changes-color: rgb(235, 255, 232);
...@@ -285,20 +279,8 @@ $pages-group-name-color: #4c4e54; ...@@ -285,20 +279,8 @@ $pages-group-name-color: #4c4e54;
/* /*
* Common component specific colors * Common component specific colors
*/ */
$hint-color: #999;
$well-pre-color: #555;
$loading-color: #555;
$update-author-color: #999;
$user-mention-bg: rgba($blue-500, 0.044); $user-mention-bg: rgba($blue-500, 0.044);
$user-mention-bg-hover: rgba($blue-500, 0.15); $user-mention-bg-hover: rgba($blue-500, 0.15);
$time-color: #999;
$project-member-show-color: #aaa;
$gl-promo-color: #aaa;
$control-group-descr-color: #666;
$table-permission-x-bg: #d9edf7;
$username-color: #666;
$description-color: #666;
$profiler-border: #eee;
/* tanuki logo colors */ /* tanuki logo colors */
$tanuki-red: #e24329; $tanuki-red: #e24329;
...@@ -329,9 +311,7 @@ $line-select-yellow: #fcf8e7; ...@@ -329,9 +311,7 @@ $line-select-yellow: #fcf8e7;
$line-select-yellow-dark: #f0e2bd; $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;
$diff-image-info-color: gray; $diff-image-info-color: gray;
$diff-swipe-border: #999;
$diff-view-modes-color: gray; $diff-view-modes-color: gray;
$diff-view-modes-border: #c1c1c1; $diff-view-modes-border: #c1c1c1;
$diff-jagged-border-gradient-color: darken($white-normal, 8%); $diff-jagged-border-gradient-color: darken($white-normal, 8%);
...@@ -351,12 +331,10 @@ $dropdown-width: 300px; ...@@ -351,12 +331,10 @@ $dropdown-width: 300px;
$dropdown-min-height: 40px; $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-empty-row-bg: rgba(#000, 0.04); $dropdown-empty-row-bg: rgba(#000, 0.04);
$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;
$dropdown-input-color: #555;
$dropdown-input-fa-color: #c7c7c7; $dropdown-input-fa-color: #c7c7c7;
$dropdown-input-focus-shadow: rgba($blue-300, 0.4); $dropdown-input-focus-shadow: rgba($blue-300, 0.4);
$dropdown-loading-bg: rgba(#fff, 0.6); $dropdown-loading-bg: rgba(#fff, 0.6);
...@@ -429,14 +407,8 @@ $location-icon-color: #e7e9ed; ...@@ -429,14 +407,8 @@ $location-icon-color: #e7e9ed;
$note-disabled-comment-color: #b2b2b2; $note-disabled-comment-color: #b2b2b2;
$note-targe3-outside: #fffff0; $note-targe3-outside: #fffff0;
$note-targe3-inside: #ffffd3; $note-targe3-inside: #ffffd3;
$note-line2-border: #ddd;
$note-icon-gutter-width: 55px; $note-icon-gutter-width: 55px;
/*
* Zen
*/
$zen-control-color: #555;
/* /*
* Identicon * Identicon
*/ */
...@@ -446,7 +418,6 @@ $identicon-indigo: #e8eaf6; ...@@ -446,7 +418,6 @@ $identicon-indigo: #e8eaf6;
$identicon-blue: #e3f2fd; $identicon-blue: #e3f2fd;
$identicon-teal: #e0f2f1; $identicon-teal: #e0f2f1;
$identicon-orange: #fbe9e7; $identicon-orange: #fbe9e7;
$identicon-fg-color: #555555;
/* /*
* Calendar * Calendar
...@@ -514,17 +485,9 @@ $commit-message-text-area-bg: rgba(0, 0, 0, 0); ...@@ -514,17 +485,9 @@ $commit-message-text-area-bg: rgba(0, 0, 0, 0);
$common-gray-light: #bbb; $common-gray-light: #bbb;
$common-gray-dark: #444; $common-gray-dark: #444;
/*
* Events
*/
$events-pre-color: #777;
$events-note-icon-color: #777;
$events-body-border: #ddd;
/* /*
* Files * Files
*/ */
$blame-line-numbers-border: #ddd;
$logs-li-color: #888; $logs-li-color: #888;
$logs-p-color: #333; $logs-p-color: #333;
...@@ -543,8 +506,6 @@ $input-short-md-width: 280px; ...@@ -543,8 +506,6 @@ $input-short-md-width: 280px;
* Help * Help
*/ */
$document-index-color: #888; $document-index-color: #888;
$help-shortcut-color: #999;
$help-shortcut-mapping-color: #555;
$help-shortcut-header-color: #333; $help-shortcut-header-color: #333;
/* /*
...@@ -554,12 +515,6 @@ $issues-today-bg: #f3fff2; ...@@ -554,12 +515,6 @@ $issues-today-bg: #f3fff2;
$issues-today-border: #e1e8d5; $issues-today-border: #e1e8d5;
$compare-display-color: #888; $compare-display-color: #888;
/*
* jQuery UI
*/
$jq-ui-border: #ddd;
$jq-ui-default-color: #777;
/* /*
* Label * Label
*/ */
...@@ -583,35 +538,20 @@ $fade-mask-transition-curve: ease-in-out; ...@@ -583,35 +538,20 @@ $fade-mask-transition-curve: ease-in-out;
*/ */
$login-brand-holder-color: #888; $login-brand-holder-color: #888;
/*
* Nav
*/
$nav-link-gray: #959494;
$nav-toggle-gray: #666;
/*
* Notify
*/
$notify-details: #777;
$notify-footer: #777;
/* /*
* Projects * Projects
*/ */
$project-option-descr-color: #54565b; $project-option-descr-color: #54565b;
$project-breadcrumb-color: #999;
$project-network-controls-color: #888; $project-network-controls-color: #888;
$feature-toggle-color: #fff; $feature-toggle-color: #fff;
$feature-toggle-text-color: #fff; $feature-toggle-text-color: #fff;
$feature-toggle-color-disabled: #999;
$feature-toggle-color-enabled: #4a8bee; $feature-toggle-color-enabled: #4a8bee;
/* /*
Stat Graph Stat Graph
*/ */
$stat-graph-common-bg: #f3f3f3; $stat-graph-common-bg: #f3f3f3;
$stat-graph-axis-fill: #aaa;
$stat-graph-selection-fill: #333; $stat-graph-selection-fill: #333;
$stat-graph-selection-stroke: #333; $stat-graph-selection-stroke: #333;
...@@ -621,18 +561,10 @@ $stat-graph-selection-stroke: #333; ...@@ -621,18 +561,10 @@ $stat-graph-selection-stroke: #333;
$select2-drop-shadow1: rgba(76, 86, 103, 0.247059); $select2-drop-shadow1: rgba(76, 86, 103, 0.247059);
$select2-drop-shadow2: rgba(31, 37, 50, 0.317647); $select2-drop-shadow2: rgba(31, 37, 50, 0.317647);
/*
* Todo
*/
$todo-body-pre-color: #777;
$todo-body-border: #ddd;
/* /*
* Typography * Typography
*/ */
$kdb-bg: #fcfcfc; $kdb-bg: #fcfcfc;
$kdb-color: #555;
$kdb-border: #ccc;
$kdb-border-bottom: #bbb; $kdb-border-bottom: #bbb;
$kdb-shadow: #bbb; $kdb-shadow: #bbb;
$body-text-shadow: rgba(255, 255, 255, 0.01); $body-text-shadow: rgba(255, 255, 255, 0.01);
...@@ -641,7 +573,6 @@ $body-text-shadow: rgba(255, 255, 255, 0.01); ...@@ -641,7 +573,6 @@ $body-text-shadow: rgba(255, 255, 255, 0.01);
* UI Dev Kit * UI Dev Kit
*/ */
$ui-dev-kit-example-color: #bbb; $ui-dev-kit-example-color: #bbb;
$ui-dev-kit-example-border: #ddd;
/* /*
Pipeline Graph Pipeline Graph
...@@ -687,12 +618,10 @@ $linked-project-column-margin: 60px; ...@@ -687,12 +618,10 @@ $linked-project-column-margin: 60px;
/* /*
Performance Bar Performance Bar
*/ */
$perf-bar-text: #999;
$perf-bar-production: #222; $perf-bar-production: #222;
$perf-bar-staging: #291430; $perf-bar-staging: #291430;
$perf-bar-development: #4c1210; $perf-bar-development: #4c1210;
$perf-bar-bucket-bg: #111; $perf-bar-bucket-bg: #111;
$perf-bar-bucket-color: #ccc;
$perf-bar-bucket-box-shadow-from: rgba($white-light, 0.2); $perf-bar-bucket-box-shadow-from: rgba($white-light, 0.2);
$perf-bar-bucket-box-shadow-to: rgba($black, 0.25); $perf-bar-bucket-box-shadow-to: rgba($black, 0.25);
......
app/assets/stylesheets/framework/zen.scss
View file @ ac38fed1
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
.zen-control { .zen-control {
padding: 0; padding: 0;
color: $zen-control-color; color: $gl-gray-700;
background: none; background: none;
border: 0; border: 0;
} }
......
app/assets/stylesheets/notify.scss
View file @ ac38fed1
...@@ -7,12 +7,12 @@ img { ...@@ -7,12 +7,12 @@ img {
p.details { p.details {
font-style: italic; font-style: italic;
color: $notify-details; color: $gl-gray-500;
} }
.footer > p { .footer > p {
font-size: small; font-size: small;
color: $notify-footer; color: $gl-gray-500;
} }
pre.commit-message { pre.commit-message {
......
app/assets/stylesheets/pages/branches.scss
View file @ ac38fed1
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
.bar { .bar {
position: absolute; position: absolute;
height: 4px; height: 4px;
background-color: $divergence-graph-bar-bg; background-color: $gl-gray-200;
} }
.bar-behind { .bar-behind {
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
height: 18px; height: 18px;
margin: 5px 0 0; margin: 5px 0 0;
float: left; float: left;
background-color: $divergence-graph-separator-bg; background-color: $gl-gray-200;
} }
} }
......
app/assets/stylesheets/pages/diff.scss
View file @ ac38fed1
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
.file-mode-changed { .file-mode-changed {
padding: 10px; padding: 10px;
color: $file-mode-changed; color: $gl-gray-500;
} }
.suppressed-container { .suppressed-container {
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
.swipe-wrap { .swipe-wrap {
overflow: hidden; overflow: hidden;
border-left: 1px solid $diff-swipe-border; border-left: 1px solid $gl-gray-400;
position: absolute; position: absolute;
display: block; display: block;
top: 13px; top: 13px;
......
app/assets/stylesheets/pages/environments.scss
View file @ ac38fed1
...@@ -313,7 +313,7 @@ ...@@ -313,7 +313,7 @@
.x-axis path, .x-axis path,
.y-axis path { .y-axis path {
stroke: $stat-graph-axis-fill; stroke: $gl-gray-350;
} }
.label-x-axis-line, .label-x-axis-line,
...@@ -323,7 +323,7 @@ ...@@ -323,7 +323,7 @@
.y-axis { .y-axis {
line { line {
stroke: $stat-graph-axis-fill; stroke: $gl-gray-350;
stroke-width: 1; stroke-width: 1;
} }
} }
......
app/assets/stylesheets/pages/events.scss
View file @ ac38fed1
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
border: 0; border: 0;
background: $gray-light; background: $gray-light;
border-radius: 0; border-radius: 0;
color: $events-pre-color; color: $gl-gray-500;
overflow: hidden; overflow: hidden;
} }
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
} }
.event-note-icon { .event-note-icon {
color: $events-pre-color; color: $gl-gray-500;
float: left; float: left;
font-size: $gl-font-size; font-size: $gl-font-size;
line-height: 16px; line-height: 16px;
......
app/assets/stylesheets/pages/graph.scss
View file @ ac38fed1
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
.graphs { .graphs {
.graph-author-email { .graph-author-email {
float: right; float: right;
color: $graph-author-email-color; color: $gl-gray-500;
} }
.graph-additions { .graph-additions {
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
.y-axis-label { .y-axis-label {
line { line {
stroke: $stat-graph-axis-fill; stroke: $gl-gray-350;
} }
text { text {
......
app/assets/stylesheets/pages/groups.scss
View file @ ac38fed1
...@@ -312,7 +312,7 @@ table.pipeline-project-metrics tr td { ...@@ -312,7 +312,7 @@ table.pipeline-project-metrics tr td {
height: 100%; height: 100%;
width: 100%; width: 100%;
background-color: transparent; background-color: transparent;
border: 2px outset $kdb-border; border: 2px outset $gl-gray-200;
border-radius: 50%; border-radius: 50%;
animation: spin-avatar 3s infinite linear; animation: spin-avatar 3s infinite linear;
} }
......
app/assets/stylesheets/pages/help.scss
View file @ ac38fed1
.shortcut-mappings { .shortcut-mappings {
font-size: 12px; font-size: 12px;
color: $help-shortcut-mapping-color; color: $gl-gray-700;
tbody:first-child tr:first-child { tbody:first-child tr:first-child {
padding-top: 0; padding-top: 0;
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
.shortcut { .shortcut {
padding-right: 10px; padding-right: 10px;
color: $help-shortcut-color; color: $gl-gray-400;
text-align: right; text-align: right;
white-space: nowrap; white-space: nowrap;
} }
......
app/assets/stylesheets/pages/merge_requests.scss
View file @ ac38fed1
...@@ -910,7 +910,7 @@ ...@@ -910,7 +910,7 @@
opacity: .65; opacity: .65;
&:hover { &:hover {
color: $file-mode-changed; color: $gl-gray-500;
text-decoration: none; text-decoration: none;
} }
} }
......
app/assets/stylesheets/pages/milestone.scss
View file @ ac38fed1
...@@ -366,7 +366,7 @@ ...@@ -366,7 +366,7 @@
line, line,
path { path {
fill: none; fill: none;
stroke: $stat-graph-axis-fill; stroke: $gl-gray-350;
shape-rendering: crispEdges; shape-rendering: crispEdges;
} }
} }
...@@ -404,7 +404,7 @@ ...@@ -404,7 +404,7 @@
} }
&.ideal { &.ideal {
stroke: $stat-graph-axis-fill; stroke: $gl-gray-350;
stroke-dasharray: 6px 6px; stroke-dasharray: 6px 6px;
} }
} }
......
app/assets/stylesheets/pages/notes.scss
View file @ ac38fed1
...@@ -94,8 +94,8 @@ ul.notes { ...@@ -94,8 +94,8 @@ ul.notes {
opacity: 0.5; opacity: 0.5;
.dummy-avatar { .dummy-avatar {
background-color: $kdb-border; background-color: $gl-gray-200;
border: 1px solid darken($kdb-border, 25%); border: 1px solid darken($gl-gray-200, 25%);
} }
.note-headline-light, .note-headline-light,
......
app/assets/stylesheets/pages/projects.scss
View file @ ac38fed1
...@@ -371,7 +371,7 @@ ...@@ -371,7 +371,7 @@
.save-project-loader { .save-project-loader {
margin-top: 50px; margin-top: 50px;
margin-bottom: 50px; margin-bottom: 50px;
color: $save-project-loader-color; color: $gl-gray-700;
} }
.transfer-project .select2-container { .transfer-project .select2-container {
...@@ -447,7 +447,7 @@ ...@@ -447,7 +447,7 @@
> li + li::before { > li + li::before {
padding: 0 3px; padding: 0 3px;
color: $project-breadcrumb-color; color: $gl-gray-400;
} }
a { a {
......
app/assets/stylesheets/pages/settings.scss
View file @ ac38fed1
...@@ -284,7 +284,7 @@ ...@@ -284,7 +284,7 @@
} }
.loading-metrics .metrics-load-spinner { .loading-metrics .metrics-load-spinner {
color: $gl-text-color-secondary; color: $gl-gray-700;
} }
.metrics-list { .metrics-list {
......
app/assets/stylesheets/pages/todos.scss
View file @ ac38fed1
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
border: 0; border: 0;
background: $gray-light; background: $gray-light;
border-radius: 0; border-radius: 0;
color: $todo-body-pre-color; color: $gl-gray-500;
margin: 0 20px; margin: 0 20px;
overflow: hidden; overflow: hidden;
} }
...@@ -205,7 +205,7 @@ ...@@ -205,7 +205,7 @@
.todo-body { .todo-body {
margin: 0; margin: 0;
border-left: 2px solid $todo-body-border; border-left: 2px solid $gl-gray-100;
padding-left: 10px; padding-left: 10px;
} }
} }
......
app/assets/stylesheets/pages/ui_dev_kit.scss
View file @ ac38fed1
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
.example { .example {
padding: 15px; padding: 15px;
border: 1px dashed $ui-dev-kit-example-border; border: 1px dashed $gl-gray-100;
margin-bottom: 15px; margin-bottom: 15px;
&::before { &::before {
......
app/assets/stylesheets/performance_bar.scss
View file @ ac38fed1
...@@ -11,10 +11,10 @@ ...@@ -11,10 +11,10 @@
height: $performance-bar-height; height: $performance-bar-height;
background: $black; background: $black;
line-height: $performance-bar-height; line-height: $performance-bar-height;
color: $perf-bar-text; color: $gl-gray-400;
select { select {
color: $perf-bar-text; color: $gl-gray-400;
width: 200px; width: 200px;
} }
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
padding: 4px 6px; padding: 4px 6px;
font-family: Consolas, 'Liberation Mono', Courier, monospace; font-family: Consolas, 'Liberation Mono', Courier, monospace;
line-height: 1; line-height: 1;
color: $perf-bar-bucket-color; color: $gl-gray-200;
border-radius: 3px; border-radius: 3px;
box-shadow: 0 1px 0 $perf-bar-bucket-box-shadow-from, box-shadow: 0 1px 0 $perf-bar-bucket-box-shadow-from,
inset 0 1px 2px $perf-bar-bucket-box-shadow-to; inset 0 1px 2px $perf-bar-bucket-box-shadow-to;
......
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