From 595dae709a0cf204d096c563f63af5ac2eb20006 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Fri, 27 Nov 2020 12:28:39 +0200 Subject: combine, simplify CSS style sheets --- local.css | 7 --- style.css | 125 ++++++++-------------------------------------------- templates/page.tmpl | 1 - 3 files changed, 18 insertions(+), 115 deletions(-) delete mode 100644 local.css diff --git a/local.css b/local.css deleted file mode 100644 index 838348e..0000000 --- a/local.css +++ /dev/null @@ -1,7 +0,0 @@ -img.sticker { - float: right; -} -img.bytemark { - float: right; - height: 40px; -} diff --git a/style.css b/style.css index 8371363..06e4efe 100644 --- a/style.css +++ b/style.css @@ -6,18 +6,27 @@ html { margin-top: 2em; } -form#searchform { - font-family: monospace; - text-align: right; +h1, h2, h3, h4, h5, h6 { + font-family: sans-serif; + font-weight: bold; + margin-top: 2em; } -div.actions { - font-family: monospace; - text-align: right; +h1 { + font-size: 150%; } -div.actions ul, div.actions li { - display: inline; +h2 { + font-size: 120%; +} + +h3 { + font-size: 100%; +} + +ul li, ol li { + margin-top: 0.5em; + margin-bottom: 0.5em; } div.pageheader { @@ -41,9 +50,6 @@ div.pagefooter { margin-top: 3em; } -div#pagebody { -} - span.date { font-family: monospace; } @@ -74,107 +80,12 @@ div.sidebar { margin-left: 1em; } -.float_right, .floatTR { +.float_right { float: right; margin-left: 1em; margin-bottom: 1em; } -h1, h2, h3, h4, h5, h6 { - font-family: sans-serif; - font-weight: bold; - margin-top: 2em; -} - -h1 { - font-size: 150%; -} - -h2 { - font-size: 120%; -} - -h3 { - font-size: 100%; -} - -ul li, ol li { - margin-top: 0.5em; - margin-bottom: 0.5em; -} - -div#comments div.feedlink { - margin-top: 2em; -} - -div.comment { - margin-top: 2em; -} - -div.comment-subject { - margin-bottom: 1em; - font-size: 120%; - font-family: sans-serif; -} - -div.comment-header { - margin-top: 1em; -} - -div.archivepage { - margin-top: 0.5em; - margin-bottom: 0.5em; -} - span.archivepagedate { font-family: monospace; } - - - -/* The following are for openid logins in Ikiwiki. Copied from - ikiwiki. */ - -input#openid_identifier { - background: url(wikiicons/openidlogin-bg.gif) no-repeat; - background-color: #fff; - background-position: 0 50%; - color: #000; - padding-left: 18px; -} -/* openid selector */ -#openid_choice { - display: none; -} -#openid_input_area { - clear: both; - padding: 10px; -} -#openid_btns, #openid_btns br { - clear: both; -} -#openid_highlight { - background-color: black; - float: left; -} -.openid_large_btn { - padding: 1em 1.5em; - border: 1px solid #DDD; - margin: 3px; - float: left; -} -.openid_small_btn { - padding: 4px 4px; - border: 1px solid #DDD; - margin: 3px; - float: left; -} -a.openid_large_btn:focus { - outline: none; -} -a.openid_large_btn:focus { - outline-style: none; -} -.openid_selected { - border: 4px solid #DDD; -} diff --git a/templates/page.tmpl b/templates/page.tmpl index 3f39ba7..1c5407a 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -5,7 +5,6 @@ <TMPL_VAR TITLE> -
-- cgit v1.2.1