From 048e2deb5072187e9d0b9429cb4cb2c28ac1f6d2 Mon Sep 17 00:00:00 2001
From: lisaq <lisa@rhodecode.com>
Date: Tue, 4 Oct 2016 16:33:01 +0200
Subject: [PATCH] ux: icon for merge tags

---
 rhodecode/templates/changelog/changelog_file_history.html | 2 +-
 rhodecode/templates/changeset/changeset.html              | 2 +-
 rhodecode/templates/files/base.html                       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rhodecode/templates/changelog/changelog_file_history.html b/rhodecode/templates/changelog/changelog_file_history.html
index 86e30193..7a2a9059 100644
--- a/rhodecode/templates/changelog/changelog_file_history.html
+++ b/rhodecode/templates/changelog/changelog_file_history.html
@@ -17,7 +17,7 @@
 
                     %if cs.merge:
                         <span class="mergetag">
-                         ${_('merge')}
+                         <i class="icon-merge"></i>${_('merge')}
                         </span>
                     %endif
                     <div class="message_history" title="${cs.message}">
diff --git a/rhodecode/templates/changeset/changeset.html b/rhodecode/templates/changeset/changeset.html
index 35a68d04..827eaded 100644
--- a/rhodecode/templates/changeset/changeset.html
+++ b/rhodecode/templates/changeset/changeset.html
@@ -83,7 +83,7 @@
   
             %if c.commit.merge:
               <span class="mergetag tag">
-               ${_('merge')}
+               <i class="icon-merge"></i>${_('merge')}
               </span>
             %endif
   
diff --git a/rhodecode/templates/files/base.html b/rhodecode/templates/files/base.html
index fa64008d..acfeb6c9 100644
--- a/rhodecode/templates/files/base.html
+++ b/rhodecode/templates/files/base.html
@@ -1,7 +1,7 @@
 <%def name="refs(commit)">
     %if commit.merge:
         <span class="mergetag tag">
-         ${_('merge')}
+         <i class="icon-merge">${_('merge')}</i>
         </span>
     %endif