kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '43315-gpg-popover' into 'master'

Browse source 
Resolve "Verified commits not displaying properly"

Closes #43315

See merge request gitlab-org/gitlab-ce!17323
This commit is contained in:
Phil Hughes 2018-02-27 09:56:45 +00:00
commit 5a507c8231
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/stylesheets/pages/commits.scss
View file

@ -196,17 +196,9 @@
@media (min-width: $screen-sm-min) { @media (min-width: $screen-sm-min) {
font-size: 0; font-size: 0;
div {
display: inline;
}
.fa-spinner { .fa-spinner {
font-size: 12px; font-size: 12px;
} }
span {
font-size: 6px;
}
} }
.ci-status-link { .ci-status-link {

2
app/views/projects/commits/_commit.html.haml
View file

@ -20,7 +20,7 @@
.avatar-cell.hidden-xs .avatar-cell.hidden-xs
= author_avatar(commit, size: 36) = author_avatar(commit, size: 36)
.commit-detail .commit-detail.flex-list
.commit-content .commit-content
= link_to_markdown_field(commit, :title, link, class: "commit-row-message item-title") = link_to_markdown_field(commit, :title, link, class: "commit-row-message item-title")
%span.commit-row-message.visible-xs-inline %span.commit-row-message.visible-xs-inline

5
changelogs/unreleased/43315-gpg-popover.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Fixes gpg popover layout
merge_request: 17323
author:
type: fixed