diff options
author | Kushal Pandya <kushalspandya@gmail.com> | 2019-07-11 08:12:36 +0000 |
---|---|---|
committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-07-11 08:12:36 +0000 |
commit | e6f8e120816842bc3fba82ca77625fdde6a76a66 (patch) | |
tree | 9b5997e42732a91c16d7d498dc69e83b16d9ea03 | |
parent | 796855e21637b48041411c915178f7913c81fb35 (diff) | |
parent | 64254f90a633ece3e58e7baa850ae126b6549896 (diff) | |
download | gitlab-ce-e6f8e120816842bc3fba82ca77625fdde6a76a66.tar.gz |
Merge branch 'mw-project-list-color-fix' into 'master'
Project list: Add text-secondary to controls container
See merge request gitlab-org/gitlab-ce!30567
-rw-r--r-- | app/views/shared/projects/_project.html.haml | 2 | ||||
-rw-r--r-- | changelogs/unreleased/mw-project-list-color-fix.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml index 90fb067e75d..71bd9320593 100644 --- a/app/views/shared/projects/_project.html.haml +++ b/app/views/shared/projects/_project.html.haml @@ -58,7 +58,7 @@ .description.d-none.d-sm-block.append-right-default = markdown_field(project, :description) - .controls.d-flex.flex-sm-column.align-items-center.align-items-sm-end.flex-wrap.flex-shrink-0{ class: css_controls_class } + .controls.d-flex.flex-sm-column.align-items-center.align-items-sm-end.flex-wrap.flex-shrink-0.text-secondary{ class: css_controls_class } .icon-container.d-flex.align-items-center - if project.archived %span.d-flex.icon-wrapper.badge.badge-warning archived diff --git a/changelogs/unreleased/mw-project-list-color-fix.yml b/changelogs/unreleased/mw-project-list-color-fix.yml new file mode 100644 index 00000000000..6f8b2742ec6 --- /dev/null +++ b/changelogs/unreleased/mw-project-list-color-fix.yml @@ -0,0 +1,5 @@ +--- +title: Add text-secondary to controls in project list +merge_request: 30567 +author: +type: fixed |