Mercurial > wikked

changeset 200:5b8beebb6c70

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetic changes for sub-titles/decorators.
author Ludovic Chabant <ludovic@chabant.com>
date Tue, 11 Feb 2014 08:11:57 -0800
parents 20f37951b813
children 7209c934fc9b
files wikked/assets/css/wikked/page.less wikked/assets/tpl/category.html wikked/assets/tpl/diff-page.html wikked/assets/tpl/edit-page.html wikked/assets/tpl/history-page.html wikked/assets/tpl/inlinks-page.html wikked/assets/tpl/meta-page.html wikked/assets/tpl/read-page.html wikked/assets/tpl/revision-page.html
diffstat 9 files changed, 22 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/wikked/assets/css/wikked/page.less	Tue Feb 11 08:10:46 2014 -0800
+++ b/wikked/assets/css/wikked/page.less	Tue Feb 11 08:11:57 2014 -0800
@@ -79,9 +79,11 @@
     text-transform: uppercase;
     font-family: @font-family-sans-serif;
     font-weight: 200;
-    font-size: 0.7em;
+    font-size: 1.1em;
+    margin-top: -(@line-height-computed / 2);
+    margin-bottom: (@line-height-computed / 2);
     letter-spacing: 0.1em;
-    color: @color-gray;
+    color: @color-gray-dark;
     .rev_id {
         font-family: @font-family-monospace;
     }
--- a/wikked/assets/tpl/category.html	Tue Feb 11 08:10:46 2014 -0800
+++ b/wikked/assets/tpl/category.html	Tue Feb 11 08:11:57 2014 -0800
@@ -1,6 +1,7 @@
 <article>
     <header>
-        <h1>{{query.category}} <span class="decorator">Category</span></h1>
+        <h1>{{query.category}}</h1>
+        <div class="decorator">Category</div>
     </header>
     <section>
         {{content}}
--- a/wikked/assets/tpl/diff-page.html	Tue Feb 11 08:10:46 2014 -0800
+++ b/wikked/assets/tpl/diff-page.html	Tue Feb 11 08:11:57 2014 -0800
@@ -1,16 +1,13 @@
 <article>
     <header>
-        <h1>
-            {{meta.title}}
-            <span class="decorator">Diff</span></br/>
-            <span class="decorator-sm">
+        <h1>{{meta.title}}</h1>
+        <div class="decorator">Diff
             {{#if disp_rev2}}
             <span class="rev_id">{{disp_rev1}}</span> to <span class="rev_id">{{disp_rev2}}</span>
             {{else}}
             change <span class="rev_id">{{disp_rev1}}</span>
             {{/if}}
-            </span>
-        </h1>
+        </div>
     </header>
     <section>
         <pre><code>{{{diff}}}</code></pre>
--- a/wikked/assets/tpl/edit-page.html	Tue Feb 11 08:10:46 2014 -0800
+++ b/wikked/assets/tpl/edit-page.html	Tue Feb 11 08:11:57 2014 -0800
@@ -11,7 +11,8 @@
                     <span class="help-block small" for="title">You can put this page in a folder by entering a title like <code>Folder/Page Title</code>.</span>
                 </div>
                 {{else}}
-                <h1>{{meta.title}} <span class="decorator">Editing</span></h1>
+                <h1>{{meta.title}}<h1>
+                <div class="decorator">Editing</div>
                 {{/if}}
             </header>
         </div>
--- a/wikked/assets/tpl/history-page.html	Tue Feb 11 08:10:46 2014 -0800
+++ b/wikked/assets/tpl/history-page.html	Tue Feb 11 08:11:57 2014 -0800
@@ -1,6 +1,7 @@
 <article>
     <header>
-        <h1>{{meta.title}} <span class="decorator">History</span></h1>
+        <h1>{{meta.title}}</h1>
+        <div class="decorator">History</div>
     </header>
     <section>
         {{#if history}}
--- a/wikked/assets/tpl/inlinks-page.html	Tue Feb 11 08:10:46 2014 -0800
+++ b/wikked/assets/tpl/inlinks-page.html	Tue Feb 11 08:11:57 2014 -0800
@@ -1,6 +1,7 @@
 <article>
     <header>
-        <h1>{{meta.title}} <span class="decorator">Incoming Links</span></h1>
+        <h1>{{meta.title}}</h1>
+        <div class="decorator">Incoming Links</div>
     </header>
     <section>
         <p>The following pages link to <a href="{{url_read}}">{{meta.title}}</a>:</p>
--- a/wikked/assets/tpl/meta-page.html	Tue Feb 11 08:10:46 2014 -0800
+++ b/wikked/assets/tpl/meta-page.html	Tue Feb 11 08:11:57 2014 -0800
@@ -1,6 +1,7 @@
 <article>
     <header>
-        <h1>{{meta_value}} <span class="decorator">{{meta_query}}</span></h1>
+        <h1>{{meta_value}}</h1>
+        <div class="decorator">{{meta_query}}</div>
     </header>
     <section>
         {{content}}
--- a/wikked/assets/tpl/read-page.html	Tue Feb 11 08:10:46 2014 -0800
+++ b/wikked/assets/tpl/read-page.html	Tue Feb 11 08:11:57 2014 -0800
@@ -2,6 +2,9 @@
     {{#ifnot meta.notitle}}
     <header>
         <h1>{{meta.title}}</h1>
+        {{#if meta_query}}
+        <div class="decorator">{{meta_query}}</div>
+        {{/if}}
         {{#if redirected_from}}
         <small>Redirected from <a href="{{get_read_url redirected_from}}?no_redirect">{{redirected_from}}</a></small>
         {{/if}}
--- a/wikked/assets/tpl/revision-page.html	Tue Feb 11 08:10:46 2014 -0800
+++ b/wikked/assets/tpl/revision-page.html	Tue Feb 11 08:11:57 2014 -0800
@@ -1,6 +1,7 @@
 <article>
     <header>
-        <h1>{{meta.title}} <span class="decorator">Revision: <span class="rev_id">{{disp_rev}}</span></span></h1>
+        <h1>{{meta.title}}</h1>
+        <div class="decorator">Revision: <span class="rev_id">{{disp_rev}}</span></div>
     </header>
     <section>
         <pre><code>{{text}}</code></pre>