diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2019-03-05 23:49:46 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2019-03-05 23:49:46 +0000 |
| commit | eaa392d9ee9179b55675018c3e9eefbbc7312b54 (patch) | |
| tree | 9c136d194f989ed06d2607a6ede06ca624a3c598 | |
| parent | 8b30406af6223d2efd7f98b91f95182e694f9176 (diff) | |
| parent | 88338e52f775aed0459a0586ba52eff58b4bdb53 (diff) | |
| download | gitlab-ce-eaa392d9ee9179b55675018c3e9eefbbc7312b54.tar.gz | |
Merge branch '52792-align-mirror-repository-button' into 'master'
Fix: Repository mirrors table border and padding
Closes #52792
See merge request gitlab-org/gitlab-ce!25606
| -rw-r--r-- | app/assets/stylesheets/pages/settings.scss | 4 | ||||
| -rw-r--r-- | app/views/projects/mirrors/_mirror_repos.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/52792-align-mirror-repository-button.yml | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss index 811cc310a8f..4f9d96da4bd 100644 --- a/app/assets/stylesheets/pages/settings.scss +++ b/app/assets/stylesheets/pages/settings.scss @@ -316,8 +316,4 @@ .push-pull-table { margin-top: 1em; - - .mirror-action-buttons { - padding-right: 0; - } } diff --git a/app/views/projects/mirrors/_mirror_repos.html.haml b/app/views/projects/mirrors/_mirror_repos.html.haml index 21b105e6f80..c031815200b 100644 --- a/app/views/projects/mirrors/_mirror_repos.html.haml +++ b/app/views/projects/mirrors/_mirror_repos.html.haml @@ -57,7 +57,7 @@ %td - if mirror.last_error.present? .badge.mirror-error-badge{ data: { toggle: 'tooltip', html: 'true' }, title: html_escape(mirror.last_error.try(:strip)) }= _('Error') - %td.mirror-action-buttons + %td .btn-group.mirror-actions-group.pull-right{ role: 'group' } - if mirror.ssh_key_auth? = clipboard_button(text: mirror.ssh_public_key, class: 'btn btn-default', title: _('Copy SSH public key')) diff --git a/changelogs/unreleased/52792-align-mirror-repository-button.yml b/changelogs/unreleased/52792-align-mirror-repository-button.yml new file mode 100644 index 00000000000..e8ce9ee0a4e --- /dev/null +++ b/changelogs/unreleased/52792-align-mirror-repository-button.yml @@ -0,0 +1,5 @@ +--- +title: Add right padding to the repository mirror action buttons +merge_request: 25606 +author: +type: fixed |