From 6d0e9e4e73e806e25db616d5037a3e9982ef82e0 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Tue, 9 Apr 2024 14:59:36 -0600 Subject: [PATCH 1/2] Fix hover underline in comments icon in list view Changelog: changed --- .../vue_shared/issuable/list/components/issuable_item.vue | 4 ++-- app/views/shared/_issuable_meta_data.html.haml | 6 +++--- app/views/shared/snippets/_snippet.html.haml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue index 4dce443b709fc3..f567708f0c262d 100644 --- a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue +++ b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue @@ -405,9 +405,9 @@ export default { :title="__('Comments')" :href="issuableNotesLink" :class="{ 'no-comments': !notesCount }" - class="gl-reset-color!" + class="gl-reset-color! gl-display-flex gl-align-items-center" > - + {{ notesCount }} diff --git a/app/views/shared/_issuable_meta_data.html.haml b/app/views/shared/_issuable_meta_data.html.haml index 982d3b687929d0..6a914051e50965 100644 --- a/app/views/shared/_issuable_meta_data.html.haml +++ b/app/views/shared/_issuable_meta_data.html.haml @@ -22,7 +22,7 @@ = render_if_exists 'shared/issuable/blocking_issues_count', issuable: issuable -%li.gl-display-none.gl-sm-display-block - = link_to issuable_path, class: ['has-tooltip', ('no-comments' if note_count == 0)], title: _('Comments'), data: { testid: 'issuable-comments' } do - = sprite_icon('comments', css_class: 'gl-vertical-align-text-bottom') +%li.gl-display-none.gl-sm-display-flex + = link_to issuable_path, class: ['has-tooltip gl-display-flex gl-align-items-center', ('no-comments' if note_count == 0)], title: _('Comments'), data: { testid: 'issuable-comments' } do + = sprite_icon('comments', css_class: 'gl-mr-2') = note_count diff --git a/app/views/shared/snippets/_snippet.html.haml b/app/views/shared/snippets/_snippet.html.haml index a61d49f30cfc94..4381636c0f2246 100644 --- a/app/views/shared/snippets/_snippet.html.haml +++ b/app/views/shared/snippets/_snippet.html.haml @@ -28,8 +28,8 @@ .gl-sm-display-flex.gl-flex-direction-column.gl-align-items-flex-end{ data: { testid: 'snippet-file-count-content', qa_snippet_files: snippet.statistics&.file_count } } .gl-display-flex.gl-gap-4.gl-align-items-center = snippet_file_count(snippet) - = link_to gitlab_snippet_path(snippet, anchor: 'notes'), class: "#{'no-comments' if notes_count == 0} gl-text-black-normal" do - = sprite_icon('comments', css_class: 'gl-vertical-align-text-bottom') + = link_to gitlab_snippet_path(snippet, anchor: 'notes'), title: _('Comments'), class: "#{'no-comments' if notes_count == 0} gl-text-black-normal! gl-display-flex gl-align-items-center has-tooltip" do + = sprite_icon('comments', css_class: 'gl-mr-2') = notes_count %span.has-tooltip{ title: visibility_level_label(snippet.visibility_level), data: { testid: 'snippet-visibility-content', qa_snippet_visibility: visibility_level_label(snippet.visibility_level) } } = visibility_level_icon(snippet.visibility_level) -- GitLab From cdd82bf45f619a5259a7bc50b5a38bcc41e4daef Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Wed, 10 Apr 2024 10:50:08 -0600 Subject: [PATCH 2/2] Remove counters if 0; update list metadata --- .../list/components/issue_card_statistics.vue | 24 +++++++++---------- .../components/merge_request_statistics.vue | 4 ++-- .../list/components/issuable_item.vue | 19 +++++++-------- app/assets/stylesheets/framework/lists.scss | 4 ---- .../merge_requests/_approvals_count.html.haml | 2 +- .../merge_requests/_merge_request.html.haml | 17 +++++++------ .../shared/_issuable_meta_data.html.haml | 16 ++++++------- app/views/shared/snippets/_snippet.html.haml | 13 +++++----- .../list/components/issue_card_statistics.vue | 2 +- .../merge_requests/_approvals_count.html.haml | 2 +- .../issues/user_sees_breadcrumb_links_spec.rb | 2 +- .../list/components/issuable_item_spec.js | 9 +++---- 12 files changed, 52 insertions(+), 62 deletions(-) diff --git a/app/assets/javascripts/issues/list/components/issue_card_statistics.vue b/app/assets/javascripts/issues/list/components/issue_card_statistics.vue index 2d00c3e549da99..4906cec526a200 100644 --- a/app/assets/javascripts/issues/list/components/issue_card_statistics.vue +++ b/app/assets/javascripts/issues/list/components/issue_card_statistics.vue @@ -21,20 +21,10 @@ export default { diff --git a/app/assets/javascripts/merge_requests/list/components/merge_request_statistics.vue b/app/assets/javascripts/merge_requests/list/components/merge_request_statistics.vue index 2bce8314a0cde2..53d5b2be327bb8 100644 --- a/app/assets/javascripts/merge_requests/list/components/merge_request_statistics.vue +++ b/app/assets/javascripts/merge_requests/list/components/merge_request_statistics.vue @@ -24,7 +24,7 @@ export default {
  • @@ -34,7 +34,7 @@ export default {
  • diff --git a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue index f567708f0c262d..e06abfbfc772a5 100644 --- a/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue +++ b/app/assets/javascripts/vue_shared/issuable/list/components/issuable_item.vue @@ -376,41 +376,38 @@ export default {
    -
      +
        -
      • +
        • -
      • +
        • -
      • - {{ notesCount }} - +
    • +
    0 - %li.gl-display-none.gl-sm-display-block.has-tooltip{ title: _('Related merge requests'), data: { testid: 'merge-requests' } } + %li.gl-display-none.gl-sm-display-block.has-tooltip{ title: _('Related merge requests'), data: { testid: 'merge-requests' }, class: 'gl-mr-0!' } = sprite_icon('merge-request', css_class: "gl-vertical-align-middle") = issuable_mr +- if note_count > 0 + %li.gl-display-none.gl-sm-display-block.has-tooltip{ title: _('Comments'), data: { testid: 'issuable-comments' }, class: 'gl-mr-0!' } + = sprite_icon('comments', css_class: "gl-vertical-align-middle") + = note_count + - if upvotes > 0 - %li.gl-display-none.gl-sm-display-block.has-tooltip{ title: _('Upvotes'), data: { testid: 'issuable-upvotes' } } + %li.gl-display-none.gl-sm-display-block.has-tooltip{ title: _('Upvotes'), data: { testid: 'issuable-upvotes' }, class: 'gl-mr-0!' } = sprite_icon('thumb-up', css_class: "gl-vertical-align-middle") = upvotes - if downvotes > 0 - %li.gl-display-none.gl-sm-display-block.has-tooltip{ title: _('Downvotes'), data: { testid: 'issuable-downvotes' } } + %li.gl-display-none.gl-sm-display-block.has-tooltip{ title: _('Downvotes'), data: { testid: 'issuable-downvotes' }, class: 'gl-mr-0!' } = sprite_icon('thumb-down', css_class: "gl-vertical-align-middle") = downvotes = render_if_exists 'shared/issuable/blocking_issues_count', issuable: issuable -%li.gl-display-none.gl-sm-display-flex - = link_to issuable_path, class: ['has-tooltip gl-display-flex gl-align-items-center', ('no-comments' if note_count == 0)], title: _('Comments'), data: { testid: 'issuable-comments' } do - = sprite_icon('comments', css_class: 'gl-mr-2') - = note_count diff --git a/app/views/shared/snippets/_snippet.html.haml b/app/views/shared/snippets/_snippet.html.haml index 4381636c0f2246..753350f5c97eeb 100644 --- a/app/views/shared/snippets/_snippet.html.haml +++ b/app/views/shared/snippets/_snippet.html.haml @@ -14,8 +14,8 @@ %span{ class: 'has-tooltip gl-bg-orange-50 gl-text-orange-600 border-radius-default gl-p-2', title: s_("Snippets|This snippet is hidden because its author has been banned") } = sprite_icon('spam', size: '16') - .snippet-info - .gl-display-inline.gl-text-secondary{ data: { testid: 'snippet-created-at'} } + .snippet-info.gl-font-sm.gl-text-gray-500! + .gl-display-inline{ data: { testid: 'snippet-created-at'} } - created_at = time_ago_with_tooltip(snippet.created_at, placement: 'bottom') - author = link_to(snippet.author_name, user_snippets_path(snippet.author), data: { user_id: snippet.author.id }, class: 'gl-text-black-normal') #{snippet.to_reference} · @@ -27,10 +27,11 @@ .gl-sm-display-flex.gl-flex-direction-column.gl-align-items-flex-end{ data: { testid: 'snippet-file-count-content', qa_snippet_files: snippet.statistics&.file_count } } .gl-display-flex.gl-gap-4.gl-align-items-center + - if notes_count > 0 + %span.has-tooltip{ title: _('Comments') } + = sprite_icon('comments') + = notes_count = snippet_file_count(snippet) - = link_to gitlab_snippet_path(snippet, anchor: 'notes'), title: _('Comments'), class: "#{'no-comments' if notes_count == 0} gl-text-black-normal! gl-display-flex gl-align-items-center has-tooltip" do - = sprite_icon('comments', css_class: 'gl-mr-2') - = notes_count %span.has-tooltip{ title: visibility_level_label(snippet.visibility_level), data: { testid: 'snippet-visibility-content', qa_snippet_visibility: visibility_level_label(snippet.visibility_level) } } = visibility_level_icon(snippet.visibility_level) - .gl-white-space-nowrap.gl-text-secondary= _('updated %{timeAgo}').html_safe % { timeAgo: time_ago_with_tooltip(snippet.updated_at, placement: 'bottom') } + .gl-white-space-nowrap.gl-font-sm.gl-text-secondary= _('updated %{timeAgo}').html_safe % { timeAgo: time_ago_with_tooltip(snippet.updated_at, placement: 'bottom') } diff --git a/ee/app/assets/javascripts/issues/list/components/issue_card_statistics.vue b/ee/app/assets/javascripts/issues/list/components/issue_card_statistics.vue index ce1f3f6506f69a..4c6ccec4ab57b6 100644 --- a/ee/app/assets/javascripts/issues/list/components/issue_card_statistics.vue +++ b/ee/app/assets/javascripts/issues/list/components/issue_card_statistics.vue @@ -19,7 +19,7 @@ export default {