From e1944a84d1d7ba27ace2adb0d00a14b3276a5a4c Mon Sep 17 00:00:00 2001 From: paul Date: Thu, 20 Nov 2014 20:53:41 +0000 Subject: [PATCH] sorted out text designs svn path=/trunk/; revision=55 --- templates/Home.css | 4 ++-- templates/Home.page | 2 +- templates/Tasks.page | 4 ++-- templates/Wiki.css | 12 ++++++++++++ templates/Wiki_show.page | 5 ++--- templates/wikitext.css | 20 +++++--------------- 6 files changed, 24 insertions(+), 23 deletions(-) diff --git a/templates/Home.css b/templates/Home.css index a0e47e0..4c7add0 100644 --- a/templates/Home.css +++ b/templates/Home.css @@ -31,5 +31,5 @@ div.NEWS { border-color: #AAF; } -.wikitext h2 { font-size: 1.5em; margin: .3em 0em; } -.wikitext h3 { font-size: 1.2em; } +.wikitext h1 { font-size: 1.5em; margin: .3em 0em; } +.wikitext h2 { font-size: 1.2em; } diff --git a/templates/Home.page b/templates/Home.page index 67d41fb..e12b78f 100644 --- a/templates/Home.page +++ b/templates/Home.page @@ -52,7 +52,7 @@ HomeEND } show_news(){ - stat -c '' Home/<0000000000-9999999999>_<000-999>.news && for each in $(ls -c Home/<0000000000-9999999999>_<000-999>.news); do + for each in $(ls -r Home/<0000000000-9999999999>_<000-999>.news); do info="$(sed 's:Home/::;s:.news::' <<<"$each")" cat < +

$new

diff --git a/templates/Wiki.css b/templates/Wiki.css index 5218667..17f69be 100644 --- a/templates/Wiki.css +++ b/templates/Wiki.css @@ -83,3 +83,15 @@ .article a{ text-decoration: none; } + +.wikitext h1.wikihead { + text-align: center; + font: normal bold 2em sans-serif; + margin: 0em 0em 0em 0em; + border-style: none none solid none; + border-width: 1px; +} +.wikitext h1.wikihead + h1{ + margin: .5em 0em .3em 0em; +} + diff --git a/templates/Wiki_show.page b/templates/Wiki_show.page index 87e848f..cfe86e4 100755 --- a/templates/Wiki_show.page +++ b/templates/Wiki_show.page @@ -3,8 +3,7 @@ list_comments() { base="$1" - stat -c '' Wiki/${base}.comment.<0000000001-9999999999>_<000-999> \ - && for each in $(ls -c Wiki/${base}.comment.<0000000001-9999999999>_<000-999>); do + for each in $(ls -r Wiki/${base}.comment.<0000000001-9999999999>_<000-999>); do author=$(grep -m1 '^author=' "$each" |cut -d= -f2-) echo "

$author wrote:

" tail -n+2 $each |_wiki @@ -68,7 +67,7 @@ cat <
-

$title

+

$title

$(_wiki Wiki/"${info}${rev}")
diff --git a/templates/wikitext.css b/templates/wikitext.css index 601d797..d9baa4a 100644 --- a/templates/wikitext.css +++ b/templates/wikitext.css @@ -18,35 +18,25 @@ padding: 0em; margin: 0em; } .wikitext h1 { - text-align: center; - font: normal bold 2em sans-serif; - margin: 0em 0em 0em 0em; - border-style: none none solid none; - border-width: 1px; -} -.wikitext h1 + h2{ - margin: .5em 0em .3em 0em; -} -.wikitext h2 { text-align: left; font: normal bold 1.3em sans-serif; margin: 1em 0em .3em 0em; border-style: none none solid none; border-width: 1px; border-color: #AAF; } -.wikitext h2 + p { margin: 0em; } -.wikitext h3 { +.wikitext h1 + p { margin: 0em; } +.wikitext h2 { text-align: left; font-size: 1.1em; margin: .6em 0em .3em 0em; } -.wikitext h3 + p { margin: 0em; } -.wikitext h4 { +.wikitext h2 + p { margin: 0em; } +.wikitext h3 { text-align: left; font-size: 1em; margin: .6em 0em .3em 0em; } -.wikitext h4 + p { margin: 0em; } +.wikitext h3 + p { margin: 0em; } .wikitext p { margin: .6em 0em; } -- 2.39.2