Merge branch 'icon-button-alignment' into 'master'

Fix alignment of icon buttons

## What does this MR do?

Fix misalignment of buttons with only an icon which was introduced by !5451.

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5451#note_14066627

## Screenshots

### Before

![with-text](/uploads/aa7f7a98e2015070689e762e0cf99844/witht-text.png)

![without-text](/uploads/72db7c54e3961fd0df34b0ea79455fd0/without-text.png)

### After

![with-text](/uploads/3f19e55773083bcb22f3909f6dc0d147/witht-text.png)

![without-text](/uploads/b6647d4d71eb5cd9d1712908d2b93665/without-text.png)


See merge request !5887

CHANGELOG

@@ -180,6 +180,7 @@ v 8.11.0
   - Get issue and merge request description templates from repositories
   - Add hover state to todos !5361 (winniehell)
   - Fix icon alignment of star and fork buttons !5451 (winniehell)
+  - Fix alignment of icon buttons !5887 (winniehell)
   - Enforce 2FA restrictions on API authentication endpoints !5820
   - Limit git rev-list output count to one in forced push check
   - Show deployment status on merge requests with external URLs

app/assets/stylesheets/framework/buttons.scss

@@ -206,7 +206,9 @@
   }
 
   svg, .fa {
-    margin-right: 3px;
+    &:not(:last-child) {
+      margin-right: 3px;
+    }
   }
 }
 

app/views/projects/buttons/_fork.html.haml

@@ -3,11 +3,11 @@
     - if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2
       = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to your fork', class: 'btn has-tooltip' do
         = custom_icon('icon_fork')
-        Fork
+        %span Fork
     - else
       = link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project", class: 'btn has-tooltip' do
         = custom_icon('icon_fork')
-        Fork
+        %span Fork
     %div.count-with-arrow
       %span.arrow
       = link_to namespace_project_forks_path(@project.namespace, @project), class: "count" do

app/views/projects/forks/index.html.haml

@@ -32,11 +32,11 @@
       - if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2
         = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to your fork', class: 'btn btn-new' do
           = custom_icon('icon_fork')
-          Fork
+          %span Fork
       - else
         = link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project", class: 'btn btn-new' do
           = custom_icon('icon_fork')
-          Fork
+          %span Fork
 
 
 = render 'projects', projects: @forks