Skip to content
Snippets Groups Projects
Commit c5d12e37 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray
Browse files

Remove duplicate shades of gray and black

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