f402fd0f036b

Finish (mostly) the reskin
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Wed, 15 Jan 2020 20:15:24 -0500
parents b2b88bc58ef9
children 6e42b52f56ec
branches/tags (none)
files hgweb.conf templates/sjl/bookmarks.tmpl templates/sjl/branches.tmpl templates/sjl/changeset.tmpl templates/sjl/error.tmpl templates/sjl/filediff.tmpl templates/sjl/filelog.tmpl templates/sjl/filerevision.tmpl templates/sjl/graph.tmpl templates/sjl/index.tmpl templates/sjl/manifest.tmpl templates/sjl/map templates/sjl/navigation.tmpl templates/sjl/notfound.tmpl templates/sjl/readme.tmpl templates/sjl/search.tmpl templates/sjl/shortlog.tmpl templates/sjl/tags.tmpl templates/static/style-sjl.css

Changes

diff -r b2b88bc58ef9 -r f402fd0f036b hgweb.conf
--- a/hgweb.conf	Sat Jan 11 13:21:39 2020 -0800
+++ b/hgweb.conf	Wed Jan 15 20:15:24 2020 -0500
@@ -7,3 +7,5 @@
 cache = False
 
 [extensions]
+hgext.readme = /home/sjl/src/hgext.readme
+
diff -r b2b88bc58ef9 -r f402fd0f036b templates/sjl/bookmarks.tmpl
--- a/templates/sjl/bookmarks.tmpl	Sat Jan 11 13:21:39 2020 -0800
+++ b/templates/sjl/bookmarks.tmpl	Wed Jan 15 20:15:24 2020 -0500
@@ -14,7 +14,7 @@
 <img src="{staticurl|urlescape}{logoimg}" alt="mercurial" /></a>
 </div>
 <ul>
-<li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">log</a></li>
+<li><a href="{url|urlescape}log{sessionvars%urlparameter}">commits</a></li>
 <li><a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a></li>
 <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
 <li class="active">bookmarks</li>
diff -r b2b88bc58ef9 -r f402fd0f036b templates/sjl/branches.tmpl
--- a/templates/sjl/branches.tmpl	Sat Jan 11 13:21:39 2020 -0800
+++ b/templates/sjl/branches.tmpl	Wed Jan 15 20:15:24 2020 -0500
@@ -1,31 +1,15 @@
 {header}
 <title>branches / {repo|escape} / hg.stevelosh.com</title>
-<link rel="alternate" type="application/atom+xml"
-   href="{url|urlescape}atom-branches" title="Atom feed for {repo|escape}: branches" />
-<link rel="alternate" type="application/rss+xml"
-   href="{url|urlescape}rss-branches" title="RSS feed for {repo|escape}: branches" />
 </head>
 <body>
 
 
 <div class="main">
-<h2 class="breadcrumb"><a href="/">hg.stevelosh.com</a> {pathdef%breadcrumb}</h2>
 
-<div class="menu">
-    <ul>
-    <li><a href="{url|urlescape}">log</a></li>
-    <li><a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li>
-    <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
-    <li class="active"><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
-    <li><a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a></li>
-    <li><a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">browse</a></li>
-    {archives%archiveentry}
-    </ul>
-</div>
-
+{navigation}
 {searchform}
 
-<h3>Branches</h3>
+<h1>Branches</h1>
 
 <table class="smalltable">
 <thead>
diff -r b2b88bc58ef9 -r f402fd0f036b templates/sjl/changeset.tmpl
--- a/templates/sjl/changeset.tmpl	Sat Jan 11 13:21:39 2020 -0800
+++ b/templates/sjl/changeset.tmpl	Wed Jan 15 20:15:24 2020 -0500
@@ -1,40 +1,24 @@
 {header}
-<title>{repo|escape}: {node|short}</title>
+<title>Commit {node|short} / {repo|escape} / hg.stevelosh.com</title>
 </head>
 <body>
 
-<div class="main">
-
-<h2 class="breadcrumb"><a href="/">hg.stevelosh.com</a> {pathdef%breadcrumb}</h2>
+<div class="main page-commit">
 
-<div class="menu">
-    <ul>
-    <li><a href="{url|urlescape}">log</a></li>
-    <li><a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li>
-    <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
-    <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
-    <li><a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a></li>
-    <li><a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">browse</a></li>
-    {archives%archiveentry}
-    <li></li>
-    </ul>
-</div>
+{navigation}
 
