Mercurial > kallithea
changeset 1856:0855c64c571f beta
css: merge/branch/tag blurbs
| author | Aras Pranckevicius <aras@unity3d.com> |
|---|---|
| date | Fri, 06 Jan 2012 21:55:18 +0200 |
| parents | 5ab237f172a3 |
| children | c577e8211d69 |
| files | rhodecode/public/css/style.css rhodecode/templates/changelog/changelog.html rhodecode/templates/changeset/changeset.html |
| diffstat | 3 files changed, 22 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/public/css/style.css Fri Jan 06 21:31:26 2012 +0200 +++ b/rhodecode/public/css/style.css Fri Jan 06 21:55:18 2012 +0200 @@ -2342,9 +2342,17 @@ } .right .merge { - vertical-align: top; - font-size: 0.75em; - font-weight: 700; + padding: 1px 3px 1px 3px; + background-color: #fca062; + font-size: 10px; + font-weight: bold; + color: #ffffff; + text-transform: uppercase; + white-space: nowrap; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + margin-right: 2px; } .right .parent { @@ -2354,9 +2362,9 @@ padding: 2px 2px 2px 2px; } .right .logtags .branchtag,.logtags .branchtag { - padding: 1px 3px 2px; + padding: 1px 3px 1px 3px; background-color: #bfbfbf; - font-size: 9.75px; + font-size: 10px; font-weight: bold; color: #ffffff; text-transform: uppercase; @@ -2364,7 +2372,6 @@ -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; - padding-left:4px; } .right .logtags .branchtag a:hover,.logtags .branchtag a{ color: #ffffff; @@ -2374,9 +2381,9 @@ color: #ffffff; } .right .logtags .tagtag,.logtags .tagtag { - padding: 1px 3px 2px; + padding: 1px 3px 1px 3px; background-color: #62cffc; - font-size: 9.75px; + font-size: 10px; font-weight: bold; color: #ffffff; text-transform: uppercase;
--- a/rhodecode/templates/changelog/changelog.html Fri Jan 06 21:31:26 2012 +0200 +++ b/rhodecode/templates/changelog/changelog.html Fri Jan 06 21:55:18 2012 +0200 @@ -65,10 +65,7 @@ <div id="${cs.raw_id}_changes_info" class="changes"> <span id="${cs.raw_id}" class="changed_total tooltip" title="${_('Affected number of files, click to show more details')}">${len(cs.affected_files)}</span> </div> - %if len(cs.parents)>1: - <div class="merge">${_('merge')}</div> - %endif - %if cs.parents: + %if cs.parents: %for p_cs in reversed(cs.parents): <div class="parent">${_('Parent')} <span class="changeset_id">${p_cs.revision}:<span class="changeset_hash">${h.link_to(h.short_id(p_cs.raw_id), @@ -80,6 +77,9 @@ %endif <span class="logtags"> + %if len(cs.parents)>1: + <span class="merge">${_('merge')}</span> + %endif %if cs.branch: <span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}"> ${h.link_to(cs.branch,h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
--- a/rhodecode/templates/changeset/changeset.html Fri Jan 06 21:31:26 2012 +0200 +++ b/rhodecode/templates/changeset/changeset.html Fri Jan 06 21:55:18 2012 +0200 @@ -68,11 +68,6 @@ <span class="added" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span> % endif </div> - %if len(c.changeset.parents)>1: - <div class="merge"> - ${_('merge')}<img alt="merge" src="${h.url('/images/icons/arrow_join.png')}"/> - </div> - %endif %if c.changeset.parents: %for p_cs in reversed(c.changeset.parents): @@ -84,6 +79,9 @@ <div class="parent">${_('No parents')}</div> %endif <span class="logtags"> + %if len(c.changeset.parents)>1: + <span class="merge">${_('merge')}</span> + %endif <span class="branchtag" title="${'%s %s' % (_('branch'),c.changeset.branch)}"> ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span> %for tag in c.changeset.tags: