diff options
| author | Clement Ho <clementh@hp.com> | 2016-08-01 15:09:03 -0500 |
|---|---|---|
| committer | Clement Ho <clementh@hp.com> | 2016-08-01 15:09:03 -0500 |
| commit | fe23512c9d0cc8348cb4221fc110b53748a6996b (patch) | |
| tree | 2569c51b5bb5ca2cf387c343f006bf9f24c69c03 | |
| parent | ab3dd9a106787b70c26e55e9f0dc7fe6c34b0769 (diff) | |
| download | gitlab-ce-fe23512c9d0cc8348cb4221fc110b53748a6996b.tar.gz | |
Convert switch icon into icon font
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/images/switch_icon.png | bin | 231 -> 0 bytes | |||
| -rw-r--r-- | app/assets/stylesheets/pages/commits.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/compare/_form.html.haml | 2 |
4 files changed, 2 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 39b77460deb..e7eec5f3948 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.11.0 (unreleased) - Fix the title of the toggle dropdown button. !5515 (herminiotorres) - Improve diff performance by eliminating redundant checks for text blobs + - Convert switch icon into icon font (ClemMakesApps) - Remove magic comments (`# encoding: UTF-8`) from Ruby files. !5456 (winniehell) - Fix CI status icon link underline (ClemMakesApps) - Cache the commit author in RequestStore to avoid extra lookups in PostReceive diff --git a/app/assets/images/switch_icon.png b/app/assets/images/switch_icon.png Binary files differdeleted file mode 100644 index c6b6c8d9521..00000000000 --- a/app/assets/images/switch_icon.png +++ /dev/null diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index 0298577c494..2beef15bbf9 100644 --- a/app/assets/stylesheets/pages/commits.scss +++ b/app/assets/stylesheets/pages/commits.scss @@ -1,8 +1,6 @@ .commits-compare-switch { @include btn-default; @include btn-white; - background: image-url("switch_icon.png") no-repeat center center; - text-indent: -9999px; float: left; margin-right: 9px; } diff --git a/app/views/projects/compare/_form.html.haml b/app/views/projects/compare/_form.html.haml index af09b3418ea..d79336f5a60 100644 --- a/app/views/projects/compare/_form.html.haml +++ b/app/views/projects/compare/_form.html.haml @@ -1,7 +1,7 @@ = form_tag namespace_project_compare_index_path(@project.namespace, @project), method: :post, class: 'form-inline js-requires-input' do .clearfix - if params[:to] && params[:from] - = link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has-tooltip', title: 'Switch base of comparison'} + = link_to icon('exchange'), {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has-tooltip', title: 'Switch base of comparison'} .form-group.dropdown.compare-form-group.js-compare-from-dropdown .input-group.inline-input-group %span.input-group-addon from |
