diff --git a/kallithea/public/css/style.css b/kallithea/public/css/style.css --- a/kallithea/public/css/style.css +++ b/kallithea/public/css/style.css @@ -484,8 +484,7 @@ a.metatag[data-tag="license"]:hover { background-color: #bfbfbf; color: #ffffff; } -.right .mergetag, -.right .merge { +.right .mergetag { padding: 1px 3px 1px 3px; background-color: #fca062; font-size: 10px; diff --git a/kallithea/public/less/kallithea-tags.less b/kallithea/public/less/kallithea-tags.less --- a/kallithea/public/less/kallithea-tags.less +++ b/kallithea/public/less/kallithea-tags.less @@ -65,8 +65,7 @@ a.metatag[data-tag="license"]:hover { color: #ffffff; } } -.right .mergetag, -.right .merge { +.right .mergetag { padding: 1px 3px 1px 3px; background-color: #fca062; font-size: 10px; diff --git a/kallithea/templates/changeset/changeset_range.html b/kallithea/templates/changeset/changeset_range.html --- a/kallithea/templates/changeset/changeset_range.html +++ b/kallithea/templates/changeset/changeset_range.html @@ -77,7 +77,7 @@ ${self.repo_context_bar('changelog')}
%if len(cs.parents)>1: - ${_('Merge')} + ${_('Merge')} %endif %if h.is_hg(c.db_repo_scm_instance): %for book in cs.bookmarks: