# HG changeset patch
# User domruf <dominikruf@gmail.com>
# Date 1508959959 -7200
# Node ID bee750d4fffffd00201617d48e01500c13bcbff1
# Parent  9b4ebc0b274244d8f4824167fc73e42f37cf7c37
less: unify .merge and .mergetag

diff -r 9b4ebc0b2742 -r bee750d4ffff kallithea/public/css/style.css
--- a/kallithea/public/css/style.css	Tue Oct 24 21:09:34 2017 +0200
+++ b/kallithea/public/css/style.css	Wed Oct 25 21:32:39 2017 +0200
@@ -484,8 +484,7 @@
   background-color: #bfbfbf;
   color: #ffffff;
 }
-.right .mergetag,
-.right .merge {
+.right .mergetag {
   padding: 1px 3px 1px 3px;
   background-color: #fca062;
   font-size: 10px;
diff -r 9b4ebc0b2742 -r bee750d4ffff kallithea/public/less/kallithea-tags.less
--- a/kallithea/public/less/kallithea-tags.less	Tue Oct 24 21:09:34 2017 +0200
+++ b/kallithea/public/less/kallithea-tags.less	Wed Oct 25 21:32:39 2017 +0200
@@ -65,8 +65,7 @@
       color: #ffffff;
   }
 }
-.right .mergetag,
-.right .merge {
+.right .mergetag {
   padding: 1px 3px 1px 3px;
   background-color: #fca062;
   font-size: 10px;
diff -r 9b4ebc0b2742 -r bee750d4ffff kallithea/templates/changeset/changeset_range.html
--- a/kallithea/templates/changeset/changeset_range.html	Tue Oct 24 21:09:34 2017 +0200
+++ b/kallithea/templates/changeset/changeset_range.html	Wed Oct 25 21:32:39 2017 +0200
@@ -77,7 +77,7 @@
             <div class="right">
               <span class="logtags">
                 %if len(cs.parents)>1:
-                <span class="merge">${_('Merge')}</span>
+                <span class="mergetag">${_('Merge')}</span>
                 %endif
                 %if h.is_hg(c.db_repo_scm_instance):
                   %for book in cs.bookmarks: