coal: more tweaks

- move icons inside links
- set icon borders to 0
- make active menu button white on black and remove bar

templates/coal/map

@@ -1,69 +1,69 b''
 default = 'shortlog'
 
 mimetype = 'text/html; charset={encoding}'
 header = header.tmpl
 footer = footer.tmpl
 search = search.tmpl
 
 changelog = shortlog.tmpl
 shortlog = shortlog.tmpl
 shortlogentry = shortlogentry.tmpl
 
 naventry = '<a href="{url}log/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
 navshortentry = '<a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
 filenaventry = '<a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{label|escape}</a> '
 filedifflink = '<a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> '
 filenodelink = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> '
 fileellipses = '...'
 changelogentry = shortlogentry.tmpl
 searchentry = shortlogentry.tmpl
 changeset = changeset.tmpl
 manifest = manifest.tmpl
 
-direntry = '<tr class="fileline parity{parity}"><td class="name"><img src="{staticurl}coal-folder.png"> <a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">{basename|escape}/</a><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr>'
-fileentry = '<tr class="fileline parity{parity}"><td clase="filename"><img src="{staticurl}coal-file.png"> <a href="{url}file/{node|short}/{file|urlescape}#l1{sessionvars%urlparameter}">{basename|escape}</a></td><td class="size">{size}</td><td class="permissions">{permissions|permissions}</td></tr>'
+direntry = '<tr class="fileline parity{parity}"><td class="name"><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}"><img src="{staticurl}coal-folder.png"> {basename|escape}/</a><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr>'
+fileentry = '<tr class="fileline parity{parity}"><td clase="filename"><a href="{url}file/{node|short}/{file|urlescape}#l1{sessionvars%urlparameter}"><img src="{staticurl}coal-file.png"> {basename|escape}</a></td><td class="size">{size}</td><td class="permissions">{permissions|permissions}</td></tr>'
 
 filerevision = filerevision.tmpl
 fileannotate = fileannotate.tmpl
 filediff = filediff.tmpl
 filelog = filelog.tmpl
 fileline = '<tr class="parity{parity}"><td class="lineno"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td><td class="source">{line|escape}</td></tr>'
 filelogentry = filelogentry.tmpl
 
 annotateline = '<tr class="parity{parity}"><td class="annotate"><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#{targetline}">{author|obfuscate}@{rev}</a></td><td class="lineno"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td><td class="source">{line|escape}</td></tr>'
 
 diffblock = '<table class="bigtable parity{parity}">{lines}</table>'
 difflineplus = '<tr><td class="lineno"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td><td class="source plusline">{line|escape}</td></tr>'
 difflineminus = '<tr><td class="lineno"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td><td class="source minusline">{line|escape}</td></tr>'
 difflineat = '<tr><td class="lineno"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td><td class="source atline">{line|escape}</td></tr>'
 diffline = '<tr><td class="lineno"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td><td class="source">{line|escape}</td></tr>'
 
 changelogparent = '<tr><th class="parent">parent {rev}:</th><td class="parent"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
 
 changesetparent = '<a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> '
 
 filerevparent = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rename%filerename}{node|short}</a> '
 filerevchild = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a> '
 
 filerename = '{file|escape}@'
 filelogrename = '<tr><th>base:</th><td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}@{node|short}</a></td></tr>'
 fileannotateparent = '<tr><td class="metatag">parent:</td><td><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rename%filerename}{node|short}</a></td></tr>'
 changesetchild = '<a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a>'
 changelogchild = '<tr><th class="child">child</th><td class="child"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
 fileannotatechild = '<tr><td class="metatag">child:</td><td><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
 tags = tags.tmpl
 tagentry = '<tr class="tagEntry parity{parity}"><td><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{tag|escape}</a></td><td class="node">{node|short}</td></tr>'
 changelogtag = '<tr><th class="tag">tag:</th><td class="tag">{tag|escape}</td></tr>'
 changelogtag = '<span class="tag">{name|escape}</span> '
 changesettag = '<span class="tag">{tag|escape}</span> '
 filediffparent = '<tr><th class="parent">parent {rev}:</th><td class="parent"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
 filelogparent = '<tr><th>parent {rev}:</th><td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
 filediffchild = '<tr><th class="child">child {rev}:</th><td class="child"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
 filelogchild = '<tr><th>child {rev}:</th><td><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
 indexentry = '<tr class="parity{parity}"><td><a href="{url}{sessionvars%urlparameter}">{name|escape}</a></td><td>{description}</td><td>{contact|obfuscate}</td><td class="age">{lastchange|age} ago</td><td class="indexlinks"><a href="{url}rss-log">RSS</a> <a href="{url}atom-log">Atom</a> {archives%archiveentry}</td></tr>'
 index = index.tmpl
 archiveentry = '<li><a href="{url}archive/{node|short}{extension|urlescape}">{type|escape}</a></li>'
 notfound = notfound.tmpl
 error = error.tmpl
 urlparameter = '{separator}{name}={value|urlescape}'
 hiddenformentry = '<input type="hidden" name="{name}" value="{value|escape}" />'

