diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-20 00:23:20 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-20 00:23:20 +0300 |
| commit | ec2d2ecdf734e48f6603c90aea01abc67c6bb293 (patch) | |
| tree | dffc3ea9b5e771785f4e9cc712a68aff76b9079e /app | |
| parent | 39406b41a6f3178feea7153bb2ce7343bc193e93 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/_readme.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/mirrors/_mirror_repos_list.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/groups/_group.html.haml | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/app/views/projects/_readme.html.haml b/app/views/projects/_readme.html.haml index c3d66396256..fc9ddb650e9 100644 --- a/app/views/projects/_readme.html.haml +++ b/app/views/projects/_readme.html.haml @@ -1,5 +1,5 @@ - if (readme = @repository.readme) && readme.rich_viewer - .tree-holder + .tree-holder.gl-mt-5 .nav-block.mt-0 = render 'projects/tree/tree_header', tree: @tree %article.file-holder.readme-holder{ id: 'readme', class: ("limited-width-container" unless fluid_layout) } diff --git a/app/views/projects/mirrors/_mirror_repos_list.html.haml b/app/views/projects/mirrors/_mirror_repos_list.html.haml index 5e3c4889d1d..ab0786a6f5b 100644 --- a/app/views/projects/mirrors/_mirror_repos_list.html.haml +++ b/app/views/projects/mirrors/_mirror_repos_list.html.haml @@ -29,7 +29,7 @@ - if mirror.disabled? = render 'projects/mirrors/disabled_mirror_badge' - if mirror.last_error.present? - = gl_badge_tag _('Error'), { variant: :danger }, { data: { toggle: 'tooltip', html: 'true', testid: 'mirror-error-badge-content' }, title: html_escape(mirror.last_error.try(:strip)) } + = gl_badge_tag _('Error'), { variant: :danger }, { data: { toggle: 'tooltip', html: 'true', testid: 'mirror-error-badge-content' }, title: html_escape(mirror.last_error.try(:strip)), tabindex: 0 } %td - if mirror_settings_enabled .btn-group.mirror-actions-group{ role: 'group' } diff --git a/app/views/shared/groups/_group.html.haml b/app/views/shared/groups/_group.html.haml index 375e10de065..38189786c24 100644 --- a/app/views/shared/groups/_group.html.haml +++ b/app/views/shared/groups/_group.html.haml @@ -2,9 +2,8 @@ - access = user&.max_member_access_for_group(group.id) %li.group-row.py-3.gl-align-items-center{ class: "gl-display-flex!" } - .avatar-container.rect-avatar.s48.gl-flex-shrink-0 - = link_to group do - = render Pajamas::AvatarComponent.new(group, alt: group.name, size: 48) + = link_to group do + = render Pajamas::AvatarComponent.new(group, alt: group.name, size: 48, class: 'gl-mr-5') .gl-min-w-0.gl-flex-grow-1 .title = link_to group.full_name, group, class: 'group-name' |