1.1 --- a/themes/mercurialweb/search.tmpl Sun Jun 06 16:56:26 2010 +0200
1.2 +++ b/themes/mercurialweb/search.tmpl Mon Jun 07 01:13:18 2010 +0200
1.3 @@ -8,12 +8,12 @@
1.4 <div id="logo"><a href="{url}..{sessionvars%urlparameter}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div>
1.5 <div class="controls">
1.6 <ul id="navibar">
1.7 - <li><a href="{url}summary{sessionvars%urlparameter}">summary</a></li
1.8 - ><li><a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a></li
1.9 - ><li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li
1.10 - ><li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li
1.11 - ><li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li
1.12 - ><li><a href="{url}files{sessionvars%urlparameter}">files</a></li
1.13 + <li><a href="{url}summary{sessionvars%urlparameter}">Summary</a></li
1.14 + ><li><a href="{url}shortlog{sessionvars%urlparameter}">Shortlog</a></li
1.15 + ><li><a href="{url}changelog{sessionvars%urlparameter}">Changelog</a></li
1.16 + ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li
1.17 + ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li
1.18 + ><li><a href="{url}files{sessionvars%urlparameter}">Files</a></li
1.19 ><li><form id="searchform" action="{url}log"><span class="container">
1.20 <span class="hint">Search</span> <input name="rev" id="searchinput" type="text" size="20" />
1.21 </span>
2.1 --- a/themes/mercurialweb/shortlog.tmpl Sun Jun 06 16:56:26 2010 +0200
2.2 +++ b/themes/mercurialweb/shortlog.tmpl Mon Jun 07 01:13:18 2010 +0200
2.3 @@ -8,12 +8,12 @@
2.4 <div id="logo"><a href="{url}..{sessionvars%urlparameter}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div>
2.5 <div class="controls">
2.6 <ul id="navibar">
2.7 - <li><a href="{url}summary{sessionvars%urlparameter}">summary</a></li
2.8 - ><li class="current"><span>shortlog</span></li
2.9 - ><li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li
2.10 - ><li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li
2.11 - ><li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li
2.12 - ><li><a href="{url}files{sessionvars%urlparameter}">files</a></li
2.13 + <li><a href="{url}summary{sessionvars%urlparameter}">Summary</a></li
2.14 + ><li class="current"><span>Shortlog</span></li
2.15 + ><li><a href="{url}changelog{sessionvars%urlparameter}">Changelog</a></li
2.16 + ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li
2.17 + ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li
2.18 + ><li><a href="{url}files{sessionvars%urlparameter}">Files</a></li
2.19 ><li><form id="searchform" action="{url}log"><span class="container">
2.20 <span class="hint">Search</span> <input name="rev" id="searchinput" type="text" size="20" />
2.21 </span>
3.1 --- a/themes/mercurialweb/static/style-mercurialweb.css Sun Jun 06 16:56:26 2010 +0200
3.2 +++ b/themes/mercurialweb/static/style-mercurialweb.css Mon Jun 07 01:13:18 2010 +0200
3.3 @@ -108,12 +108,16 @@
3.4 padding: 0;
3.5 }
3.6
3.7 +#navibar li form {
3.8 + display: inline;
3.9 +}
3.10 +
3.11 #navibar a, #navibar li.current span, .navigation a {
3.12 color: #fff;
3.13 text-decoration: none;
3.14 }
3.15
3.16 -#navibar a, #navibar li.current span {
3.17 +#navibar a {
3.18 background: #999;
3.19 }
3.20
3.21 @@ -169,18 +173,13 @@
3.22 text-decoration: none;
3.23 }
3.24
3.25 -#searchform {
3.26 - display: inline;
3.27 -}
3.28 -
3.29 -#searchform span.container {
3.30 +#navibar form span.container {
3.31 + position: relative;
3.32 display: inline-block;
3.33 - position: relative;
3.34
3.35 /* Margin and padding correspond to the navibar settings. */
3.36
3.37 margin: 0;
3.38 - padding: 0 16px;
3.39 background: #999;
3.40
3.41 /* Height settings correspond to navibar list entries. */
3.42 @@ -189,6 +188,13 @@
3.43 line-height: 42px;
3.44 }
3.45
3.46 +form#searchform span.container {
3.47 +
3.48 + /* Margin and padding correspond to the navibar settings. */
3.49 +
3.50 + padding: 0 16px;
3.51 +}
3.52 +
3.53 #searchform span.container span.hint {
3.54 display: none;
3.55 }
4.1 --- a/themes/mercurialweb/summary.tmpl Sun Jun 06 16:56:26 2010 +0200
4.2 +++ b/themes/mercurialweb/summary.tmpl Mon Jun 07 01:13:18 2010 +0200
4.3 @@ -8,12 +8,12 @@
4.4 <div id="logo"><a href="{url}..{sessionvars%urlparameter}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div>
4.5 <div class="controls">
4.6 <ul id="navibar">
4.7 - <li class="current"><span>summary</span></li
4.8 - ><li><a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a></li
4.9 - ><li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li
4.10 - ><li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li
4.11 - ><li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li
4.12 - ><li><a href="{url}files{sessionvars%urlparameter}">files</a></li
4.13 + <li class="current"><span>Summary</span></li
4.14 + ><li><a href="{url}shortlog{sessionvars%urlparameter}">Shortlog</a></li
4.15 + ><li><a href="{url}changelog{sessionvars%urlparameter}">Changelog</a></li
4.16 + ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li
4.17 + ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li
4.18 + ><li><a href="{url}files{sessionvars%urlparameter}">Files</a></li
4.19 ><li><form id="searchform" action="{url}log"><span class="container">
4.20 <span class="hint">Search</span> <input name="rev" id="searchinput" type="text" size="20" />
4.21 </span>
