Skip to content

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

Combining more grays

parent c5d12e37
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 48 deletions
app/assets/stylesheets/framework/buttons.scss
View file @ e4a00047
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
} }
.btn-transparent { .btn-transparent {
color: $btn-transparent-color; color: $gl-gray-light;
background-color: transparent; background-color: transparent;
border: 0; border: 0;
...@@ -309,7 +309,7 @@ ...@@ -309,7 +309,7 @@
text-align: left; text-align: left;
padding: 6px 16px; padding: 6px 16px;
border-color: $border-color; border-color: $border-color;
color: $btn-placeholder-gray; color: $gray-darkest;
background-color: $background-color; background-color: $background-color;
&:hover, &:hover,
...@@ -318,7 +318,7 @@ ...@@ -318,7 +318,7 @@
cursor: text; cursor: text;
box-shadow: none; box-shadow: none;
border-color: $border-color; border-color: $border-color;
color: $btn-placeholder-gray; color: $gray-darkest;
background-color: $background-color; background-color: $background-color;
} }
} }
......
app/assets/stylesheets/framework/dropdowns.scss
View file @ e4a00047
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
@mixin chevron-active { @mixin chevron-active {
.fa-chevron-down { .fa-chevron-down {
color: $dropdown-toggle-hover-icon-color; color: $gray-darkest;
} }
} }
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
.dropdown-toggle, .dropdown-toggle,
.dropdown-menu-toggle { .dropdown-menu-toggle {
@include chevron-active; @include chevron-active;
border-color: $dropdown-toggle-hover-border-color; border-color: $gray-darkest;
} }
} }
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
} }
.fa { .fa {
color: $dropdown-toggle-icon-color; color: $gray-darkest;
} }
.fa-chevron-down { .fa-chevron-down {
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
&:hover { &:hover {
@include chevron-active; @include chevron-active;
border-color: $dropdown-toggle-hover-border-color; border-color: $gray-darkest;
} }
&:focus:active { &:focus:active {
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
} }
.dropdown-header { .dropdown-header {
color: $dropdown-header-color; color: $gl-gray-light;
font-size: 13px; font-size: 13px;
line-height: 22px; line-height: 22px;
padding: 0 10px; padding: 0 10px;
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
.unclickable { .unclickable {
cursor: not-allowed; cursor: not-allowed;
padding: 5px 8px; padding: 5px 8px;
color: $dropdown-header-color; color: $gl-gray-light;
} }
} }
...@@ -602,7 +602,7 @@ ...@@ -602,7 +602,7 @@
th { th {
padding: 2px 0; padding: 2px 0;
color: $calendar-header-color; color: $note-disabled-comment-color;
font-weight: normal; font-weight: normal;
text-transform: lowercase; text-transform: lowercase;
border-top: 1px solid $calendar-border-color; border-top: 1px solid $calendar-border-color;
......
app/assets/stylesheets/framework/issue_box.scss
View file @ e4a00047
...@@ -41,6 +41,6 @@ ...@@ -41,6 +41,6 @@
} }
&.status-box-upcoming { &.status-box-upcoming {
background: $issue-box-upcoming-bg; background: $gl-gray-light;
} }
} }
app/assets/stylesheets/framework/lists.scss
View file @ e4a00047
...@@ -224,7 +224,7 @@ ul.content-list { ...@@ -224,7 +224,7 @@ ul.content-list {
} }
.label-default { .label-default {
color: $btn-transparent-color; color: $gl-gray-light;
} }
} }
......
app/assets/stylesheets/framework/markdown_area.scss
View file @ e4a00047
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
.toolbar-btn { .toolbar-btn {
float: left; float: left;
padding: 0 5px; padding: 0 5px;
color: $note-toolbar-color; color: $gl-gray-light;
background: transparent; background: transparent;
border: 0; border: 0;
outline: 0; outline: 0;
......
app/assets/stylesheets/framework/nav.scss
View file @ e4a00047
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
margin-bottom: -1px; margin-bottom: -1px;
font-size: 14px; font-size: 14px;
line-height: 28px; line-height: 28px;
color: $note-toolbar-color; color: $gl-gray-light;
border-bottom: 2px solid transparent; border-bottom: 2px solid transparent;
&:hover, &:hover,
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
.badge { .badge {
font-weight: normal; font-weight: normal;
background-color: $nav-badge-bg; background-color: $nav-badge-bg;
color: $btn-transparent-color; color: $gl-gray-light;
vertical-align: baseline; vertical-align: baseline;
} }
} }
......
app/assets/stylesheets/framework/variables.scss
View file @ e4a00047
...@@ -26,7 +26,7 @@ $gray-lighter: #f9f9f9; ...@@ -26,7 +26,7 @@ $gray-lighter: #f9f9f9;
$gray-normal: darken($gray-light, $darken-normal-factor); $gray-normal: darken($gray-light, $darken-normal-factor);
$gray-dark: darken($gray-light, $darken-dark-factor); $gray-dark: darken($gray-light, $darken-dark-factor);
$gray-darker: #eee; $gray-darker: #eee;
$gray-darkest: #c9c9c9; $gray-darkest: #c4c4c4;
$green-light: #3cbd70; $green-light: #3cbd70;
$green-normal: darken($green-light, $darken-normal-factor); $green-normal: darken($green-light, $darken-normal-factor);
...@@ -116,7 +116,6 @@ $gl-gray-light: #8f8f8f; ...@@ -116,7 +116,6 @@ $gl-gray-light: #8f8f8f;
$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-gray-light;
$gl-header-color: #4c4e54; $gl-header-color: #4c4e54;
/* /*
...@@ -166,7 +165,6 @@ $header-height: 50px; ...@@ -166,7 +165,6 @@ $header-height: 50px;
$fixed-layout-width: 1280px; $fixed-layout-width: 1280px;
$error-exclamation-point: #e62958; $error-exclamation-point: #e62958;
$border-radius-default: 2px; $border-radius-default: 2px;
$btn-transparent-color: #8f8f8f;
$settings-icon-size: 18px; $settings-icon-size: 18px;
$provider-btn-group-border: #e5e5e5; $provider-btn-group-border: #e5e5e5;
$provider-btn-not-active-color: #4688f1; $provider-btn-not-active-color: #4688f1;
...@@ -191,7 +189,6 @@ $count-arrow-border: #dce0e5; ...@@ -191,7 +189,6 @@ $count-arrow-border: #dce0e5;
$save-project-loader-color: #555; $save-project-loader-color: #555;
$divergence-graph-bar-bg: #ccc; $divergence-graph-bar-bg: #ccc;
$divergence-graph-separator-bg: #ccc; $divergence-graph-separator-bg: #ccc;
$issue-box-upcoming-bg: #8f8f8f;
/* /*
* Common component specific colors * Common component specific colors
...@@ -276,7 +273,6 @@ $dropdown-empty-row-bg: rgba(#000, .04); ...@@ -276,7 +273,6 @@ $dropdown-empty-row-bg: rgba(#000, .04);
$dropdown-border-color: $border-color; $dropdown-border-color: $border-color;
$dropdown-shadow-color: rgba(#000, .1); $dropdown-shadow-color: rgba(#000, .1);
$dropdown-divider-color: rgba(#000, .1); $dropdown-divider-color: rgba(#000, .1);
$dropdown-header-color: #959494;
$dropdown-title-btn-color: #bfbfbf; $dropdown-title-btn-color: #bfbfbf;
$dropdown-input-color: #555; $dropdown-input-color: #555;
$dropdown-input-fa-color: #c7c7c7; $dropdown-input-fa-color: #c7c7c7;
...@@ -287,18 +283,14 @@ $dropdown-chevron-size: 10px; ...@@ -287,18 +283,14 @@ $dropdown-chevron-size: 10px;
$dropdown-toggle-bg: #fff; $dropdown-toggle-bg: #fff;
$dropdown-toggle-border-color: #e5e5e5; $dropdown-toggle-border-color: #e5e5e5;
$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%);
$dropdown-toggle-icon-color: #c4c4c4;
$dropdown-toggle-hover-icon-color: darken($dropdown-toggle-icon-color, 7%);
/* /*
* Buttons * Buttons
*/ */
$btn-active-gray: #ececec; $btn-active-gray: #ececec;
$btn-active-gray-light: e4e7ed; $btn-active-gray-light: e4e7ed;
$btn-placeholder-gray: #c7c7c7;
$btn-white-active: #848484;
$btn-gray-hover: #eee; $btn-gray-hover: #eee;
/* /*
...@@ -315,22 +307,18 @@ $award-emoji-new-btn-icon-color: #dcdcdc; ...@@ -315,22 +307,18 @@ $award-emoji-new-btn-icon-color: #dcdcdc;
$search-input-border-color: rgba(#4688f1, .8); $search-input-border-color: rgba(#4688f1, .8);
$search-input-focus-shadow-color: $dropdown-input-focus-shadow; $search-input-focus-shadow-color: $dropdown-input-focus-shadow;
$search-input-width: 220px; $search-input-width: 220px;
$location-badge-color: #aaa;
$location-badge-bg: $dark-background-color; $location-badge-bg: $dark-background-color;
$location-badge-active-bg: #4f91f8; $location-badge-active-bg: #4f91f8;
$location-icon-color: #e7e9ed; $location-icon-color: #e7e9ed;
$location-icon-active-color: #807e7e;
/* /*
* Notes * Notes
*/ */
$notes-light-color: #8e8e8e; $notes-light-color: #8e8e8e;
$notes-action-color: #c3c3c3;
$notes-role-color: #8e8e8e; $notes-role-color: #8e8e8e;
$notes-role-border-color: #e4e4e4; $notes-role-border-color: #e4e4e4;
$note-disabled-comment-color: #b2b2b2; $note-disabled-comment-color: #b2b2b2;
$note-form-border-color: #e5e5e5; $note-form-border-color: #e5e5e5;
$note-toolbar-color: #959494;
$note-targe3-outside: #fffff0; $note-targe3-outside: #fffff0;
$note-targe3-inside: #ffffd3; $note-targe3-inside: #ffffd3;
$note-line2-border: #ddd; $note-line2-border: #ddd;
...@@ -344,7 +332,6 @@ $zen-control-color: #555; ...@@ -344,7 +332,6 @@ $zen-control-color: #555;
/* /*
* Calendar * Calendar
*/ */
$calendar-header-color: #b8b8b8;
$calendar-hover-bg: #ecf3fe; $calendar-hover-bg: #ecf3fe;
$calendar-border-color: rgba(#000, .1); $calendar-border-color: rgba(#000, .1);
$calendar-unselectable-bg: $gray-light; $calendar-unselectable-bg: $gray-light;
...@@ -360,15 +347,9 @@ $cycle-analytics-dark-text: $gl-title-color; ...@@ -360,15 +347,9 @@ $cycle-analytics-dark-text: $gl-title-color;
$cycle-analytics-light-gray: #bfbfbf; $cycle-analytics-light-gray: #bfbfbf;
$cycle-analytics-dismiss-icon-color: #b2b2b2; $cycle-analytics-dismiss-icon-color: #b2b2b2;
/*
* Personal Access Tokens
*/
$personal-access-tokens-disabled-label-color: #bbb;
/* /*
* CI * CI
*/ */
$ci-text-color: #c5c8c6;
$ci-skipped-color: #888; $ci-skipped-color: #888;
/* /*
......
app/assets/stylesheets/framework/zen.scss
View file @ e4a00047
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
} }
.zen-control-full { .zen-control-full {
color: $note-toolbar-color; color: $gl-gray-light;
&:hover { &:hover {
color: $gl-link-color; color: $gl-link-color;
......
app/assets/stylesheets/pages/builds.scss
View file @ e4a00047
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
.build-trace { .build-trace {
background: $black; background: $black;
color: $ci-text-color; color: $gray-darkest;
white-space: pre; white-space: pre;
overflow-x: auto; overflow-x: auto;
font-size: 12px; font-size: 12px;
......
app/assets/stylesheets/pages/note_form.scss
View file @ e4a00047
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
.comment-toolbar { .comment-toolbar {
padding-top: $gl-padding-top; padding-top: $gl-padding-top;
color: $note-toolbar-color; color: $gl-gray-light;
border-top: 1px solid $border-color; border-top: 1px solid $border-color;
} }
......
app/assets/stylesheets/pages/notes.scss
View file @ e4a00047
...@@ -372,7 +372,7 @@ ul.notes { ...@@ -372,7 +372,7 @@ ul.notes {
.note-actions { .note-actions {
float: right; float: right;
margin-left: 10px; margin-left: 10px;
color: $notes-action-color; color: $gray-darkest;
} }
.note-actions { .note-actions {
...@@ -411,7 +411,7 @@ ul.notes { ...@@ -411,7 +411,7 @@ ul.notes {
} }
.fa { .fa {
color: $notes-action-color; color: $gray-darkest;
position: relative; position: relative;
font-size: 17px; font-size: 17px;
} }
...@@ -573,10 +573,10 @@ ul.notes { ...@@ -573,10 +573,10 @@ ul.notes {
svg { svg {
position: relative; position: relative;
color: $notes-action-color; color: $gray-darkest;
path { path {
fill: $notes-action-color; fill: $gray-darkest;
} }
} }
} }
......
app/assets/stylesheets/pages/pipelines.scss
View file @ e4a00047
...@@ -654,7 +654,7 @@ ...@@ -654,7 +654,7 @@
.toggle-pipeline-btn { .toggle-pipeline-btn {
.fa { .fa {
color: $dropdown-header-color; color: $gl-gray-light;
} }
} }
......
app/assets/stylesheets/pages/profile.scss
View file @ e4a00047
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
} }
.personal-access-tokens-never-expires-label { .personal-access-tokens-never-expires-label {
color: $personal-access-tokens-disabled-label-color; color: $note-disabled-comment-color;
} }
.datepicker.personal-access-tokens-expires-at .ui-state-disabled span { .datepicker.personal-access-tokens-expires-at .ui-state-disabled span {
......
app/assets/stylesheets/pages/search.scss
View file @ e4a00047
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
border-radius: $border-radius-default; border-radius: $border-radius-default;
font-size: 14px; font-size: 14px;
font-style: normal; font-style: normal;
color: $location-badge-color; color: $note-disabled-comment-color;
display: inline-block; display: inline-block;
background-color: $location-badge-bg; background-color: $location-badge-bg;
vertical-align: top; vertical-align: top;
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
.search-input-wrap { .search-input-wrap {
i { i {
color: $location-icon-active-color; color: $layout-link-gray;
} }
} }
} }
......
app/assets/stylesheets/pages/xterm.scss
View file @ e4a00047
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
$l-blue: #81a2be; $l-blue: #81a2be;
$l-magenta: #b294bb; $l-magenta: #b294bb;
$l-cyan: #8abeb7; $l-cyan: #8abeb7;
$l-white: $ci-text-color; $l-white: $gray-darkest;
/* /*
* xterm colors * xterm colors
......
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