diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-08-23 21:26:27 +0000 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2017-08-25 10:17:59 +1000 |
| commit | 844dd34a969be08dcbaa42b084d379b5e5565bbc (patch) | |
| tree | 896ff5b90508cfab5e6a19e978374ecb761538c0 | |
| parent | 4c4774182bfc959fbee9615ede177ee5e666bb64 (diff) | |
| download | gitlab-ce-844dd34a969be08dcbaa42b084d379b5e5565bbc.tar.gz | |
Merge branch '36709-gpg-status' into 'master'
Fix alignment of gpg status
Closes #36709
See merge request !13772
| -rw-r--r-- | app/assets/stylesheets/pages/commits.scss | 5 | ||||
| -rw-r--r-- | app/helpers/commits_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/commits/_commit.html.haml | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index 46fbfe5f91e..d0d11b4d71c 100644 --- a/app/assets/stylesheets/pages/commits.scss +++ b/app/assets/stylesheets/pages/commits.scss @@ -286,6 +286,9 @@ .gpg-status-box { + padding: 2px 10px; + margin-right: $gl-padding; + &:empty { display: none; } @@ -314,7 +317,6 @@ &.valid { svg { border: 1px solid $brand-success; - fill: $brand-success; } } @@ -322,7 +324,6 @@ &.invalid { svg { border: 1px solid $common-gray-light; - fill: $common-gray-light; } } diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb index 69220a1c0f6..cdc8c1664f1 100644 --- a/app/helpers/commits_helper.rb +++ b/app/helpers/commits_helper.rb @@ -114,7 +114,7 @@ module CommitsHelper end def commit_signature_badge_classes(additional_classes) - %w(btn status-box gpg-status-box) + Array(additional_classes) + %w(btn gpg-status-box) + Array(additional_classes) end protected diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml index 7e8a5a38086..1214aabe837 100644 --- a/app/views/projects/commits/_commit.html.haml +++ b/app/views/projects/commits/_commit.html.haml @@ -37,14 +37,14 @@ .commit-actions.hidden-xs - - if commit.status(ref) - = render_commit_status(commit, ref: ref) - - if request.xhr? = render partial: 'projects/commit/signature', object: commit.signature - else = render partial: 'projects/commit/ajax_signature', locals: { commit: commit } + - if commit.status(ref) + = render_commit_status(commit, ref: ref) + = link_to commit.short_id, project_commit_path(project, commit), class: "commit-sha btn btn-transparent" = clipboard_button(text: commit.id, title: _("Copy commit SHA to clipboard")) = link_to_browse_code(project, commit) |