-{searchform}
-
-<h3>
-    Commit
+<h1>
     <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}" class="commit-hash">{node|short}</a>
     {alltags}
-</h3>
-
-<div class="navigate">
-    <a href="{url|urlescape}raw-rev/{symrev}{sessionvars%urlparameter}">raw</a>
-    <a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">browse</a>
-</div>
+</h1>
 
 <pre class="commit-full-description">{desc|strip|escape|websub|nonempty}</pre>
 
+<div class="commit-nav">
+    <a href="{url|urlescape}raw-rev/{symrev}{sessionvars%urlparameter}">[view raw]</a>
+    <a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">[browse files]</a>
+</div>
+
 <table class="commit-contents">
     <tr>
         <th class="author">author</th>
@@ -48,26 +32,28 @@
     <th>obsolete</th>
     <td>{succsandmarkers%obsfateentry}</td>
     </tr>')}
-<tr>
- <th class="author">parent(s)</th>
- <td class="author">{ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)}</td>
-</tr>
-<tr>
- <th class="author">children</th>
- <td class="author">{child%changesetchild}</td>
-</tr>
-<tr>
- <th class="files">files</th>
- <td class="files">{files}</td>
-</tr>
+    <tr>
+        <th class="parents">parents</th>
+        <td class="parents">{ifeq(count(parent), '2', parent%changesetparentdiff, parent%changesetparent)}</td>
+    </tr>
+    <tr>
+        <th class="children">children</th>
+        <td class="children">{child%changesetchild|nonempty}</td>
+    </tr>
+    <tr>
+        <th class="tags">branches/tags</th>
+        <td class="tags">{alltags|nonempty}</td>
+    </tr>
+    <tr>
+        <th class="files">files</th>
+        <td class="files">{files}</td>
+    </tr>
 </table>
 
+<h2>Changes</h2>
+
 <div class="overflow">
-<div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div>
-<div class="sourcefirst"> line diff</div>
-<div class="stripes2 diffblocks">
-{diff}
-</div>
+    <div class="stripes2 diffblocks">{diff}</div>
 </div>
 
 </div>
diff -r b2b88bc58ef9 -r f402fd0f036b templates/sjl/error.tmpl
--- a/templates/sjl/error.tmpl	Sat Jan 11 13:21:39 2020 -0800
+++ b/templates/sjl/error.tmpl	Wed Jan 15 20:15:24 2020 -0500
@@ -10,7 +10,7 @@
 <img src="{staticurl|urlescape}{logoimg}" width=75 height=90 border=0 alt="mercurial" /></a>
 </div>
 <ul>
-<li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">log</a></li>
+<li><a href="{url|urlescape}log{sessionvars%urlparameter}">commits</a></li>
 <li><a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a></li>
 <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
 <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
diff -r b2b88bc58ef9 -r f402fd0f036b templates/sjl/filediff.tmpl
--- a/templates/sjl/filediff.tmpl	Sat Jan 11 13:21:39 2020 -0800
+++ b/templates/sjl/filediff.tmpl	Wed Jan 15 20:15:24 2020 -0500
@@ -10,7 +10,7 @@
 <img src="{staticurl|urlescape}{logoimg}" alt="mercurial" /></a>
 </div>
 <ul>
-<li><a href="{url|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">log</a></li>
+<li><a href="{url|urlescape}log/{symrev}{sessionvars%urlparameter}">log</a></li>
 <li><a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li>
 <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
 <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
diff -r b2b88bc58ef9 -r f402fd0f036b templates/sjl/filelog.tmpl
--- a/templates/sjl/filelog.tmpl	Sat Jan 11 13:21:39 2020 -0800
+++ b/templates/sjl/filelog.tmpl	Wed Jan 15 20:15:24 2020 -0500
@@ -14,7 +14,7 @@
 <img src="{staticurl|urlescape}{logoimg}" alt="mercurial" /></a>
 </div>
 <ul>
-<li><a href="{url|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">log</a></li>
+<li><a href="{url|urlescape}log/{symrev}{sessionvars%urlparameter}">commits</a></li>
 <li><a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li>
 <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
 <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
