# HG changeset patch # User Tooru Fujisawa # Date 1475922774 -32400 # Node ID 8f34e217338be6a1b997807521e95f9f7409d722 # Parent aa23c93e636d1045b932588cdb742cce6fd62313 hgweb: avoid line wrap between revision and annotate-info (issue5398) Add white-space: nowrap to td.annotate to avoid wrapping div.annotate-info into next line if there is revision number in the same cell, as it is hard to mouse over div.annotate-info if it's wrapped into next line. diff -r aa23c93e636d -r 8f34e217338b mercurial/templates/static/style-gitweb.css --- a/mercurial/templates/static/style-gitweb.css Sat Oct 08 16:10:58 2016 +0200 +++ b/mercurial/templates/static/style-gitweb.css Sat Oct 08 19:32:54 2016 +0900 @@ -55,6 +55,9 @@ div.search { margin:4px 8px; position:absolute; top:56px; right:12px } tr.thisrev a { color:#999999; text-decoration: none; } tr.thisrev pre { color:#009900; } +td.annotate { + white-space: nowrap; +} div.annotate-info { display: none; position: absolute; diff -r aa23c93e636d -r 8f34e217338b mercurial/templates/static/style-monoblue.css --- a/mercurial/templates/static/style-monoblue.css Sat Oct 08 16:10:58 2016 +0200 +++ b/mercurial/templates/static/style-monoblue.css Sat Oct 08 19:32:54 2016 +0900 @@ -335,6 +335,9 @@ } tr.thisrev a { color:#999999; text-decoration: none; } tr.thisrev td.source { color:#009900; } +td.annotate { + white-space: nowrap; +} div.annotate-info { display: none; position: absolute; diff -r aa23c93e636d -r 8f34e217338b mercurial/templates/static/style-paper.css --- a/mercurial/templates/static/style-paper.css Sat Oct 08 16:10:58 2016 +0200 +++ b/mercurial/templates/static/style-paper.css Sat Oct 08 19:32:54 2016 +0900 @@ -210,6 +210,9 @@ .bigtable td.source { font-size: inherit; } tr.thisrev a { color:#999999; text-decoration: none; } tr.thisrev td.source { color:#009900; } +td.annotate { + white-space: nowrap; +} div.annotate-info { display: none; position: absolute; diff -r aa23c93e636d -r 8f34e217338b mercurial/templates/static/style.css --- a/mercurial/templates/static/style.css Sat Oct 08 16:10:58 2016 +0200 +++ b/mercurial/templates/static/style.css Sat Oct 08 19:32:54 2016 +0900 @@ -12,6 +12,9 @@ .annotate { font-size: smaller; text-align: right; padding-right: 1em; } tr.thisrev a { color:#999999; text-decoration: none; } tr.thisrev pre { color:#009900; } +td.annotate { + white-space: nowrap; +} div.annotate-info { display: none; position: absolute; diff -r aa23c93e636d -r 8f34e217338b tests/test-hgweb-commands.t --- a/tests/test-hgweb-commands.t Sat Oct 08 16:10:58 2016 +0200 +++ b/tests/test-hgweb-commands.t Sat Oct 08 19:32:54 2016 +0900 @@ -1965,6 +1965,9 @@ .annotate { font-size: smaller; text-align: right; padding-right: 1em; } tr.thisrev a { color:#999999; text-decoration: none; } tr.thisrev pre { color:#009900; } + td.annotate { + white-space: nowrap; + } div.annotate-info { display: none; position: absolute; diff -r aa23c93e636d -r 8f34e217338b tests/test-hgweb.t --- a/tests/test-hgweb.t Sat Oct 08 16:10:58 2016 +0200 +++ b/tests/test-hgweb.t Sat Oct 08 19:32:54 2016 +0900 @@ -340,7 +340,7 @@ $ get-with-headers.py --twice localhost:$HGPORT 'static/style-gitweb.css' - date etag server 200 Script output follows - content-length: 6947 + content-length: 6986 content-type: text/css body { font-family: sans-serif; font-size: 12px; border:solid #d9d8d1; border-width:1px; margin:10px; background: white; color: black; } @@ -400,6 +400,9 @@ div.search { margin:4px 8px; position:absolute; top:56px; right:12px } tr.thisrev a { color:#999999; text-decoration: none; } tr.thisrev pre { color:#009900; } + td.annotate { + white-space: nowrap; + } div.annotate-info { display: none; position: absolute;