hgweb: use css margin instead of empty <p> before <div class="atom-logo">
authorAnton Shestakov <engored@ya.ru>
Thu, 05 Feb 2015 19:24:35 +0800
changeset 24041 9756f943634f
parent 24040 7f375d2de945
child 24042 bf661a03fddc
hgweb: use css margin instead of empty <p> before <div class="atom-logo"> The <p> elements were used to create an empty space between the last menu item (i.e. "help") and the atom feed icon, but they don't have any semantic meaning, so it is better to use css instead. The css rule uses top margin of 10px, which is equal to the top margin of the menu blocks ("help", "changeset, browse", etc). Previously, with <p> elements, the margin wasn't set explicitly and was browser-dependent. This change is a "better version" of 70cfa7e1611b, where <p> elements were simply properly closed.
mercurial/templates/paper/bookmarks.tmpl
mercurial/templates/paper/branches.tmpl
mercurial/templates/paper/filelog.tmpl
mercurial/templates/paper/graph.tmpl
mercurial/templates/paper/shortlog.tmpl
mercurial/templates/paper/tags.tmpl
mercurial/templates/static/style-paper.css
tests/test-hgweb-commands.t
tests/test-hgweb-empty.t
tests/test-hgweb-filelog.t
--- a/mercurial/templates/paper/bookmarks.tmpl	Mon Jan 26 14:30:12 2015 -0500
+++ b/mercurial/templates/paper/bookmarks.tmpl	Thu Feb 05 19:24:35 2015 +0800
@@ -23,7 +23,6 @@
 <ul>
 <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
 </ul>
-<p></p>
 <div class="atom-logo">
 <a href="{url|urlescape}atom-bookmarks" title="subscribe to atom feed">
 <img class="atom-logo" src="{staticurl|urlescape}feed-icon-14x14.png" alt="atom feed" />
--- a/mercurial/templates/paper/branches.tmpl	Mon Jan 26 14:30:12 2015 -0500
+++ b/mercurial/templates/paper/branches.tmpl	Thu Feb 05 19:24:35 2015 +0800
@@ -23,7 +23,6 @@
 <ul>
  <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
 </ul>
-<p></p>
 <div class="atom-logo">
 <a href="{url|urlescape}atom-branches" title="subscribe to atom feed">
 <img class="atom-logo" src="{staticurl|urlescape}feed-icon-14x14.png" alt="atom feed" />
--- a/mercurial/templates/paper/filelog.tmpl	Mon Jan 26 14:30:12 2015 -0500
+++ b/mercurial/templates/paper/filelog.tmpl	Thu Feb 05 19:24:35 2015 +0800
@@ -35,7 +35,6 @@
 <ul>
 <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
 </ul>
-<p></p>
 <div class="atom-logo">
 <a href="{url|urlescape}atom-log/{node|short}/{file|urlescape}" title="subscribe to atom feed">
 <img class="atom-logo" src="{staticurl|urlescape}feed-icon-14x14.png" alt="atom feed" />
--- a/mercurial/templates/paper/graph.tmpl	Mon Jan 26 14:30:12 2015 -0500
+++ b/mercurial/templates/paper/graph.tmpl	Thu Feb 05 19:24:35 2015 +0800
@@ -28,7 +28,6 @@
 <ul>
  <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
 </ul>
-<p></p>
 <div class="atom-logo">
 <a href="{url|urlescape}atom-log" title="subscribe to atom feed">
 <img class="atom-logo" src="{staticurl|urlescape}feed-icon-14x14.png" alt="atom feed" />
--- a/mercurial/templates/paper/shortlog.tmpl	Mon Jan 26 14:30:12 2015 -0500
+++ b/mercurial/templates/paper/shortlog.tmpl	Thu Feb 05 19:24:35 2015 +0800
@@ -30,7 +30,6 @@
 <ul>
  <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
 </ul>
