From fe23512c9d0cc8348cb4221fc110b53748a6996b Mon Sep 17 00:00:00 2001
From: Clement Ho <clementh@hp.com>
Date: Mon, 1 Aug 2016 15:09:03 -0500
Subject: [PATCH] Convert switch icon into icon font
---
CHANGELOG | 1 +
app/assets/images/switch_icon.png | Bin 231 -> 0 bytes
app/assets/stylesheets/pages/commits.scss | 2 --
app/views/projects/compare/_form.html.haml | 2 +-
4 files changed, 2 insertions(+), 3 deletions(-)
delete mode 100644 app/assets/images/switch_icon.png
diff --git a/CHANGELOG b/CHANGELOG
index 39b77460deb7c..e7eec5f3948b8 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
deleted file mode 100644
index c6b6c8d9521f64b00990ca5352c8ce269e9a3e4a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 231
zcmeAS@N?(olHy`uVBq!ia0y~yU=UznU=ZS9VPIhRVKnU_0|Uc4PZ!6K3dUp!g@o5B
zrx}_ZS~zpfEN@sEI4CgpB;L;4EXKChe#igv6I%o~C2mM$P}11*?$do)zS@7kV~fhl
z(+biUlsLACe--;K+<eHpPW!LKUkL|+4ugfY8*G_*j1*>UQ@kO=v-FQd?zX7=rBgOc
zZ*s5}v}WUA5#Dz1+V(XKexLv4Gq-LF5A@j}Smg8h*Yoek^5ta0ei$yWyma$aKBpPG
lvY~8@jD&$ASGyS(!=~~?og*F!S_}*f44$rjF6*2UngH{lRImU5
diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss
index 0298577c494cf..2beef15bbf968 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 af09b3418ea88..d79336f5a6035 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
--
GitLab