diff options
| author | Phil Hughes <me@iamphill.com> | 2018-02-27 09:56:45 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-02-27 09:56:45 +0000 |
| commit | 5a507c82311b8283e2dcaecaaaffa6d5db9662e6 (patch) | |
| tree | 635ad7a90b9c9539a995a9506a5a189e9aece899 | |
| parent | 1e04603f9322125ae0d725e1bca6da76a1337729 (diff) | |
| parent | d74aa827c4cb9f327ab028497182341921e56fbf (diff) | |
| download | gitlab-ce-5a507c82311b8283e2dcaecaaaffa6d5db9662e6.tar.gz | |
Merge branch '43315-gpg-popover' into 'master'
Resolve "Verified commits not displaying properly"
Closes #43315
See merge request gitlab-org/gitlab-ce!17323
| -rw-r--r-- | app/assets/stylesheets/pages/commits.scss | 8 | ||||
| -rw-r--r-- | app/views/projects/commits/_commit.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/43315-gpg-popover.yml | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index 17801ed5910..8b680c2dc52 100644 --- a/app/assets/stylesheets/pages/commits.scss +++ b/app/assets/stylesheets/pages/commits.scss @@ -196,17 +196,9 @@ @media (min-width: $screen-sm-min) { font-size: 0; - div { - display: inline; - } - .fa-spinner { font-size: 12px; } - - span { - font-size: 6px; - } } .ci-status-link { diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml index 6ff7bcae54f..078bd0eee63 100644 --- a/app/views/projects/commits/_commit.html.haml +++ b/app/views/projects/commits/_commit.html.haml @@ -20,7 +20,7 @@ .avatar-cell.hidden-xs = author_avatar(commit, size: 36) - .commit-detail + .commit-detail.flex-list .commit-content = link_to_markdown_field(commit, :title, link, class: "commit-row-message item-title") %span.commit-row-message.visible-xs-inline diff --git a/changelogs/unreleased/43315-gpg-popover.yml b/changelogs/unreleased/43315-gpg-popover.yml new file mode 100644 index 00000000000..69238aa8075 --- /dev/null +++ b/changelogs/unreleased/43315-gpg-popover.yml @@ -0,0 +1,5 @@ +--- +title: Fixes gpg popover layout +merge_request: 17323 +author: +type: fixed |