-<p></p>
 <div class="atom-logo">
 <a href="{url|urlescape}atom-log" title="subscribe to atom feed">
 <img class="atom-logo" src="{staticurl|urlescape}feed-icon-14x14.png" alt="atom feed" />
--- a/mercurial/templates/paper/tags.tmpl	Mon Jan 26 14:30:12 2015 -0500
+++ b/mercurial/templates/paper/tags.tmpl	Thu Feb 05 19:24:35 2015 +0800
@@ -23,7 +23,6 @@
 <ul>
 <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
 </ul>
-<p></p>
 <div class="atom-logo">
 <a href="{url|urlescape}atom-tags" title="subscribe to atom feed">
 <img class="atom-logo" src="{staticurl|urlescape}feed-icon-14x14.png" alt="atom feed" />
--- a/mercurial/templates/static/style-paper.css	Mon Jan 26 14:30:12 2015 -0500
+++ b/mercurial/templates/static/style-paper.css	Thu Feb 05 19:24:35 2015 +0800
@@ -60,6 +60,10 @@
   border: 0;
 }
 
+div.atom-logo {
+  margin-top: 10px;
+}
+
 .atom-logo img{
   width: 14px;
   height: 14px;
--- a/tests/test-hgweb-commands.t	Mon Jan 26 14:30:12 2015 -0500
+++ b/tests/test-hgweb-commands.t	Thu Feb 05 19:24:35 2015 +0800
@@ -726,7 +726,6 @@
   <ul>
    <li><a href="/help">help</a></li>
   </ul>
-  <p></p>
   <div class="atom-logo">
   <a href="/atom-log" title="subscribe to atom feed">
   <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="atom feed" />
--- a/tests/test-hgweb-empty.t	Mon Jan 26 14:30:12 2015 -0500
+++ b/tests/test-hgweb-empty.t	Thu Feb 05 19:24:35 2015 +0800
@@ -48,7 +48,6 @@
   <ul>
    <li><a href="/help">help</a></li>
   </ul>
-  <p></p>
   <div class="atom-logo">
   <a href="/atom-log" title="subscribe to atom feed">
   <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="atom feed" />
@@ -158,7 +157,6 @@
   <ul>
    <li><a href="/help">help</a></li>
   </ul>
-  <p></p>
   <div class="atom-logo">
   <a href="/atom-log" title="subscribe to atom feed">
   <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="atom feed" />
@@ -264,7 +262,6 @@
   <ul>
    <li><a href="/help">help</a></li>
   </ul>
-  <p></p>
   <div class="atom-logo">
   <a href="/atom-log" title="subscribe to atom feed">
   <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="atom feed" />
--- a/tests/test-hgweb-filelog.t	Mon Jan 26 14:30:12 2015 -0500
+++ b/tests/test-hgweb-filelog.t	Thu Feb 05 19:24:35 2015 +0800
@@ -156,7 +156,6 @@
   <ul>
   <li><a href="/help">help</a></li>
   </ul>
-  <p></p>
   <div class="atom-logo">
   <a href="/atom-log/01de2d66a28d/a" title="subscribe to atom feed">
   <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="atom feed" />
@@ -266,7 +265,6 @@
   <ul>
   <li><a href="/help">help</a></li>
   </ul>
-  <p></p>
   <div class="atom-logo">
   <a href="/atom-log/01de2d66a28d/a" title="subscribe to atom feed">
   <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="atom feed" />
@@ -376,7 +374,6 @@
   <ul>
   <li><a href="/help">help</a></li>
   </ul>
-  <p></p>
   <div class="atom-logo">
   <a href="/atom-log/5ed941583260/a" title="subscribe to atom feed">
   <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="atom feed" />
@@ -481,7 +478,6 @@
   <ul>
   <li><a href="/help">help</a></li>
   </ul>
-  <p></p>
   <div class="atom-logo">
   <a href="/atom-log/5ed941583260/a" title="subscribe to atom feed">
   <img class="atom-logo" src="/static/feed-icon-14x14.png" alt="atom feed" />