diff options
| author | Illya Klymov <xanf@xanf.me> | 2019-03-31 12:55:56 +0300 |
|---|---|---|
| committer | Illya Klymov <xanf@xanf.me> | 2019-04-03 17:56:59 +0300 |
| commit | 7b020b57e0d12d4a908695bed0676c55d72600f6 (patch) | |
| tree | 9a1d4c264e86831b18e2340e40d84ae8380b8e0b | |
| parent | db12e729a7f0615ccb2fd8cd3209bddc3f7bfe39 (diff) | |
| download | gitlab-ce-xanf/gitlab-ce-move-project-tags.tar.gz | |
Move topics to separate line in project overviewxanf/gitlab-ce-move-project-tags
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 3 | ||||
| -rw-r--r-- | app/views/projects/_home_panel.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/xanf-gitlab-ce-move-project-tags.yml | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index bcb306d97d5..792c618fd40 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -209,8 +209,7 @@ } } - .access-request-link, - .home-panel-topic-list { + .access-request-link { padding-left: $gl-padding-8; border-left: 1px solid $gl-text-color-secondary; } diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml index 4ac5a74c85c..50adc19f524 100644 --- a/app/views/projects/_home_panel.html.haml +++ b/app/views/projects/_home_panel.html.haml @@ -12,7 +12,7 @@ = @project.name %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'}) - .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) %span.text-secondary = s_('ProjectPage|Project ID: %{project_id}') % { project_id: @project.id } @@ -20,7 +20,7 @@ %span.access-request-links.prepend-left-8 = render 'shared/members/access_request_links', source: @project - 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') - @project.topics_to_show.each do |topic| diff --git a/changelogs/unreleased/xanf-gitlab-ce-move-project-tags.yml b/changelogs/unreleased/xanf-gitlab-ce-move-project-tags.yml new file mode 100644 index 00000000000..124584c9bd4 --- /dev/null +++ b/changelogs/unreleased/xanf-gitlab-ce-move-project-tags.yml @@ -0,0 +1,5 @@ +--- +title: Move project tags to separate line +merge_request: 26797 +author: +type: other |