Skip to content

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

Merge branch '25701-standardize-text-colors' into 'master' 

25701 standardize text colors

Closes #25701

See merge request !8383
parents 8acf1ce3 86b1dfc7
Hide whitespace changes
Inline Side-by-side
Showing with 167 additions and 177 deletions
app/assets/stylesheets/framework/badges.scss
View file @ d2608ce0
...@@ -4,8 +4,3 @@ ...@@ -4,8 +4,3 @@
color: $badge-color; color: $badge-color;
vertical-align: baseline; vertical-align: baseline;
} }
.badge-dark {
background-color: $badge-bg-dark;
color: $badge-color-dark;
}
app/assets/stylesheets/framework/blocks.scss
View file @ d2608ce0
.centered-light-block { .centered-light-block {
text-align: center; text-align: center;
color: $gl-gray; color: $gl-text-color;
margin: 20px; margin: 20px;
} }
.nothing-here-block { .nothing-here-block {
text-align: center; text-align: center;
padding: 20px; padding: 20px;
color: $gl-gray; color: $gl-text-color;
font-weight: normal; font-weight: normal;
font-size: 14px; font-size: 14px;
line-height: 36px; line-height: 36px;
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
margin-bottom: 0; margin-bottom: 0;
border-top: 1px solid $white-dark; border-top: 1px solid $white-dark;
border-bottom: 1px solid $white-dark; border-bottom: 1px solid $white-dark;
color: $gl-gray; color: $gl-text-color;
&.oneline-block { &.oneline-block {
line-height: 42px; line-height: 42px;
...@@ -135,11 +135,11 @@ ...@@ -135,11 +135,11 @@
} }
.cover-title { .cover-title {
color: $gl-header-color; color: $gl-text-color;
font-size: 23px; font-size: 23px;
h1 { h1 {
color: $gl-gray-dark; color: $gl-text-color;
margin-bottom: 6px; margin-bottom: 6px;
font-size: 23px; font-size: 23px;
} }
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
p { p {
padding: 0 $gl-padding; padding: 0 $gl-padding;
color: $gl-text-color-dark; color: $gl-text-color;
} }
} }
...@@ -211,7 +211,7 @@ ...@@ -211,7 +211,7 @@
display: inline; display: inline;
font-weight: normal; font-weight: normal;
font-size: 24px; font-size: 24px;
color: $gl-title-color; color: $gl-text-color;
} }
} }
} }
......
app/assets/stylesheets/framework/buttons.scss
View file @ d2608ce0
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
} }
@mixin btn-gray { @mixin btn-gray {
@include btn-color($gray-light, $border-gray-normal, $gray-normal, $border-gray-normal, $gray-dark, $border-gray-dark, $gl-gray-dark); @include btn-color($gray-light, $border-gray-normal, $gray-normal, $border-gray-normal, $gray-dark, $border-gray-dark, $gl-text-color);
} }
@mixin btn-white { @mixin btn-white {
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
} }
.btn-transparent { .btn-transparent {
color: $gl-gray-light; color: $gl-text-color-secondary;
background-color: transparent; background-color: transparent;
border: 0; border: 0;
...@@ -338,7 +338,7 @@ ...@@ -338,7 +338,7 @@
margin-left: 10px; margin-left: 10px;
i { i {
color: $gl-gray-light; color: $gl-text-color-secondary;
} }
} }
......
app/assets/stylesheets/framework/common.scss
View file @ d2608ce0
...@@ -412,7 +412,7 @@ table { ...@@ -412,7 +412,7 @@ table {
padding: 0 10px; padding: 0 10px;
clip: auto; clip: auto;
text-decoration: none; text-decoration: none;
color: $gl-title-color; color: $gl-text-color;
background: $gray-light; background: $gray-light;
z-index: 1; z-index: 1;
} }
......
app/assets/stylesheets/framework/dropdowns.scss
View file @ d2608ce0
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
} }
.icon-play { .icon-play {
fill: $gl-gray-light; fill: $gl-text-color-secondary;
margin-right: 6px; margin-right: 6px;
height: 12px; height: 12px;
width: 11px; width: 11px;
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
} }
.dropdown-header { .dropdown-header {
color: $gl-gray-light; color: $gl-text-color-secondary;
font-size: 13px; font-size: 13px;
line-height: 22px; line-height: 22px;
padding: 0 10px; padding: 0 10px;
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
.unclickable { .unclickable {
cursor: not-allowed; cursor: not-allowed;
padding: 5px 8px; padding: 5px 8px;
color: $gl-gray-light; color: $gl-text-color-secondary;
} }
} }
...@@ -592,7 +592,7 @@ ...@@ -592,7 +592,7 @@
} }
.ui-datepicker-title { .ui-datepicker-title {
color: $gl-gray; color: $gl-text-color;
font-size: 14px; font-size: 14px;
line-height: 1; line-height: 1;
font-weight: normal; font-weight: normal;
...@@ -614,17 +614,17 @@ ...@@ -614,17 +614,17 @@
.dropdown-menu-inner-title { .dropdown-menu-inner-title {
display: block; display: block;
color: $gl-title-color; color: $gl-text-color;
font-weight: 600; font-weight: 600;
} }
.dropdown-menu-inner-content { .dropdown-menu-inner-content {
display: block; display: block;
color: $gl-gray-light; color: $gl-text-color-secondary;
} }
.dropdown-toggle-text { .dropdown-toggle-text {
&.is-default { &.is-default {
color: $gl-gray-light; color: $gl-text-color-secondary;
} }
} }
app/assets/stylesheets/framework/forms.scss
View file @ d2608ce0
...@@ -153,7 +153,7 @@ label { ...@@ -153,7 +153,7 @@ label {
} }
.form-control::-webkit-input-placeholder { .form-control::-webkit-input-placeholder {
color: $gl-gray-light; color: $gl-text-color-secondary;
} }
.input-group { .input-group {
......
app/assets/stylesheets/framework/header.scss
View file @ d2608ce0
...@@ -45,7 +45,7 @@ header { ...@@ -45,7 +45,7 @@ header {
padding: 0; padding: 0;
.nav > li > a { .nav > li > a {
color: $gl-gray-light; color: $gl-text-color-secondary;
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: $gray-light; background-color: $gray-light;
color: darken($gl-gray-light, 30%); color: darken($gl-text-color-secondary, 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-gray-light; color: $gl-text-color-secondary;
} }
} }
} }
......
app/assets/stylesheets/framework/icons.scss
View file @ d2608ce0
...@@ -34,10 +34,10 @@ ...@@ -34,10 +34,10 @@
.ci-status-icon-canceled, .ci-status-icon-canceled,
.ci-status-icon-disabled, .ci-status-icon-disabled,
.ci-status-icon-not-found { .ci-status-icon-not-found {
color: $gl-gray; color: $gl-text-color;
svg { svg {
fill: $gl-gray; fill: $gl-text-color;
} }
} }
......
app/assets/stylesheets/framework/issue_box.scss
View file @ d2608ce0
...@@ -41,6 +41,6 @@ ...@@ -41,6 +41,6 @@
} }
&.status-box-upcoming { &.status-box-upcoming {
background: $gl-gray-light; background: $gl-text-color-secondary;
} }
} }
app/assets/stylesheets/framework/lists.scss
View file @ d2608ce0
...@@ -128,7 +128,7 @@ ul.content-list { ...@@ -128,7 +128,7 @@ ul.content-list {
} }
a { a {
color: $gl-dark-link-color; color: $gl-text-color;
} }
.member-group-link { .member-group-link {
...@@ -230,7 +230,7 @@ ul.content-list { ...@@ -230,7 +230,7 @@ ul.content-list {
} }
.label-default { .label-default {
color: $gl-gray-light; color: $gl-text-color-secondary;
} }
} }
......
app/assets/stylesheets/framework/markdown_area.scss
View file @ d2608ce0
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
} }
.referenced-users { .referenced-users {
color: $gl-header-color; color: $gl-text-color;
padding-top: 10px; padding-top: 10px;
} }
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
.toolbar-btn { .toolbar-btn {
float: left; float: left;
padding: 0 5px; padding: 0 5px;
color: $gl-gray-light; color: $gl-text-color-secondary;
background: transparent; background: transparent;
border: 0; border: 0;
outline: 0; outline: 0;
......
app/assets/stylesheets/framework/mixins.scss
View file @ d2608ce0
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
&.light { &.light {
a { a {
color: $gl-gray; color: $gl-text-color;
} }
} }
} }
......
app/assets/stylesheets/framework/nav.scss
View file @ d2608ce0
...@@ -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: $gl-gray-light; color: $gl-text-color-secondary;
border-bottom: 2px solid transparent; border-bottom: 2px solid transparent;
&:hover, &:hover,
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
.fa-caret-down { .fa-caret-down {
margin-left: 5px; margin-left: 5px;
color: $gl-gray-light; color: $gl-text-color-secondary;
} }
.dropdown { .dropdown {
......
app/assets/stylesheets/framework/page-header.scss
View file @ d2608ce0
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
.header-action-buttons { .header-action-buttons {
i { i {
color: $gl-gray-light; color: $gl-text-color-secondary;
font-size: 13px; font-size: 13px;
margin-right: 3px; margin-right: 3px;
} }
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
.commit-committer-link, .commit-committer-link,
.commit-author-link { .commit-author-link {
color: $gl-gray; color: $gl-text-color;
font-weight: bold; font-weight: bold;
} }
......
app/assets/stylesheets/framework/timeline.scss
View file @ d2608ce0
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
.timeline-entry { .timeline-entry {
padding: $gl-padding $gl-btn-padding 11px; padding: $gl-padding $gl-btn-padding 11px;
border-color: $white-normal; border-color: $white-normal;
color: $gl-gray; color: $gl-text-color;
border-bottom: 1px solid $border-white-light; border-bottom: 1px solid $border-white-light;
&:target { &:target {
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
.system-note { .system-note {
.note-text { .note-text {
color: $gl-gray !important; color: $gl-text-color !important;
} }
} }
......
app/assets/stylesheets/framework/tw_bootstrap.scss
View file @ d2608ce0
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
&.label-gray { &.label-gray {
background-color: $label-gray-bg; background-color: $label-gray-bg;
color: $gl-gray; color: $gl-text-color;
text-shadow: none; text-shadow: none;
} }
......
app/assets/stylesheets/framework/tw_bootstrap_variables.scss
View file @ d2608ce0
...@@ -65,11 +65,11 @@ $legend-color: $text-color; ...@@ -65,11 +65,11 @@ $legend-color: $text-color;
// //
//## //##
$pagination-color: $gl-gray; $pagination-color: $gl-text-color;
$pagination-bg: $white-light; $pagination-bg: $white-light;
$pagination-border: $border-color; $pagination-border: $border-color;
$pagination-hover-color: $gl-gray; $pagination-hover-color: $gl-text-color;
$pagination-hover-bg: $row-hover; $pagination-hover-bg: $row-hover;
$pagination-hover-border: $border-color; $pagination-hover-border: $border-color;
...@@ -121,6 +121,9 @@ $panel-default-heading-bg: $gray-light; ...@@ -121,6 +121,9 @@ $panel-default-heading-bg: $gray-light;
$panel-footer-bg: $gray-light; $panel-footer-bg: $gray-light;
$panel-inner-border: $border-color; $panel-inner-border: $border-color;
$badge-bg: $badge-bg;
$badge-color: $badge-color;
//== Wells //== Wells
// //
//## //##
...@@ -154,7 +157,7 @@ $nav-link-padding: 13px $gl-padding; ...@@ -154,7 +157,7 @@ $nav-link-padding: 13px $gl-padding;
// //
//## //##
$pre-bg: $gray-light !default; $pre-bg: $gray-light !default;
$pre-color: $gl-gray !default; $pre-color: $gl-text-color !default;
$pre-border-color: $border-color; $pre-border-color: $border-color;
$table-bg-accent: $gray-light; $table-bg-accent: $gray-light;
app/assets/stylesheets/framework/typography.scss
View file @ d2608ce0
@mixin md-typography { @mixin md-typography {
color: $md-text-color; color: $gl-text-color;
word-wrap: break-word; word-wrap: break-word;
a { a {
...@@ -50,14 +50,14 @@ ...@@ -50,14 +50,14 @@
margin: 16px 0 10px; margin: 16px 0 10px;
padding: 0 0 0.3em; padding: 0 0 0.3em;
border-bottom: 1px solid $white-dark; border-bottom: 1px solid $white-dark;
color: $gl-gray-dark; color: $gl-text-color;
} }
h2 { h2 {
font-size: 1.5em; font-size: 1.5em;
font-weight: 600; font-weight: 600;
margin: 16px 0 10px; margin: 16px 0 10px;
color: $gl-gray-dark; color: $gl-text-color;
} }
h3 { h3 {
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
} }
p { p {
color: $gl-text-color-dark; color: $gl-text-color;
margin: 6px 0 0; margin: 6px 0 0;
} }
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
@extend .table; @extend .table;
@extend .table-bordered; @extend .table-bordered;
margin: 12px 0; margin: 12px 0;
color: $gl-text-color-dark; color: $gl-text-color;
th { th {
background: $label-gray-bg; background: $label-gray-bg;
...@@ -230,7 +230,7 @@ h3, ...@@ -230,7 +230,7 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
color: $gl-title-color; color: $gl-text-color;
font-weight: 600; font-weight: 600;
} }
...@@ -292,7 +292,7 @@ h2, ...@@ -292,7 +292,7 @@ h2,
h3, h3,
h4 { h4 {
small { small {
color: $gl-gray; color: $gl-text-color;
} }
} }
......
app/assets/stylesheets/framework/variables.scss
View file @ d2608ce0
...@@ -94,29 +94,22 @@ $well-light-text-color: #5b6169; ...@@ -94,29 +94,22 @@ $well-light-text-color: #5b6169;
* Text * Text
*/ */
$gl-font-size: 14px; $gl-font-size: 14px;
$gl-title-color: #333; $gl-text-color: rgba(0, 0, 0, .85);
$gl-text-color: #5c5c5c; $gl-text-color-secondary: rgba(0, 0, 0, .55);
$gl-text-color-dark: #5c5d5e; $gl-text-color-disabled: rgba(0, 0, 0, .35);
$gl-text-color-light: #8c8c8c;
$gl-text-green: #4a2; $gl-text-green: #4a2;
$gl-text-red: #d12f19; $gl-text-red: #d12f19;
$gl-text-orange: #d90; $gl-text-orange: #d90;
$gl-link-color: #3777b0; $gl-link-color: #3777b0;
$gl-diff-text-color: #555;
$gl-dark-link-color: #333;
$gl-gray-light: #8f8f8f;
$gl-grayish-blue: #7f8fa4; $gl-grayish-blue: #7f8fa4;
$gl-gray: $gl-text-color;
$gl-gray-dark: #313236;
$gl-header-color: #4c4e54;
/* /*
* Lists * Lists
*/ */
$list-font-size: $gl-font-size; $list-font-size: $gl-font-size;
$list-title-color: $gl-title-color; $list-title-color: $gl-text-color;
$list-text-color: $gl-text-color; $list-text-color: $gl-text-color;
$list-text-disabled-color: #888; $list-text-disabled-color: $gl-text-color-disabled;
$list-border-light: #eee; $list-border-light: #eee;
$list-border: rgba(0, 0, 0, 0.05); $list-border: rgba(0, 0, 0, 0.05);
$list-text-height: 42px; $list-text-height: 42px;
...@@ -127,7 +120,6 @@ $list-warning-row-color: #8a6d3b; ...@@ -127,7 +120,6 @@ $list-warning-row-color: #8a6d3b;
/* /*
* Markdown * Markdown
*/ */
$md-text-color: $gl-text-color;
$md-link-color: $gl-link-color; $md-link-color: $gl-link-color;
$md-area-border: #ddd; $md-area-border: #ddd;
...@@ -168,9 +160,7 @@ $btn-side-margin: 10px; ...@@ -168,9 +160,7 @@ $btn-side-margin: 10px;
$btn-sm-side-margin: 7px; $btn-sm-side-margin: 7px;
$btn-xs-side-margin: 5px; $btn-xs-side-margin: 5px;
$issue-status-expired: #cea61b; $issue-status-expired: #cea61b;
$issuable-sidebar-color: #999; $issuable-sidebar-color: $gl-text-color-secondary;
$issuable-avatar-hover-border: #999;
$issuable-clipboard-color: #999;
$show-aside-bg: #eee; $show-aside-bg: #eee;
$show-aside-color: #777; $show-aside-color: #777;
$show-aside-shadow: #ddd; $show-aside-shadow: #ddd;
...@@ -282,10 +272,8 @@ $btn-active-gray-light: e4e7ed; ...@@ -282,10 +272,8 @@ $btn-active-gray-light: e4e7ed;
/* /*
* Badges * Badges
*/ */
$badge-bg: #f3f3f3; $badge-bg: #eee;
$badge-bg-dark: #eee; $badge-color: $gl-text-color-secondary;
$badge-color: #929292;
$badge-color-dark: #8f8f8f;
/* /*
* Award emoji * Award emoji
...@@ -304,8 +292,8 @@ $location-icon-color: #e7e9ed; ...@@ -304,8 +292,8 @@ $location-icon-color: #e7e9ed;
/* /*
* Notes * Notes
*/ */
$notes-light-color: #8e8e8e; $notes-light-color: $gl-text-color-secondary;
$notes-role-color: #8e8e8e; $notes-role-color: $gl-text-color-secondary;
$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;
...@@ -330,7 +318,7 @@ $calendar-user-contrib-text: #959494; ...@@ -330,7 +318,7 @@ $calendar-user-contrib-text: #959494;
$cycle-analytics-box-padding: 30px; $cycle-analytics-box-padding: 30px;
$cycle-analytics-box-text-color: #8c8c8c; $cycle-analytics-box-text-color: #8c8c8c;
$cycle-analytics-big-font: 19px; $cycle-analytics-big-font: 19px;
$cycle-analytics-dark-text: $gl-title-color; $cycle-analytics-dark-text: $gl-text-color;
$cycle-analytics-light-gray: #bfbfbf; $cycle-analytics-light-gray: #bfbfbf;
$cycle-analytics-dismiss-icon-color: #b2b2b2; $cycle-analytics-dismiss-icon-color: #b2b2b2;
...@@ -382,7 +370,7 @@ $commit-message-text-area-bg: rgba(0, 0, 0, 0.0); ...@@ -382,7 +370,7 @@ $commit-message-text-area-bg: rgba(0, 0, 0, 0.0);
/* /*
* Common * Common
*/ */
$common-gray: $gl-gray; $common-gray: $gl-text-color;
$common-gray-light: #bbb; $common-gray-light: #bbb;
$common-gray-dark: #444; $common-gray-dark: #444;
$common-red: $gl-text-red; $common-red: $gl-text-red;
......
app/assets/stylesheets/framework/wells.scss
View file @ d2608ce0
.info-well { .info-well {
background: $gray-light; background: $gray-light;
color: $gl-gray; color: $gl-text-color;
border: 1px solid $border-color; border: 1px solid $border-color;
border-radius: $border-radius-default; border-radius: $border-radius-default;
......
app/assets/stylesheets/framework/zen.scss
View file @ d2608ce0
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
} }
.zen-control-full { .zen-control-full {
color: $gl-gray-light; color: $gl-text-color-secondary;
&:hover { &:hover {
color: $gl-link-color; color: $gl-link-color;
......
app/assets/stylesheets/highlight/white.scss
View file @ d2608ce0
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
/* /*
* White Syntax Colors * White Syntax Colors
*/ */
$white-code-color: #333; $white-code-color: $gl-text-color;
$white-highlight: #fafe3d; $white-highlight: #fafe3d;
$white-pre-hll-bg: #f8eec7; $white-pre-hll-bg: #f8eec7;
$white-hll-bg: #f8f8f8; $white-hll-bg: #f8f8f8;
......
app/assets/stylesheets/pages/boards.scss
View file @ d2608ce0
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
.board-list-count { .board-list-count {
padding: 10px 0; padding: 10px 0;
color: $gl-gray-light; color: $gl-text-color-secondary;
font-size: 13px; font-size: 13px;
> .fa { > .fa {
......
app/assets/stylesheets/pages/branches.scss
View file @ d2608ce0
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
padding-top: 6px; padding-top: 6px;
padding-bottom: 0; padding-bottom: 0;
font-size: 12px; font-size: 12px;
color: $gl-title-color; color: $gl-text-color;
display: block; display: block;
} }
......
app/assets/stylesheets/pages/builds.scss
View file @ d2608ce0
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
flex: 1; flex: 1;
a { a {
color: $gl-gray; color: $gl-text-color;
&:hover { &:hover {
color: $gl-link-color; color: $gl-link-color;
...@@ -357,7 +357,7 @@ ...@@ -357,7 +357,7 @@
} }
.build-light-text { .build-light-text {
color: $gl-gray-light; color: $gl-text-color-secondary;
} }
.build-gutter-toggle { .build-gutter-toggle {
......
app/assets/stylesheets/pages/ci_projects.scss
View file @ d2608ce0
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
} }
td { td {
color: $gl-gray; color: $gl-text-color;
vertical-align: middle !important; vertical-align: middle !important;
a { a {
......
app/assets/stylesheets/pages/commits.scss
View file @ d2608ce0
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
.commit-title { .commit-title {
margin: 0; margin: 0;
color: $gl-gray-dark; color: $gl-text-color;
} }
.commit-description { .commit-description {
...@@ -96,14 +96,14 @@ ...@@ -96,14 +96,14 @@
} }
.commit-row-message { .commit-row-message {
color: $gl-dark-link-color; color: $gl-text-color;
} }
} }
.text-expander { .text-expander {
display: inline-block; display: inline-block;
background: $gray-light; background: $gray-light;
color: $gl-gray-light; color: $gl-text-color-secondary;
padding: 0 5px; padding: 0 5px;
cursor: pointer; cursor: pointer;
border: 1px solid $border-gray-dark; border: 1px solid $border-gray-dark;
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
a, a,
button { button {
color: $gl-dark-link-color; color: $gl-text-color;
vertical-align: baseline; vertical-align: baseline;
} }
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
} }
a { a {
color: $gl-dark-link-color; color: $gl-text-color;
} }
} }
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
} }
.branch-commit { .branch-commit {
color: $gl-gray; color: $gl-text-color;
.commit-icon { .commit-icon {
text-align: center; text-align: center;
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
height: 14px; height: 14px;
width: 14px; width: 14px;
vertical-align: middle; vertical-align: middle;
fill: $gl-gray-light; fill: $gl-text-color-secondary;
} }
} }
...@@ -212,6 +212,6 @@ ...@@ -212,6 +212,6 @@
} }
.commit-row-message { .commit-row-message {
color: $gl-gray; color: $gl-text-color;
} }
} }
app/assets/stylesheets/pages/cycle_analytics.scss
View file @ d2608ce0
...@@ -111,14 +111,14 @@ ...@@ -111,14 +111,14 @@
line-height: 19px; line-height: 19px;
font-size: 14px; font-size: 14px;
font-weight: 600; font-weight: 600;
color: $gl-title-color; color: $gl-text-color;
} }
&.text { &.text {
color: $layout-link-gray; color: $layout-link-gray;
&.value-col { &.value-col {
color: $gl-title-color; color: $gl-text-color;
} }
} }
} }
...@@ -260,7 +260,7 @@ ...@@ -260,7 +260,7 @@
.stage-empty, .stage-empty,
.not-available { .not-available {
color: $gl-text-color-light; color: $gl-text-color-secondary;
} }
} }
} }
...@@ -327,7 +327,7 @@ ...@@ -327,7 +327,7 @@
@include text-overflow(); @include text-overflow();
a { a {
color: $gl-dark-link-color; color: $gl-text-color;
} }
} }
} }
...@@ -355,7 +355,7 @@ ...@@ -355,7 +355,7 @@
.issue-link, .issue-link,
.commit-author-link, .commit-author-link,
.issue-author-link { .issue-author-link {
color: $gl-dark-link-color; color: $gl-text-color;
} }
// Custom CSS for components // Custom CSS for components
...@@ -396,11 +396,11 @@ ...@@ -396,11 +396,11 @@
} }
.item-build-name { .item-build-name {
color: $gl-title-color; color: $gl-text-color;
} }
.pipeline-id { .pipeline-id {
color: $gl-title-color; color: $gl-text-color;
padding: 0 3px 0 0; padding: 0 3px 0 0;
} }
...@@ -423,7 +423,7 @@ ...@@ -423,7 +423,7 @@
} }
.fa { .fa {
color: $gl-text-color-light; color: $gl-text-color-secondary;
font-size: $code_font_size; font-size: $code_font_size;
} }
} }
...@@ -435,7 +435,7 @@ ...@@ -435,7 +435,7 @@
width: 75%; width: 75%;
margin: 0 auto; margin: 0 auto;
padding-top: 130px; padding-top: 130px;
color: $gl-text-color-light; color: $gl-text-color-secondary;
h4 { h4 {
color: $gl-text-color; color: $gl-text-color;
......
app/assets/stylesheets/pages/detail_page.scss
View file @ d2608ce0
.detail-page-header { .detail-page-header {
padding: $gl-padding-top 0; padding: $gl-padding-top 0;
border-bottom: 1px solid $border-color; border-bottom: 1px solid $border-color;
color: $gl-text-color-dark; color: $gl-text-color;
line-height: 34px; line-height: 34px;
.author { .author {
color: $gl-text-color-dark; color: $gl-text-color;
} }
.identifier { .identifier {
color: $gl-text-color-dark; color: $gl-text-color;
} }
.issue_created_ago, .issue_created_ago,
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
.title { .title {
margin: 0 0 16px; margin: 0 0 16px;
font-size: 2em; font-size: 2em;
color: $gl-gray-dark; color: $gl-text-color;
padding: 0 0 0.3em; padding: 0 0 0.3em;
border-bottom: 1px solid $white-dark; border-bottom: 1px solid $white-dark;
} }
......
app/assets/stylesheets/pages/diff.scss
View file @ d2608ce0
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
background: $gray-light; background: $gray-light;
border-bottom: 1px solid $border-color; border-bottom: 1px solid $border-color;
padding: 10px 16px; padding: 10px 16px;
color: $gl-diff-text-color; color: $gl-text-color;
z-index: 10; z-index: 10;
border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0;
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
overflow: auto; overflow: auto;
overflow-y: hidden; overflow-y: hidden;
background: $white-light; background: $white-light;
color: $gl-title-color; color: $gl-text-color;
border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px;
.unfold { .unfold {
...@@ -380,7 +380,7 @@ ...@@ -380,7 +380,7 @@
} }
cursor: default; cursor: default;
color: $gl-title-color; color: $gl-text-color;
} }
&.disabled { &.disabled {
......
app/assets/stylesheets/pages/environments.scss
View file @ d2608ce0
...@@ -72,25 +72,25 @@ ...@@ -72,25 +72,25 @@
.external-url, .external-url,
.dropdown-new { .dropdown-new {
color: $gl-gray-light; color: $gl-text-color-secondary;
} }
.dropdown-menu { .dropdown-menu {
.fa { .fa {
margin-right: 6px; margin-right: 6px;
color: $gl-gray-light; color: $gl-text-color-secondary;
} }
} }
.build-link, .build-link,
.branch-name { .branch-name {
color: $gl-dark-link-color; color: $gl-text-color;
} }
.stop-env-link, .stop-env-link,
.external-url { .external-url {
color: $gl-gray-light; color: $gl-text-color-secondary;
.stop-env-icon { .stop-env-icon {
font-size: 14px; font-size: 14px;
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
.build-column { .build-column {
.build-link { .build-link {
color: $gl-dark-link-color; color: $gl-text-color;
} }
.avatar { .avatar {
......
app/assets/stylesheets/pages/events.scss
View file @ d2608ce0
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
} }
a { a {
color: $gl-dark-link-color; color: $gl-text-color;
} }
.avatar { .avatar {
......
app/assets/stylesheets/pages/groups.scss
View file @ d2608ce0
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
.stats { .stats {
float: right; float: right;
line-height: $list-text-height; line-height: $list-text-height;
color: $gl-gray; color: $gl-text-color;
span { span {
margin-right: 15px; margin-right: 15px;
......
app/assets/stylesheets/pages/issuable.scss
View file @ d2608ce0
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
} }
.edit-link { .edit-link {
color: $gl-gray; color: $gl-text-color;
&:hover { &:hover {
color: $md-link-color; color: $md-link-color;
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
} }
.btn-clipboard:hover { .btn-clipboard:hover {
color: $gl-gray; color: $gl-text-color;
} }
} }
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
} }
.no-value { .no-value {
color: $gl-gray-light; color: $gl-text-color-secondary;
} }
.sidebar-collapsed-icon { .sidebar-collapsed-icon {
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
color: $issuable-sidebar-color; color: $issuable-sidebar-color;
&:hover { &:hover {
color: $gl-gray; color: $gl-text-color;
} }
span { span {
...@@ -255,16 +255,16 @@ ...@@ -255,16 +255,16 @@
} }
.avatar:hover { .avatar:hover {
border-color: $issuable-avatar-hover-border; border-color: $issuable-sidebar-color;
} }
.btn-clipboard { .btn-clipboard {
border: none; border: none;
color: $issuable-clipboard-color; color: $issuable-sidebar-color;
&:hover { &:hover {
background: transparent; background: transparent;
color: $gl-gray; color: $gl-text-color;
} }
} }
} }
...@@ -338,7 +338,7 @@ ...@@ -338,7 +338,7 @@
margin-left: 5px; margin-left: 5px;
a { a {
color: $gl-gray-light; color: $gl-text-color-secondary;
} }
} }
......
app/assets/stylesheets/pages/labels.scss
View file @ d2608ce0
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
.manage-labels-list { .manage-labels-list {
.btn-action { .btn-action {
color: $gl-dark-link-color; color: $gl-text-color;
.fa { .fa {
font-size: 18px; font-size: 18px;
......
app/assets/stylesheets/pages/merge_requests.scss
View file @ d2608ce0
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
*/ */
.mr-state-widget { .mr-state-widget {
background: $gray-light; background: $gray-light;
color: $gl-gray; color: $gl-text-color;
border: 1px solid $border-color; border: 1px solid $border-color;
border-radius: 2px; border-radius: 2px;
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
padding-right: 0; padding-right: 0;
a { a {
color: $gl-gray; color: $gl-text-color;
} }
} }
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
.ci_widget { .ci_widget {
border-bottom: 1px solid $well-inner-border; border-bottom: 1px solid $well-inner-border;
color: $gl-gray; color: $gl-text-color;
svg { svg {
margin-right: 4px; margin-right: 4px;
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
} }
.normal { .normal {
color: $gl-text-color-dark; color: $gl-text-color;
} }
.js-deployment-link { .js-deployment-link {
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
font-weight: 600; font-weight: 600;
font-size: 16px; font-size: 16px;
margin: 5px 0; margin: 5px 0;
color: $gl-gray-dark; color: $gl-text-color;
&.has-conflicts .fa-exclamation-triangle { &.has-conflicts .fa-exclamation-triangle {
color: $gl-warning; color: $gl-warning;
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
} }
.label-branch { .label-branch {
color: $gl-gray-dark; color: $gl-text-color;
font-family: $monospace_font; font-family: $monospace_font;
font-weight: bold; font-weight: bold;
overflow: hidden; overflow: hidden;
...@@ -363,7 +363,7 @@ ...@@ -363,7 +363,7 @@
th { th {
background-color: $white-light; background-color: $white-light;
color: $gl-gray-light; color: $gl-text-color-secondary;
} }
} }
} }
......
app/assets/stylesheets/pages/milestone.scss
View file @ d2608ce0
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
margin-top: 7px; margin-top: 7px;
.issuable-number { .issuable-number {
color: $gl-gray-light; color: $gl-text-color-secondary;
margin-right: 5px; margin-right: 5px;
} }
......
app/assets/stylesheets/pages/note_form.scss
View file @ d2608ce0
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
.note-textarea { .note-textarea {
display: block; display: block;
padding: 10px 0; padding: 10px 0;
color: $gl-gray; color: $gl-text-color;
font-family: $regular_font; font-family: $regular_font;
border: 0; border: 0;
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
.comment-toolbar { .comment-toolbar {
padding-top: $gl-padding-top; padding-top: $gl-padding-top;
color: $gl-gray-light; color: $gl-text-color-secondary;
border-top: 1px solid $border-color; border-top: 1px solid $border-color;
} }
......
app/assets/stylesheets/pages/notes.scss
View file @ d2608ce0
...@@ -345,7 +345,7 @@ ul.notes { ...@@ -345,7 +345,7 @@ ul.notes {
} }
.author_link { .author_link {
color: $gl-gray; color: $gl-text-color;
} }
} }
......
app/assets/stylesheets/pages/pipelines.scss
View file @ d2608ce0
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
height: 14px; height: 14px;
width: 14px; width: 14px;
vertical-align: middle; vertical-align: middle;
fill: $gl-gray-light; fill: $gl-text-color-secondary;
} }
.fa { .fa {
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
.duration, .duration,
.finished-at { .finished-at {
color: $gl-gray-light; color: $gl-text-color-secondary;
margin: 4px 0; margin: 4px 0;
.fa { .fa {
...@@ -231,7 +231,7 @@ ...@@ -231,7 +231,7 @@
.btn { .btn {
margin: 0; margin: 0;
color: $gl-gray-light; color: $gl-text-color-secondary;
} }
.cancel-retry-btns { .cancel-retry-btns {
...@@ -244,10 +244,10 @@ ...@@ -244,10 +244,10 @@
.dropdown-toggle, .dropdown-toggle,
.dropdown-menu { .dropdown-menu {
color: $gl-gray-light; color: $gl-text-color-secondary;
.fa { .fa {
color: $gl-gray-light; color: $gl-text-color-secondary;
font-size: 14px; font-size: 14px;
} }
...@@ -281,7 +281,7 @@ ...@@ -281,7 +281,7 @@
.build-link { .build-link {
a { a {
color: $gl-dark-link-color; color: $gl-text-color;
} }
} }
...@@ -344,7 +344,7 @@ ...@@ -344,7 +344,7 @@
a { a {
text-decoration: none; text-decoration: none;
color: $gl-text-color-light; color: $gl-text-color-secondary;
} }
svg { svg {
...@@ -468,13 +468,13 @@ ...@@ -468,13 +468,13 @@
width: 186px; width: 186px;
margin-bottom: 10px; margin-bottom: 10px;
white-space: normal; white-space: normal;
color: $gl-text-color-light; color: $gl-text-color-secondary;
.dropdown-menu-toggle { .dropdown-menu-toggle {
background-color: transparent; background-color: transparent;
border: none; border: none;
padding: 0; padding: 0;
color: $gl-text-color-light; color: $gl-text-color-secondary;
&:focus { &:focus {
outline: none; outline: none;
...@@ -730,7 +730,7 @@ ...@@ -730,7 +730,7 @@
} }
.dropdown-build { .dropdown-build {
color: $gl-text-color-light; color: $gl-text-color-secondary;
.build-content { .build-content {
padding: 4px 7px 8px; padding: 4px 7px 8px;
...@@ -784,7 +784,7 @@ ...@@ -784,7 +784,7 @@
.builds-dropdown { .builds-dropdown {
background-color: transparent; background-color: transparent;
padding: 0; padding: 0;
color: $gl-text-color-light; color: $gl-text-color-secondary;
border: none; border: none;
margin: 0; margin: 0;
...@@ -827,7 +827,7 @@ ...@@ -827,7 +827,7 @@
.ci-status-icon-canceled, .ci-status-icon-canceled,
.ci-status-icon-disabled, .ci-status-icon-disabled,
.ci-status-icon-not-found { .ci-status-icon-not-found {
background-color: rgba($gl-gray, .1); background-color: rgba($gl-text-color, .1);
} }
.ci-status-icon-created, .ci-status-icon-created,
...@@ -866,7 +866,7 @@ ...@@ -866,7 +866,7 @@
min-height: 50px; min-height: 50px;
a { a {
color: $gl-text-color-light; color: $gl-text-color-secondary;
} }
} }
......
app/assets/stylesheets/pages/projects.scss
View file @ d2608ce0
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
.option-title { .option-title {
font-weight: normal; font-weight: normal;
display: inline-block; display: inline-block;
color: $gl-gray-dark; color: $gl-text-color;
} }
.option-descr { .option-descr {
...@@ -331,7 +331,7 @@ ...@@ -331,7 +331,7 @@
a.deploy-project-label { a.deploy-project-label {
padding: 5px; padding: 5px;
margin-right: 5px; margin-right: 5px;
color: $gl-gray; color: $gl-text-color;
background-color: $row-hover; background-color: $row-hover;
&:hover { &:hover {
...@@ -372,7 +372,7 @@ a.deploy-project-label { ...@@ -372,7 +372,7 @@ a.deploy-project-label {
} }
a { a {
color: $gl-dark-link-color; color: $gl-text-color;
} }
.dropdown-menu { .dropdown-menu {
...@@ -426,7 +426,7 @@ a.deploy-project-label { ...@@ -426,7 +426,7 @@ a.deploy-project-label {
width: 100%; width: 100%;
height: 100%; height: 100%;
padding-top: $gl-padding; padding-top: $gl-padding;
color: $gl-gray; color: $gl-text-color;
.caption { .caption {
min-height: 30px; min-height: 30px;
...@@ -552,7 +552,7 @@ pre.light-well { ...@@ -552,7 +552,7 @@ pre.light-well {
margin: 0 7px 7px; margin: 0 7px 7px;
h5 { h5 {
color: $gl-text-color-dark; color: $gl-text-color;
} }
.light-well { .light-well {
...@@ -662,7 +662,7 @@ pre.light-well { ...@@ -662,7 +662,7 @@ pre.light-well {
} }
.commit-row-message { .commit-row-message {
color: $gl-gray; color: $gl-text-color;
} }
.commit_short_id { .commit_short_id {
...@@ -750,7 +750,7 @@ pre.light-well { ...@@ -750,7 +750,7 @@ pre.light-well {
.protected-branches-list { .protected-branches-list {
a { a {
color: $gl-gray; color: $gl-text-color;
&:hover { &:hover {
color: $gl-link-color; color: $gl-link-color;
......
app/assets/stylesheets/pages/settings.scss
View file @ d2608ce0
.settings-list-icon { .settings-list-icon {
color: $gl-gray-light; color: $gl-text-color-secondary;
font-size: $settings-icon-size; font-size: $settings-icon-size;
line-height: 42px; line-height: 42px;
} }
......
app/assets/stylesheets/pages/status.scss
View file @ d2608ce0
...@@ -61,15 +61,15 @@ ...@@ -61,15 +61,15 @@
&.ci-canceled, &.ci-canceled,
&.ci-disabled { &.ci-disabled {
color: $gl-gray; color: $gl-text-color;
border-color: $gl-gray; border-color: $gl-text-color;
&:not(span):hover { &:not(span):hover {
background-color: rgba($gl-gray, .07); background-color: rgba($gl-text-color, .07);
} }
svg { svg {
fill: $gl-gray; fill: $gl-text-color;
} }
} }
...@@ -101,15 +101,15 @@ ...@@ -101,15 +101,15 @@
&.ci-created, &.ci-created,
&.ci-skipped { &.ci-skipped {
color: $gl-gray-light; color: $gl-text-color-secondary;
border-color: $gl-gray-light; border-color: $gl-text-color-secondary;
&:not(span):hover { &:not(span):hover {
background-color: rgba($gl-gray-light, .07); background-color: rgba($gl-text-color-secondary, .07);
} }
svg { svg {
fill: $gl-gray-light; fill: $gl-text-color-secondary;
} }
} }
......
app/assets/stylesheets/pages/todos.scss
View file @ d2608ce0
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
} }
p { p {
color: $gl-text-color-dark; color: $gl-text-color;
} }
} }
......
app/assets/stylesheets/pages/tree.scss
View file @ d2608ce0
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
i, i,
a { a {
color: $gl-dark-link-color; color: $gl-text-color;
} }
img { img {
...@@ -104,21 +104,21 @@ ...@@ -104,21 +104,21 @@
padding-right: 8px; padding-right: 8px;
.commit-author-name { .commit-author-name {
color: $gl-gray; color: $gl-text-color;
} }
} }
.tree-time-ago { .tree-time-ago {
min-width: 135px; min-width: 135px;
color: $gl-gray-light; color: $gl-text-color-secondary;
} }
.tree-commit { .tree-commit {
max-width: 320px; max-width: 320px;
color: $gl-gray-light; color: $gl-text-color-secondary;
.tree-commit-link { .tree-commit-link {
color: $gl-gray-light; color: $gl-text-color-secondary;
&:hover { &:hover {
text-decoration: underline; text-decoration: underline;
......
app/assets/stylesheets/pages/wiki.scss
View file @ d2608ce0
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
} }
.wiki-last-edit-by { .wiki-last-edit-by {
color: $gl-gray-light; color: $gl-text-color-secondary;
strong { strong {
color: $gl-text-color; color: $gl-text-color;
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
.light { .light {
font-weight: normal; font-weight: normal;
color: $gl-gray-light; color: $gl-text-color-secondary;
} }
.git-access-header { .git-access-header {
......
app/views/layouts/nav/_admin.html.haml
View file @ d2608ce0
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
= link_to admin_abuse_reports_path, title: "Abuse Reports" do = link_to admin_abuse_reports_path, title: "Abuse Reports" do
%span %span
Abuse Reports Abuse Reports
%span.badge.badge-dark.count= number_with_delimiter(AbuseReport.count(:all)) %span.badge.count= number_with_delimiter(AbuseReport.count(:all))
- if askimet_enabled? - if askimet_enabled?
= nav_link(controller: :spam_logs) do = nav_link(controller: :spam_logs) do
......
app/views/layouts/nav/_group.html.haml
View file @ d2608ce0
...@@ -26,13 +26,13 @@ ...@@ -26,13 +26,13 @@
%span %span
Issues Issues
- issues = IssuesFinder.new(current_user, group_id: @group.id, state: 'opened').execute - issues = IssuesFinder.new(current_user, group_id: @group.id, state: 'opened').execute
%span.badge.badge-dark.count= number_with_delimiter(issues.count) %span.badge.count= number_with_delimiter(issues.count)
= nav_link(path: 'groups#merge_requests') do = nav_link(path: 'groups#merge_requests') do
= link_to merge_requests_group_path(@group), title: 'Merge Requests' do = link_to merge_requests_group_path(@group), title: 'Merge Requests' do
%span %span
Merge Requests Merge Requests
- merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened', non_archived: true).execute - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened', non_archived: true).execute
%span.badge.badge-dark.count= number_with_delimiter(merge_requests.count) %span.badge.count= number_with_delimiter(merge_requests.count)
= nav_link(controller: [:group_members]) do = nav_link(controller: [:group_members]) do
= link_to group_group_members_path(@group), title: 'Members' do = link_to group_group_members_path(@group), title: 'Members' do
%span %span
......
app/views/layouts/nav/_project.html.haml
View file @ d2608ce0
...@@ -61,14 +61,14 @@ ...@@ -61,14 +61,14 @@
%span %span
Issues Issues
- if @project.default_issues_tracker? - if @project.default_issues_tracker?
%span.badge.badge-dark.count.issue_counter= number_with_delimiter(IssuesFinder.new(current_user, project_id: @project.id).execute.opened.count) %span.badge.count.issue_counter= number_with_delimiter(IssuesFinder.new(current_user, project_id: @project.id).execute.opened.count)
- if project_nav_tab? :merge_requests - if project_nav_tab? :merge_requests
= nav_link(controller: :merge_requests) do = nav_link(controller: :merge_requests) do
= link_to namespace_project_merge_requests_path(@project.namespace, @project), title: 'Merge Requests', class: 'shortcuts-merge_requests' do = link_to namespace_project_merge_requests_path(@project.namespace, @project), title: 'Merge Requests', class: 'shortcuts-merge_requests' do
%span %span
Merge Requests Merge Requests
%span.badge.badge-dark.count.merge_counter= number_with_delimiter(MergeRequestsFinder.new(current_user, project_id: @project.id).execute.opened.count) %span.badge.count.merge_counter= number_with_delimiter(MergeRequestsFinder.new(current_user, project_id: @project.id).execute.opened.count)
- if project_nav_tab? :wiki - if project_nav_tab? :wiki
= nav_link(controller: :wikis) do = nav_link(controller: :wikis) do
......
changelogs/unreleased/25701-standardize-text-colors.yml 0 → 100644
View file @ d2608ce0
---
title: 25701 standardize text colors
merge_request:
author:
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