templates/static/style-coal.css

@@ -1,154 +1,156 b''
 body {
   margin: 0;
   padding: 0;
   background: black url(background.png) repeat-x;
   font-family: sans-serif;
 }
 
 .container {
   padding-right: 150px;
 }
 
 .main {
   position: relative;
   background: white;
   padding: 2em;
   border-right: 15px solid black;
   border-bottom: 15px solid black;
 }
 
 .overflow {
   width: 100%;
   overflow: auto;
 }
 
 .menu {
   background: #999;
   padding: 10px;
   width: 75px;
   margin: 0;
-  font-size: 80% /*smaller*/;
+  font-size: 80%;
   text-align: left;
   position: fixed;
   top: 27px;
   left: auto;
   right: 27px;
 }
 
 .menu ul {
   list-style: none;
   padding: 0;
   margin: 10px 0 0 0;
 }
 
 .menu li {
   margin-bottom: 3px;
   padding: 2px 4px;
   background: white;
   color: black;
   font-weight: normal;
 }
 
 .menu li.active {
-  border-left: 3px solid black;
+  background: black;
+  color: white;
 }
 
+.menu a { color: black; display: block; }
+
 .search {
   position: absolute;
   top: .7em;
   right: 2em;
 }
 
-.menu a { color: black; display: block; }
-
 a { text-decoration:none; }
 .age { white-space:nowrap; }
 .date { white-space:nowrap; }
 .indexlinks { white-space:nowrap; }
 .parity0 { background-color: #f5f5f5; }
 .parity1 { background-color: white; }
 .plusline { color: green; }
 .minusline { color: red; }
 .atline { color: purple; }
 
 .navigate {
   text-align: right;
   font-size: 60%;
   margin: 1em 0 1em 0;
 }
 
 .tag {
   color: #999;
   font-size: 70%;
   font-weight: normal;
   margin-left: .5em;
   vertical-align: text-baseline;
 }
 
 /* Common */
 pre { margin: 0; }
 
 h2 { font-size: 120%; border-bottom: 1px solid #999; }
 h3 {
   margin-top: -.7em;
   font-size: 100%;
 }
 
 /* log and tags tables */
 .bigtable {
   border-bottom: 1px solid #999;
   border-collapse: collapse;
   font-size: 90%;
   width: 100%; 
   font-weight: normal;
   text-align: left;
 }
 
 .bigtable td {
   padding: 1px 4px 1px 4px;
   vertical-align: top;
 }
 
 .bigtable th { 
   padding: 1px 4px 1px 4px;
   border-bottom: 1px solid #999; 
   font-size: smaller;
 }
 .bigtable tr { border: none; }
 .bigtable .age { width: 6em; }
 .bigtable .author { width: 10em; }
 .bigtable .description { }
 .bigtable .node { width: 5em; font-family: monospace;}
 .bigtable .lineno { width: 2em; text-align: right;}
 .bigtable .lineno a { color: #999; font-size: smaller; font-family: monospace;}
 .bigtable td.source { font-family: monospace; white-space: pre; }
 .bigtable .permissions { width: 8em; text-align: left;}
 .bigtable .size { width: 5em; text-align: right; }
 .bigtable .annotate { text-align: right; padding-right: }
 .bigtable td.annotate { font-size: smaller; }
 
 .fileline { font-family: monospace; }
+.fileline img { border: 0; }
 
 /* Changeset entry */
 #changesetEntry { 
   border-collapse: collapse;
   font-size: 90%;
   width: 100%;
   margin-bottom: 1em;
 }
 
 #changesetEntry th { 
   padding: 1px 4px 1px 4px;
   width: 4em;
   text-align: right;
   font-weight: normal;
   color: #999;
   margin-right: .5em;
   vertical-align: top;
 }
 
 div.description {
   border-left: 3px solid #999;
   margin: 1em 0 1em 0;
   padding: .3em;
 }