diff -r b2b88bc58ef9 -r f402fd0f036b templates/sjl/filerevision.tmpl
--- a/templates/sjl/filerevision.tmpl	Sat Jan 11 13:21:39 2020 -0800
+++ b/templates/sjl/filerevision.tmpl	Wed Jan 15 20:15:24 2020 -0500
@@ -3,77 +3,40 @@
 </head>
 <body>
 
-<div class="container">
-<div class="menu">
-<div class="logo">
-<a href="{logourl}">
-<img src="{staticurl|urlescape}{logoimg}" alt="mercurial" /></a>
-</div>
-<ul>
-<li><a href="{url|urlescape}shortlog/{symrev}{sessionvars%urlparameter}">log</a></li>
-<li><a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li>
-<li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
-<li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
-</ul>
-<ul>
-<li><a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a></li>
-<li><a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">browse</a></li>
-</ul>
-<ul>
-<li class="active">file</li>
-<li><a href="{url|urlescape}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a></li>
-<li><a href="{url|urlescape}diff/{symrev}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li>
-<li><a href="{url|urlescape}comparison/{symrev}/{file|urlescape}{sessionvars%urlparameter}">comparison</a></li>
-<li><a href="{url|urlescape}annotate/{symrev}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></li>
-<li><a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">file log</a></li>
-<li><a href="{url|urlescape}raw-file/{symrev}/{file|urlescape}">raw</a></li>
-</ul>
-</div>
+<div class="main">
+{navigation}
+
+<h1>
+ {file|escape} @ <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>
+ {alltags}
+</h1>
+
+<pre class="commit-full-description">{desc|strip|escape|websub|nonempty}</pre>
 
-<div class="main">
-<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
-<h3>
- view {file|escape} @ {rev}:<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>
- {alltags}
-</h3>
-
-{searchform}
-
-<div class="description">{desc|strip|escape|websub|nonempty}</div>
-
-<table id="changesetEntry">
-<tr>
- <th class="author">author</th>
- <td class="author">{author|obfuscate}</td>
-</tr>
-<tr>
- <th class="date">date</th>
- <td class="date age">{date|rfc822date}</td>
-</tr>
-<tr>
- <th class="author">parents</th>
- <td class="author">{parent%filerevparent}</td>
-</tr>
-<tr>
- <th class="author">children</th>
- <td class="author">{child%filerevchild}</td>
-</tr>
+<table class="commit-contents">
+    <tr>
+        <th class="author">author</th>
+        <td class="author">{author|obfuscate}</td>
+    </tr>
+    <tr>
+        <th class="date">date</th>
+        <td class="date age">{date|rfc822date}</td>
+    </tr>
+    <tr>
+        <th class="parents">parents</th>
+        <td class="parents">{parent%filerevparent|nonempty}</td>
+    </tr>
+    <tr>
+        <th class="children">children</th>
+        <td class="children">{child%filerevchild|nonempty}</td>
+    </tr>
 </table>
 
 <div class="overflow">
-<div class="sourcefirst linewraptoggle">line wrap: <a class="linewraplink" href="javascript:toggleLinewrap()">on</a></div>
-<div class="sourcefirst"> line source</div>
-<pre class="sourcelines stripes4 wrap bottomline"
-     data-logurl="{url|urlescape}log/{symrev}/{file|urlescape}"
-     data-selectabletag="SPAN"
-     data-ishead="{ishead}">
-{text%fileline}
-</pre>
+<pre class="sourcelines stripes4 wrap bottomline">{text%fileline}</pre>
 </div>
 
-<script type="text/javascript" src="{staticurl|urlescape}followlines.js"></script>
 
 </div>
-</div>
 
 {footer}
diff -r b2b88bc58ef9 -r f402fd0f036b templates/sjl/graph.tmpl
--- a/templates/sjl/graph.tmpl	Sat Jan 11 13:21:39 2020 -0800
+++ b/templates/sjl/graph.tmpl	Wed Jan 15 20:15:24 2020 -0500
@@ -1,32 +1,14 @@
 {header}
 <title>{repo|escape}: revision graph</title>
-<link rel="alternate" type="application/atom+xml"
-   href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}: log" />
-<link rel="alternate" type="application/rss+xml"
-   href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}: log" />
 </head>
 <body>
 
 
 <div class="main">
-
-<h2 class="breadcrumb"><a href="/">hg.stevelosh.com</a> {pathdef%breadcrumb}</h2>
-
-<div class="menu">
-    <ul>
-    <li><a href="{url|urlescape}">log</a></li>
-    <li class="active"><a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li>
-    <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
-    <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
-    <li><a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a></li>
-    <li><a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">browse</a></li>
-    {archives%archiveentry}
-    </ul>
-</div>
-
+{navigation}
 {searchform}
 
-<h3>Graph</h3>
+<h1>Graph</h1>
 
 <div class="navigate">
 <a href="{url|urlescape}graph/{symrev}{lessvars%urlparameter}">less</a>
diff -r b2b88bc58ef9 -r f402fd0f036b templates/sjl/index.tmpl
--- a/templates/sjl/index.tmpl	Sat Jan 11 13:21:39 2020 -0800
+++ b/templates/sjl/index.tmpl	Wed Jan 15 20:15:24 2020 -0500
@@ -5,7 +5,6 @@
 
 <div class="main">
     <h2 class="breadcrumb"><a href="/">hg.stevelosh.com</a> {pathdef%breadcrumb}</h2>
-    <div class="menu"></div>
 
     <table class="bigtable repos">
         <tbody class="stripes2">
diff -r b2b88bc58ef9 -r f402fd0f036b templates/sjl/manifest.tmpl
--- a/templates/sjl/manifest.tmpl	Sat Jan 11 13:21:39 2020 -0800
+++ b/templates/sjl/manifest.tmpl	Wed Jan 15 20:15:24 2020 -0500
@@ -5,30 +5,17 @@
 
 <div class="main">
 
-<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
-
-<div class="menu">
-    <ul>
-    <li><a href="{url|urlescape}">log</a></li>
-    <li><a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li>
-    <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
-    <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
-    <li><a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a></li>
-    <li><a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">browse</a></li>
-    {archives%archiveentry}
-    </ul>
-</div>
-
+{navigation}
 {searchform}
 
-<h3>
+<h1>
  <a class="path" href="{sessionvars%urlparameter}">{path|escape}</a>
  @
  <a class="commit-hash" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>
-</h3>
+</h1>
 
 
-<table class="bigtable">
+<table class="bigtable browse">
 <thead>
 <tr>
   <th class="name">name</th>
diff -r b2b88bc58ef9 -r f402fd0f036b templates/sjl/map
--- a/templates/sjl/map	Sat Jan 11 13:21:39 2020 -0800
+++ b/templates/sjl/map	Wed Jan 15 20:15:24 2020 -0500
@@ -1,10 +1,11 @@
-default = 'shortlog'
+default = 'readme'
 
 mimetype = 'text/html; charset={encoding}'
 header = header.tmpl
 footer = footer.tmpl
 search = search.tmpl
 
+readme = readme.tmpl
 changelog = shortlog.tmpl
 shortlog = shortlog.tmpl
 shortlogentry = shortlogentry.tmpl
@@ -37,6 +38,7 @@
 changeset = changeset.tmpl
 manifest = manifest.tmpl
 
+navigation = navigation.tmpl
 nav = '{before%naventry} {after%naventry}'
 navshort = '{before%navshortentry}{after%navshortentry}'
 navgraph = '{before%navgraphentry}{after%navgraphentry}'
diff -r b2b88bc58ef9 -r f402fd0f036b templates/sjl/navigation.tmpl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/templates/sjl/navigation.tmpl	Wed Jan 15 20:15:24 2020 -0500
@@ -0,0 +1,11 @@
+<h2 class="breadcrumb"><a href="/">hg.stevelosh.com</a> {pathdef%breadcrumb}</h2>
+
+<div class="menu">
+    <ul>
+    <li><a href="{url|urlescape}log{sessionvars%urlparameter}">commits</a></li>
+    <li><a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a></li>
+    <li><a href="{url|urlescape}file{sessionvars%urlparameter}">files</a></li>
+    <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
+    <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
+    </ul>
+</div>
diff -r b2b88bc58ef9 -r f402fd0f036b templates/sjl/notfound.tmpl
--- a/templates/sjl/notfound.tmpl	Sat Jan 11 13:21:39 2020 -0800
+++ b/templates/sjl/notfound.tmpl	Wed Jan 15 20:15:24 2020 -0500
@@ -1,12 +1,16 @@
 {header}
-<title>Mercurial repository not found</title>
+<title>Not Found / hg.stevelosh.com</title>
 </head>
 <body>
 
