Mercurial > kallithea
changeset 6412:482b6ac31603
style: template markup changes for changeset.html, preparing for Bootstrap
Based on work by Dominik Ruf.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Sat, 24 Dec 2016 17:26:48 +0100 |
| parents | 302ce4a23e57 |
| children | bcbc1d6bcc51 |
| files | kallithea/public/css/style.css kallithea/templates/changeset/changeset.html |
| diffstat | 2 files changed, 21 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/public/css/style.css Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/public/css/style.css Sat Dec 24 17:26:48 2016 +0100 @@ -1766,7 +1766,6 @@ } #changeset_content .container { - min-height: 100px; font-size: 1.2em; overflow: hidden; } @@ -2213,6 +2212,7 @@ background: #FAA; } +.right .mergetag, .right .merge { padding: 1px 3px 1px 3px; background-color: #fca062; @@ -2287,6 +2287,7 @@ .right .logtags .branchtag, .right .logtags .tagtag, .right .logtags .booktag, +.right .mergetag, .right .merge { float: right; line-height: 1em; @@ -4447,3 +4448,7 @@ .grid_edit a { text-decoration: none; } + +.changes_txt { + clear: both; +}
--- a/kallithea/templates/changeset/changeset.html Sat Dec 24 17:26:48 2016 +0100 +++ b/kallithea/templates/changeset/changeset.html Sat Dec 24 17:26:48 2016 +0100 @@ -68,24 +68,12 @@ </div> </div> <div id="changeset_content"> - <div class="container"> + <div class="form-group container"> <div class="right"> - <div class="changes"> - % if (len(c.changeset.affected_files) <= c.affected_files_cut_off) or c.fulldiff: - <span class="removed" title="${_('Removed')}">${len(c.changeset.removed)}</span> - <span class="changed" title="${_('Changed')}">${len(c.changeset.changed)}</span> - <span class="added" title="${_('Added')}">${len(c.changeset.added)}</span> - % else: - <span class="removed" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span> - <span class="changed" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span> - <span class="added" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span> - % endif - </div> - <span class="logtags"> %if len(c.changeset.parents)>1: - <span class="merge">${_('Merge')}</span> + <span class="mergetag">${_('Merge')}</span> %endif %if h.is_hg(c.db_repo_scm_instance): @@ -107,6 +95,18 @@ </span> %endif </span> + + <div class="changes"> + % if (len(c.changeset.affected_files) <= c.affected_files_cut_off) or c.fulldiff: + <span class="removed" title="${_('Removed')}">${len(c.changeset.removed)}</span> + <span class="changed" title="${_('Changed')}">${len(c.changeset.changed)}</span> + <span class="added" title="${_('Added')}">${len(c.changeset.added)}</span> + % else: + <span class="removed" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span> + <span class="changed" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span> + <span class="added" title="${_('Affected %s files') % len(c.changeset.affected_files)}">!</span> + % endif + </div> </div> <div class="left"> <div class="author"> @@ -154,10 +154,9 @@ % endfor </div> % endif - - <div class="message">${h.urlify_text(c.changeset.message, c.repo_name)}</div> </div> </div> + <div class="message form-group">${h.urlify_text(c.changeset.message, c.repo_name)}</div> <div class="changes_txt"> <% a_rev, cs_rev, file_diff_data = c.changes[c.changeset.raw_id] %> % if c.limited_diff: