kallithea Changeset - bee750d4ffff

Changeset - bee750d4ffff

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

domruf - 8 years ago 2017-10-25 21:32:39
dominikruf@gmail.com

less: unify .merge and .mergetag

3 files changed with 3 insertions and 5 deletions:

kallithea/public/css/style.css

kallithea/public/less/kallithea-tags.less

kallithea/templates/changeset/changeset_range.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -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;

kallithea/public/less/kallithea-tags.less

➞

Show inline comments

@@ @@ -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;

kallithea/templates/changeset/changeset_range.html

➞

Show inline comments

@@ @@ -77,7 +77,7 @@ ${self.repo_context_bar('changelog')} @@
             <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:

0 comments (0 inline, 0 general)