-<h2>Mercurial repository not found</h2>
+<div class="main">
+    <h2 class="breadcrumb"><a href="/">hg.stevelosh.com</a></h2>
+
+    <h1>Repository not found</h1>
 
-The specified repository "{repo|escape}" is unknown, sorry.
+    <p>The specified repository "{repo|escape}" is unknown, sorry.</p>
 
-Please go back to the <a href="{url|urlescape}">main repository list page</a>.
+    <p>Please go back to the <a href="{url|urlescape}">main repository list page</a>.</p>
+    </div>
 
 {footer}
diff -r b2b88bc58ef9 -r f402fd0f036b templates/sjl/readme.tmpl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/templates/sjl/readme.tmpl	Wed Jan 15 20:15:24 2020 -0500
@@ -0,0 +1,14 @@
+{header}
+<title>{repo|escape} / hg.stevelosh.com</title>
+</head>
+<body>
+
+<div class="main">
+
+{navigation}
+
+{readme_content}
+
+</div>
+
+{footer}
diff -r b2b88bc58ef9 -r f402fd0f036b templates/sjl/search.tmpl
--- a/templates/sjl/search.tmpl	Sat Jan 11 13:21:39 2020 -0800
+++ b/templates/sjl/search.tmpl	Wed Jan 15 20:15:24 2020 -0500
@@ -1,25 +1,15 @@
 {header}
-<title>{repo|escape}: searching for {query|escape}</title>
+<title>searching for {query|escape} / {repo|escape} / hg.stevelosh.com</title>
 </head>
 <body>
 
-<div class="container">
-<div class="menu">
-<div class="logo">
-<a href="{logourl}">
-<img src="{staticurl|urlescape}{logoimg}" width=75 height=90 border=0 alt="mercurial"></a>
-</div>
-<ul>
-<li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">log</a></li>
-<li><a href="{url|urlescape}graph{sessionvars%urlparameter}">graph</a></li>
-<li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
-<li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
-</ul>
-</div>
+
+<div class="main page-search">
 
-<div class="main">
-<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
-<h3>searching for '{query|escape}'</h3>
+{navigation}
+{searchform}
+
+<h1>Searching for '{query|escape}'</h1>
 
 <p>
 Assuming {modedesc}.
@@ -29,32 +19,30 @@
 Use {showunforcekw}</a> instead.')}
 </p>
 
-{searchform}
-
-<div class="navigate">
-<a href="{url|urlescape}log{lessvars%urlparameter}">less</a>
-<a href="{url|urlescape}log{morevars%urlparameter}">more</a>
+<div class="navigate navigate-top">
+    <a href="{url|urlescape}log{lessvars%urlparameter}">fewer</a>
+    <a href="{url|urlescape}log{morevars%urlparameter}">more</a>
 </div>
 
-<table class="bigtable">
-<thead>
- <tr>
-  <th class="age">age</th>
-  <th class="author">author</th>
-  <th class="description">description</th>
- </tr>
-</thead>
-<tbody class="stripes2">
-{entries}
-</tbody>
+<table class="bigtable shortlog">
+    <thead>
+        <tr>
+            <th>commit</th>
+            <th>description</th>
+            <th>author</th>
+            <th>date</th>
+        </tr>
+    </thead>
+    <tbody class="stripes2">
+        {entries}
+    </tbody>
 </table>
 
-<div class="navigate">
-<a href="{url|urlescape}log{lessvars%urlparameter}">less</a>
-<a href="{url|urlescape}log{morevars%urlparameter}">more</a>
+<div class="navigate navigate-bottom">
+    <a href="{url|urlescape}log{lessvars%urlparameter}">fewer</a>
+    <a href="{url|urlescape}log{morevars%urlparameter}">more</a>
 </div>
 
 </div>
-</div>
 
 {footer}
diff -r b2b88bc58ef9 -r f402fd0f036b templates/sjl/shortlog.tmpl
--- a/templates/sjl/shortlog.tmpl	Sat Jan 11 13:21:39 2020 -0800
+++ b/templates/sjl/shortlog.tmpl	Wed Jan 15 20:15:24 2020 -0500
@@ -1,31 +1,14 @@
 {header}
 <title>{repo|escape} / hg.stevelosh.com</title>
