diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-09-02 20:30:22 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-09-02 20:30:22 +0000 |
| commit | 87f93ceb9542c415d6c23c72ff93d63272107d54 (patch) | |
| tree | 71e99807fa947eff48fc4dff8de27071ec33e316 | |
| parent | bb3c9663c90734755d7a4103b9def05d5cd584cb (diff) | |
| parent | 8086526cf013c4630402db2be47de9020223018c (diff) | |
| download | gitlab-ce-87f93ceb9542c415d6c23c72ff93d63272107d54.tar.gz | |
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
### After
See merge request !5887
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/buttons.scss | 4 | ||||
| -rw-r--r-- | app/views/projects/buttons/_fork.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/forks/index.html.haml | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG index 4f853f34dd9..8f139d0ad12 100644 --- a/CHANGELOG +++ b/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 diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss index cd3ddf5fee9..4618687a4be 100644 --- a/app/assets/stylesheets/framework/buttons.scss +++ b/app/assets/stylesheets/framework/buttons.scss @@ -206,7 +206,9 @@ } svg, .fa { - margin-right: 3px; + &:not(:last-child) { + margin-right: 3px; + } } } diff --git a/app/views/projects/buttons/_fork.html.haml b/app/views/projects/buttons/_fork.html.haml index d78888e9fe4..22db33498f1 100644 --- a/app/views/projects/buttons/_fork.html.haml +++ b/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 diff --git a/app/views/projects/forks/index.html.haml b/app/views/projects/forks/index.html.haml index a1d79bdabda..bacc5708e4b 100644 --- a/app/views/projects/forks/index.html.haml +++ b/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 |