# HG changeset patch # User Anton Shestakov # Date 1514943661 -28800 # Node ID ab9d8d298510c737a3977f2b53321a0189157371 # Parent a0fab647a8f1cc94202433160bdaeea29210aa3c hgweb: make .info a block element by default Using a
instead of a 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). diff -r a0fab647a8f1 -r ab9d8d298510 mercurial/templates/gitweb/graphentry.tmpl --- 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 @@ {desc|strip|firstline|escape|nonempty} {alltags} - {date|age}, by {author|person} +
{date|age}, by {author|person}
diff -r a0fab647a8f1 -r ab9d8d298510 mercurial/templates/monoblue/graphentry.tmpl --- 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 @@ {desc|strip|firstline|escape|nonempty} {alltags} - {date|rfc822date}, by {author|person} +
{date|rfc822date}, by {author|person}
diff -r a0fab647a8f1 -r ab9d8d298510 mercurial/templates/paper/graphentry.tmpl --- 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 @@ {desc|strip|firstline|escape|nonempty} {alltags} - {date|rfc822date}, by {author|person} +
{date|rfc822date}, by {author|person}
diff -r a0fab647a8f1 -r ab9d8d298510 mercurial/templates/spartan/graphentry.tmpl --- 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 @@ {desc|strip|firstline|escape|nonempty} - {date|rfc822date}, by {author|person} +
{date|rfc822date}, by {author|person}
diff -r a0fab647a8f1 -r ab9d8d298510 mercurial/templates/static/style-gitweb.css --- 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; } diff -r a0fab647a8f1 -r ab9d8d298510 mercurial/templates/static/style-monoblue.css --- 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 **/ diff -r a0fab647a8f1 -r ab9d8d298510 mercurial/templates/static/style-paper.css --- 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%; } diff -r a0fab647a8f1 -r ab9d8d298510 mercurial/templates/static/style.css --- 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%; } diff -r a0fab647a8f1 -r ab9d8d298510 tests/test-hgweb-commands.t --- 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 @@ branch commit with null character: draft unstable tip something - 1970-01-01, by test +
1970-01-01, by test
  • branch draft stable - 1970-01-01, by test +
    1970-01-01, by test
  • Added tag 1.0 for changeset 2ef0ac749a14 draft default - 1970-01-01, by test +
    1970-01-01, by test
  • base draft 1.0 anotherthing - 1970-01-01, by test +
    1970-01-01, by test
  • @@ -2079,7 +2079,6 @@ } ul#graphnodes li .info { - display: block; font-size: 70%; } diff -r a0fab647a8f1 -r ab9d8d298510 tests/test-hgweb.t --- 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; }