-<link rel="alternate" type="application/atom+xml"
-   href="{url|urlescape}atom-log" title="Atom feed for {repo|escape}" />
-<link rel="alternate" type="application/rss+xml"
-   href="{url|urlescape}rss-log" title="RSS feed for {repo|escape}" />
 </head>
 <body>
 
 
 <div class="main">
-<h2 class="breadcrumb"><a href="/">hg.stevelosh.com</a> {pathdef%breadcrumb}</h2>
-
-<div class="menu">
-    <ul>
-    <li class="active"><a href="{url|urlescape}">log</a></li>
-    <li><a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li>
-    <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
-    <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
-    <li><a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a></li>
-    <li><a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">browse</a></li>
-    {archives%archiveentry}
-    </ul>
-</div>
-
+{navigation}
 {searchform}
 
-<h3>Log</h3>
+<h1>Commit Log</h1>
 
 
 <div class="navigate navigate-top">
diff -r b2b88bc58ef9 -r f402fd0f036b templates/sjl/tags.tmpl
--- a/templates/sjl/tags.tmpl	Sat Jan 11 13:21:39 2020 -0800
+++ b/templates/sjl/tags.tmpl	Wed Jan 15 20:15:24 2020 -0500
@@ -1,30 +1,14 @@
 {header}
 <title>{repo|escape}: tags</title>
-<link rel="alternate" type="application/atom+xml"
-   href="{url|urlescape}atom-tags" title="Atom feed for {repo|escape}: tags" />
-<link rel="alternate" type="application/rss+xml"
-   href="{url|urlescape}rss-tags" title="RSS feed for {repo|escape}: tags" />
 </head>
 <body>
 
 <div class="main">
-<h2 class="breadcrumb"><a href="/">hg.stevelosh.com</a> {pathdef%breadcrumb}</h2>
 
-<div class="menu">
-    <ul>
-    <li><a href="{url|urlescape}">log</a></li>
-    <li><a href="{url|urlescape}graph/{symrev}{sessionvars%urlparameter}">graph</a></li>
-    <li class="active"><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
-    <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
-    <li><a href="{url|urlescape}rev/{symrev}{sessionvars%urlparameter}">changeset</a></li>
-    <li><a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">browse</a></li>
-    {archives%archiveentry}
-    </ul>
-</div>
-
+{navigation}
 {searchform}
 
-<h3>Tags</h3>
+<h1>Tags</h1>
 
 
 <table class="smalltable">
diff -r b2b88bc58ef9 -r f402fd0f036b templates/static/style-sjl.css
--- a/templates/static/style-sjl.css	Sat Jan 11 13:21:39 2020 -0800
+++ b/templates/static/style-sjl.css	Wed Jan 15 20:15:24 2020 -0500
@@ -62,7 +62,7 @@
 table.bigtable {
     width: 100%;
     margin: 12px 0px;
-    line-height: 28px;
+    line-height: 21px;
     border-collapse: collapse;
 }
 
@@ -134,6 +134,10 @@
 }
 
 /* Browse */
+
+table.browse {
+    line-height: 24px;
+}
 .commit-hash {
     font-family: monospace;
 }
@@ -155,6 +159,11 @@
     text-align: right;
 }
 
+/* README */
+.readme pre {
+    white-space: nowrap;
+}
+
 /* Commit */
 pre.commit-full-description {
     border: 1px solid #ccc;
@@ -162,11 +171,24 @@
     padding: 10px 5px;
     background: #fafafa;
 }
+div.commit-nav {
+    margin: 12px 0px 24px;
+}
 table.commit-contents {
     width: 100%;
+    line-height: 18px;
+}
+table.commit-contents tr th.files {
+    padding-top: 12px;
+    vertical-align: top;
+}
+table.commit-contents tr td.files {
+    padding: 12px 0;
 }
 table.commit-contents tr th {
     width: 100px;
+    text-align: right;
+    padding-right: 10px;
 }
 table.commit-contents tr td {
     width: auto;
@@ -241,13 +263,9 @@
     font-weight: bold;
     background: #ccc;
 }
-.sourcelines span:nth-of-type(1),
-.sourcelines span:nth-of-type(2)
-{
-    background: none;
+
+.page-commit .sourcelines span:nth-of-type(1) {
     font-weight: bold;
-}
-.sourcelines span:nth-of-type(2) {
     border-bottom: 1px solid #ccc;
     margin-bottom: 10px;
     padding-bottom: 10px;