Mercurial > hg
changeset 35522:ab9d8d298510
hgweb: make .info a block element by default
Using a <div> instead of a <span> with "display: block" makes more sense.
While at it, let's adjust top margin in monoblue so that text in .info doesn't
overlap changeset "tags" elements (they are quite large in monoblue).
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Wed, 03 Jan 2018 09:41:01 +0800 |
parents | a0fab647a8f1 |
children | 45ed821b5ce4 |
files | mercurial/templates/gitweb/graphentry.tmpl mercurial/templates/monoblue/graphentry.tmpl mercurial/templates/paper/graphentry.tmpl mercurial/templates/spartan/graphentry.tmpl mercurial/templates/static/style-gitweb.css mercurial/templates/static/style-monoblue.css mercurial/templates/static/style-paper.css mercurial/templates/static/style.css tests/test-hgweb-commands.t tests/test-hgweb.t |
diffstat | 10 files changed, 10 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/templates/gitweb/graphentry.tmpl Mon Dec 25 16:31:14 2017 -0700 +++ b/mercurial/templates/gitweb/graphentry.tmpl Wed Jan 03 09:41:01 2018 +0800 @@ -3,5 +3,5 @@ <a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}"><b>{desc|strip|firstline|escape|nonempty}</b></a> </span> {alltags} - <span class="info">{date|age}, by {author|person}</span> + <div class="info">{date|age}, by {author|person}</div> </li>
--- a/mercurial/templates/monoblue/graphentry.tmpl Mon Dec 25 16:31:14 2017 -0700 +++ b/mercurial/templates/monoblue/graphentry.tmpl Wed Jan 03 09:41:01 2018 +0800 @@ -3,5 +3,5 @@ <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a> </span> {alltags} - <span class="info"><span class="age">{date|rfc822date}</span>, by {author|person}</span> + <div class="info"><span class="age">{date|rfc822date}</span>, by {author|person}</div> </li>
--- a/mercurial/templates/paper/graphentry.tmpl Mon Dec 25 16:31:14 2017 -0700 +++ b/mercurial/templates/paper/graphentry.tmpl Wed Jan 03 09:41:01 2018 +0800 @@ -3,5 +3,5 @@ <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a> </span> {alltags} - <span class="info"><span class="age">{date|rfc822date}</span>, by {author|person}</span> + <div class="info"><span class="age">{date|rfc822date}</span>, by {author|person}</div> </li>
--- a/mercurial/templates/spartan/graphentry.tmpl Mon Dec 25 16:31:14 2017 -0700 +++ b/mercurial/templates/spartan/graphentry.tmpl Wed Jan 03 09:41:01 2018 +0800 @@ -2,5 +2,5 @@ <span class="desc"> <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a> </span> - <span class="info"><span class="age">{date|rfc822date}</span>, by {author|person}</span> + <div class="info"><span class="age">{date|rfc822date}</span>, by {author|person}</div> </li>
--- a/mercurial/templates/static/style-gitweb.css Mon Dec 25 16:31:14 2017 -0700 +++ b/mercurial/templates/static/style-gitweb.css Wed Jan 03 09:41:01 2018 +0800 @@ -322,7 +322,6 @@ } ul#graphnodes li .info { - display: block; font-size: 100%; font-style: italic; }
--- a/mercurial/templates/static/style-monoblue.css Mon Dec 25 16:31:14 2017 -0700 +++ b/mercurial/templates/static/style-monoblue.css Wed Jan 03 09:41:01 2018 +0800 @@ -502,7 +502,7 @@ } ul#graphnodes li .info { - display: block; + margin-top: 2px; } /** end of canvas **/
--- a/mercurial/templates/static/style-paper.css Mon Dec 25 16:31:14 2017 -0700 +++ b/mercurial/templates/static/style-paper.css Wed Jan 03 09:41:01 2018 +0800 @@ -479,7 +479,6 @@ } ul#graphnodes li .info { - display: block; font-size: 70%; }
--- a/mercurial/templates/static/style.css Mon Dec 25 16:31:14 2017 -0700 +++ b/mercurial/templates/static/style.css Wed Jan 03 09:41:01 2018 +0800 @@ -115,6 +115,5 @@ } ul#graphnodes li .info { - display: block; font-size: 70%; }
--- a/tests/test-hgweb-commands.t Mon Dec 25 16:31:14 2017 -0700 +++ b/tests/test-hgweb-commands.t Wed Jan 03 09:41:01 2018 +0800 @@ -1788,28 +1788,28 @@ <a class="list" href="/rev/cad8025a2e87?style=gitweb"><b>branch commit with null character: </b></a> </span> <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="branchtag" title="unstable">unstable</span> <span class="tagtag" title="tip">tip</span> <span class="bookmarktag" title="something">something</span> </span> - <span class="info">1970-01-01, by test</span> + <div class="info">1970-01-01, by test</div> </li> <li data-node="1d22e65f027e"> <span class="desc"> <a class="list" href="/rev/1d22e65f027e?style=gitweb"><b>branch</b></a> </span> <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="branchtag" title="stable">stable</span> </span> - <span class="info">1970-01-01, by test</span> + <div class="info">1970-01-01, by test</div> </li> <li data-node="a4f92ed23982"> <span class="desc"> <a class="list" href="/rev/a4f92ed23982?style=gitweb"><b>Added tag 1.0 for changeset 2ef0ac749a14</b></a> </span> <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="branchtag" title="default">default</span> </span> - <span class="info">1970-01-01, by test</span> + <div class="info">1970-01-01, by test</div> </li> <li data-node="2ef0ac749a14"> <span class="desc"> <a class="list" href="/rev/2ef0ac749a14?style=gitweb"><b>base</b></a> </span> <span class="logtags"><span class="phasetag" title="draft">draft</span> <span class="tagtag" title="1.0">1.0</span> <span class="bookmarktag" title="anotherthing">anotherthing</span> </span> - <span class="info">1970-01-01, by test</span> + <div class="info">1970-01-01, by test</div> </li> </ul> </div> @@ -2079,7 +2079,6 @@ } ul#graphnodes li .info { - display: block; font-size: 70%; }
--- a/tests/test-hgweb.t Mon Dec 25 16:31:14 2017 -0700 +++ b/tests/test-hgweb.t Wed Jan 03 09:41:01 2018 +0800 @@ -340,7 +340,7 @@ $ get-with-headers.py --twice localhost:$HGPORT 'static/style-gitweb.css' - date etag server 200 Script output follows - content-length: 9152 + content-length: 9135 content-type: text/css body { font-family: sans-serif; font-size: 12px; border:solid #d9d8d1; border-width:1px; margin:10px; background: white; color: black; } @@ -667,7 +667,6 @@ } ul#graphnodes li .info { - display: block; font-size: 100%; font-style: italic; }