Mercurial > kallithea

changeset 6971:bee750d4ffff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less: unify .merge and .mergetag
author domruf <dominikruf@gmail.com>
date Wed, 25 Oct 2017 21:32:39 +0200
parents 9b4ebc0b2742
children 4d339efccf64
files kallithea/public/css/style.css kallithea/public/less/kallithea-tags.less kallithea/templates/changeset/changeset_range.html
diffstat 3 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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;
--- 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: