summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-10 11:23:36 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-10 11:23:36 +0000
commitc99e9edce7fa71ad53cb35e3bac2afe4646d1ebd (patch)
tree974cb1c896a2a712c32db032690f8848271b563e
parent19fd34d9ef741ae6128ce1cf841a21c9b19f1fe8 (diff)
parent972b6370819f61eb04d1f0e795b4b6c4ddc2327a (diff)
downloadgitlab-ce-c99e9edce7fa71ad53cb35e3bac2afe4646d1ebd.tar.gz
Merge branch 'fix-remove-button-alignment' into 'master'
In SSH key detailed view, align the "Remove" button with the right container Also fixes a bootlint warning. Before: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/d6d8765ed9dceb6a31a6b4475b2166e1/image.png) After: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/8252211125ace212335aa6bf2ba78549/image.png) See merge request !1555
-rw-r--r--app/views/profiles/keys/_key_details.html.haml5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/profiles/keys/_key_details.html.haml b/app/views/profiles/keys/_key_details.html.haml
index e0ae4d9720f..0ca8bd95157 100644
--- a/app/views/profiles/keys/_key_details.html.haml
+++ b/app/views/profiles/keys/_key_details.html.haml
@@ -18,5 +18,6 @@
%code.key-fingerprint= @key.fingerprint
%pre.well-pre
= @key.key
- .pull-right
- = link_to 'Remove', path_to_key(@key, is_admin), data: {confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove delete-key"
+ .col-md-12
+ .pull-right
+ = link_to 'Remove', path_to_key(@key, is_admin), data: {confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove delete-key"