Commit ec1edb2a authored by Clement Ho's avatar Clement Ho

Merge branch 'xanf/gitlab-ce-move-project-tags' into 'master'

Resolve "Project overview UI: Line break when there are multiple project tags"

Closes #55650

See merge request gitlab-org/gitlab-ce!26797
parents 6e156a63 7b020b57
...@@ -209,8 +209,7 @@ ...@@ -209,8 +209,7 @@
} }
} }
.access-request-link, .access-request-link {
.home-panel-topic-list {
padding-left: $gl-padding-8; padding-left: $gl-padding-8;
border-left: 1px solid $gl-text-color-secondary; border-left: 1px solid $gl-text-color-secondary;
} }
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
= @project.name = @project.name
%span.visibility-icon.text-secondary.prepend-left-4.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@project) } %span.visibility-icon.text-secondary.prepend-left-4.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@project) }
= visibility_level_icon(@project.visibility_level, fw: false, options: {class: 'icon'}) = visibility_level_icon(@project.visibility_level, fw: false, options: {class: 'icon'})
.home-panel-metadata.d-flex.align-items-center.text-secondary .home-panel-metadata.d-flex.flex-wrap.text-secondary
- if can?(current_user, :read_project, @project) - if can?(current_user, :read_project, @project)
%span.text-secondary %span.text-secondary
= s_('ProjectPage|Project ID: %{project_id}') % { project_id: @project.id } = s_('ProjectPage|Project ID: %{project_id}') % { project_id: @project.id }
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
%span.access-request-links.prepend-left-8 %span.access-request-links.prepend-left-8
= render 'shared/members/access_request_links', source: @project = render 'shared/members/access_request_links', source: @project
- if @project.tag_list.present? - if @project.tag_list.present?
%span.home-panel-topic-list.d-inline-flex.prepend-left-8 %span.home-panel-topic-list.mt-2.w-100.d-inline-flex
= sprite_icon('tag', size: 16, css_class: 'icon append-right-4') = sprite_icon('tag', size: 16, css_class: 'icon append-right-4')
- @project.topics_to_show.each do |topic| - @project.topics_to_show.each do |topic|
......
---
title: Move project tags to separate line
merge_request: 26797
author:
type: other
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