Skip to content

G
gitlab-ce
Commit c5d12e37 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray
Browse files
Options

Remove duplicate shades of gray and black

parent 7b63587d
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 44 deletions
app/assets/stylesheets/framework/buttons.scss
View file @ c5d12e37
...@@ -331,7 +331,7 @@ ...@@ -331,7 +331,7 @@
margin-left: 10px; margin-left: 10px;
i { i {
color: $gl-icon-color; color: $gl-gray-light;
} }
} }
......
app/assets/stylesheets/framework/dropdowns.scss
View file @ c5d12e37
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
.dropdown-toggle { .dropdown-toggle {
padding: 6px 8px 6px 10px; padding: 6px 8px 6px 10px;
background-color: $dropdown-toggle-bg; background-color: $dropdown-toggle-bg;
color: $dropdown-toggle-color; color: $gl-text-color;
font-size: 14px; font-size: 14px;
text-align: left; text-align: left;
border: 1px solid $border-color; border: 1px solid $border-color;
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
padding: 8px 0; padding: 8px 0;
background-color: $dropdown-bg; background-color: $white-light;
border: 1px solid $dropdown-border-color; border: 1px solid $dropdown-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;
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
} }
.icon-play { .icon-play {
fill: $table-text-gray; fill: $gl-gray-light;
margin-right: 6px; margin-right: 6px;
height: 12px; height: 12px;
width: 11px; width: 11px;
...@@ -621,11 +621,11 @@ ...@@ -621,11 +621,11 @@
.dropdown-menu-inner-content { .dropdown-menu-inner-content {
display: block; display: block;
color: $gl-placeholder-color; color: $gl-gray-light;
} }
.dropdown-toggle-text { .dropdown-toggle-text {
&.is-default { &.is-default {
color: $gl-placeholder-color; color: $gl-gray-light;
} }
} }
app/assets/stylesheets/framework/forms.scss
View file @ c5d12e37
...@@ -149,7 +149,7 @@ label { ...@@ -149,7 +149,7 @@ label {
} }
.form-control::-webkit-input-placeholder { .form-control::-webkit-input-placeholder {
color: $gl-placeholder-color; color: $gl-gray-light;
} }
.input-group { .input-group {
......
app/assets/stylesheets/framework/header.scss
View file @ c5d12e37
...@@ -45,7 +45,7 @@ header { ...@@ -45,7 +45,7 @@ header {
padding: 0; padding: 0;
.nav > li > a { .nav > li > a {
color: $gl-icon-color; color: $gl-gray-light;
font-size: 18px; font-size: 18px;
padding: 0; padding: 0;
margin: ($header-height - 28) / 2 0; margin: ($header-height - 28) / 2 0;
...@@ -63,7 +63,7 @@ header { ...@@ -63,7 +63,7 @@ header {
&:focus, &:focus,
&:active { &:active {
background-color: $background-color; background-color: $background-color;
color: darken($gl-icon-color, 30%); color: darken($gl-gray-light, 30%);
.todos-pending-count { .todos-pending-count {
background: darken($todo-alert-blue, 10%); background: darken($todo-alert-blue, 10%);
...@@ -88,7 +88,7 @@ header { ...@@ -88,7 +88,7 @@ header {
} }
&.active { &.active {
color: $gl-icon-color; color: $gl-gray-light;
} }
} }
} }
......
app/assets/stylesheets/framework/nav.scss
View file @ c5d12e37
...@@ -317,7 +317,7 @@ ...@@ -317,7 +317,7 @@
.fa-caret-down { .fa-caret-down {
margin-left: 5px; margin-left: 5px;
color: $gl-icon-color; color: $gl-gray-light;
} }
.dropdown { .dropdown {
......
app/assets/stylesheets/framework/page-header.scss
View file @ c5d12e37
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
.header-action-buttons { .header-action-buttons {
i { i {
color: $gl-icon-color; color: $gl-gray-light;
font-size: 13px; font-size: 13px;
margin-right: 3px; margin-right: 3px;
} }
......
app/assets/stylesheets/framework/variables.scss
View file @ c5d12e37
...@@ -93,7 +93,6 @@ $focus-border-color: #3aabf0; ...@@ -93,7 +93,6 @@ $focus-border-color: #3aabf0;
$table-border-color: #f0f0f0; $table-border-color: #f0f0f0;
$background-color: $gray-light; $background-color: $gray-light;
$dark-background-color: #f5f5f5; $dark-background-color: #f5f5f5;
$table-text-gray: #8f8f8f;
$well-expand-item: #e8f2f7; $well-expand-item: #e8f2f7;
$well-inner-border: #eef0f2; $well-inner-border: #eef0f2;
$well-light-border: #f1f1f1; $well-light-border: #f1f1f1;
...@@ -113,12 +112,11 @@ $gl-text-orange: #d90; ...@@ -113,12 +112,11 @@ $gl-text-orange: #d90;
$gl-link-color: #3777b0; $gl-link-color: #3777b0;
$gl-diff-text-color: #555; $gl-diff-text-color: #555;
$gl-dark-link-color: #333; $gl-dark-link-color: #333;
$gl-placeholder-color: #8f8f8f; $gl-gray-light: #8f8f8f;
$gl-icon-color: $gl-placeholder-color;
$gl-grayish-blue: #7f8fa4; $gl-grayish-blue: #7f8fa4;
$gl-gray: $gl-text-color; $gl-gray: $gl-text-color;
$gl-gray-dark: #313236; $gl-gray-dark: #313236;
$gl-gray-light: $gl-placeholder-color; $gl-gray-light: $gl-gray-light;
$gl-header-color: #4c4e54; $gl-header-color: #4c4e54;
/* /*
...@@ -272,7 +270,6 @@ $regular_font: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-San ...@@ -272,7 +270,6 @@ $regular_font: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-San
* Dropdowns * Dropdowns
*/ */
$dropdown-width: 300px; $dropdown-width: 300px;
$dropdown-bg: #fff;
$dropdown-link-color: #555; $dropdown-link-color: #555;
$dropdown-link-hover-bg: $row-hover; $dropdown-link-hover-bg: $row-hover;
$dropdown-empty-row-bg: rgba(#000, .04); $dropdown-empty-row-bg: rgba(#000, .04);
...@@ -289,7 +286,6 @@ $dropdown-loading-bg: rgba(#fff, .6); ...@@ -289,7 +286,6 @@ $dropdown-loading-bg: rgba(#fff, .6);
$dropdown-chevron-size: 10px; $dropdown-chevron-size: 10px;
$dropdown-toggle-bg: #fff; $dropdown-toggle-bg: #fff;
$dropdown-toggle-color: #5c5c5c;
$dropdown-toggle-border-color: #e5e5e5; $dropdown-toggle-border-color: #e5e5e5;
$dropdown-toggle-hover-border-color: darken($dropdown-toggle-border-color, 13%); $dropdown-toggle-hover-border-color: darken($dropdown-toggle-border-color, 13%);
$dropdown-toggle-active-border-color: darken($dropdown-toggle-border-color, 14%); $dropdown-toggle-active-border-color: darken($dropdown-toggle-border-color, 14%);
...@@ -344,7 +340,6 @@ $note-line2-border: #ddd; ...@@ -344,7 +340,6 @@ $note-line2-border: #ddd;
* Zen * Zen
*/ */
$zen-control-color: #555; $zen-control-color: #555;
$zen-control-hover-color: #111;
/* /*
* Calendar * Calendar
...@@ -373,7 +368,6 @@ $personal-access-tokens-disabled-label-color: #bbb; ...@@ -373,7 +368,6 @@ $personal-access-tokens-disabled-label-color: #bbb;
/* /*
* CI * CI
*/ */
$ci-output-bg: #1d1f21;
$ci-text-color: #c5c8c6; $ci-text-color: #c5c8c6;
$ci-skipped-color: #888; $ci-skipped-color: #888;
......
app/assets/stylesheets/framework/zen.scss
View file @ c5d12e37
...@@ -57,6 +57,6 @@ ...@@ -57,6 +57,6 @@
font-size: 36px; font-size: 36px;
&:hover { &:hover {
color: $zen-control-hover-color; color: $black;
} }
} }
app/assets/stylesheets/pages/boards.scss
View file @ c5d12e37
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
.board-list-count { .board-list-count {
padding: 10px 0; padding: 10px 0;
color: $gl-placeholder-color; color: $gl-gray-light;
font-size: 13px; font-size: 13px;
> .fa { > .fa {
......
app/assets/stylesheets/pages/builds.scss
View file @ c5d12e37
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
} }
.build-trace { .build-trace {
background: $ci-output-bg; background: $black;
color: $ci-text-color; color: $ci-text-color;
white-space: pre; white-space: pre;
overflow-x: auto; overflow-x: auto;
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
} }
.build-light-text { .build-light-text {
color: $gl-placeholder-color; color: $gl-gray-light;
} }
.build-gutter-toggle { .build-gutter-toggle {
......
app/assets/stylesheets/pages/commits.scss
View file @ c5d12e37
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
.text-expander { .text-expander {
display: inline-block; display: inline-block;
background: $gray-light; background: $gray-light;
color: $gl-placeholder-color; color: $gl-gray-light;
padding: 0 5px; padding: 0 5px;
cursor: pointer; cursor: pointer;
border: 1px solid $border-gray-dark; border: 1px solid $border-gray-dark;
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
height: 14px; height: 14px;
width: 14px; width: 14px;
vertical-align: middle; vertical-align: middle;
fill: $table-text-gray; fill: $gl-gray-light;
} }
} }
......
app/assets/stylesheets/pages/environments.scss
View file @ c5d12e37
...@@ -64,14 +64,14 @@ ...@@ -64,14 +64,14 @@
.external-url, .external-url,
.dropdown-new { .dropdown-new {
color: $table-text-gray; color: $gl-gray-light;
} }
.dropdown-menu { .dropdown-menu {
.fa { .fa {
margin-right: 6px; margin-right: 6px;
color: $table-text-gray; color: $gl-gray-light;
} }
} }
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
.stop-env-link, .stop-env-link,
.external-url { .external-url {
color: $table-text-gray; color: $gl-gray-light;
.stop-env-icon { .stop-env-icon {
font-size: 14px; font-size: 14px;
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
.badge { .badge {
font-weight: normal; font-weight: normal;
background-color: $gray-darker; background-color: $gray-darker;
color: $gl-placeholder-color; color: $gl-gray-light;
vertical-align: baseline; vertical-align: baseline;
} }
} }
......
app/assets/stylesheets/pages/issuable.scss
View file @ c5d12e37
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
} }
.no-value { .no-value {
color: $gl-placeholder-color; color: $gl-gray-light;
} }
.sidebar-collapsed-icon { .sidebar-collapsed-icon {
...@@ -333,7 +333,7 @@ ...@@ -333,7 +333,7 @@
margin-left: 5px; margin-left: 5px;
a { a {
color: $gl-placeholder-color; color: $gl-gray-light;
} }
} }
......
app/assets/stylesheets/pages/merge_requests.scss
View file @ c5d12e37
...@@ -359,7 +359,7 @@ ...@@ -359,7 +359,7 @@
th { th {
background-color: $white-light; background-color: $white-light;
color: $gl-placeholder-color; color: $gl-gray-light;
} }
} }
} }
......
app/assets/stylesheets/pages/milestone.scss
View file @ c5d12e37
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
margin-top: 7px; margin-top: 7px;
.issuable-number { .issuable-number {
color: $gl-placeholder-color; color: $gl-gray-light;
margin-right: 5px; margin-right: 5px;
} }
......
app/assets/stylesheets/pages/pipelines.scss
View file @ c5d12e37
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
height: 14px; height: 14px;
width: 14px; width: 14px;
vertical-align: middle; vertical-align: middle;
fill: $table-text-gray; fill: $gl-gray-light;
} }
.fa { .fa {
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
.duration, .duration,
.finished-at { .finished-at {
color: $table-text-gray; color: $gl-gray-light;
margin: 4px 0; margin: 4px 0;
.fa { .fa {
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
.btn { .btn {
margin: 0; margin: 0;
color: $table-text-gray; color: $gl-gray-light;
} }
.cancel-retry-btns { .cancel-retry-btns {
...@@ -234,10 +234,10 @@ ...@@ -234,10 +234,10 @@
.dropdown-toggle, .dropdown-toggle,
.dropdown-menu { .dropdown-menu {
color: $table-text-gray; color: $gl-gray-light;
.fa { .fa {
color: $table-text-gray; color: $gl-gray-light;
font-size: 14px; font-size: 14px;
} }
......
app/assets/stylesheets/pages/settings.scss
View file @ c5d12e37
.settings-list-icon { .settings-list-icon {
color: $gl-placeholder-color; color: $gl-gray-light;
font-size: $settings-icon-size; font-size: $settings-icon-size;
line-height: 42px; line-height: 42px;
} }
......
app/assets/stylesheets/pages/status.scss
View file @ c5d12e37
...@@ -102,15 +102,15 @@ ...@@ -102,15 +102,15 @@
&.ci-created, &.ci-created,
&.ci-skipped { &.ci-skipped {
color: $table-text-gray; color: $gl-gray-light;
border-color: $table-text-gray; border-color: $gl-gray-light;
&:not(span):hover { &:not(span):hover {
background-color: rgba( $table-text-gray, .07); background-color: rgba( $gl-gray-light, .07);
} }
svg { svg {
fill: $table-text-gray; fill: $gl-gray-light;
} }
} }
} }
......
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