diff options
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | .topdeps | 3 | ||||
-rw-r--r-- | .topmsg | 4 | ||||
-rw-r--r-- | Makefile | 9 | ||||
-rw-r--r-- | actiontabs/style.css | 647 | ||||
-rw-r--r-- | actiontabs/style.scss | 161 | ||||
-rw-r--r-- | blueview/style.css | 783 | ||||
-rw-r--r-- | blueview/style.scss | 397 | ||||
-rw-r--r-- | default/_ikiwiki.scss (renamed from default/style.css) | 242 | ||||
-rw-r--r-- | default/style.scss | 2 | ||||
-rw-r--r-- | goldtype/style.css | 806 | ||||
-rw-r--r-- | goldtype/style.scss | 25 | ||||
-rw-r--r-- | include.mk | 12 |
13 files changed, 810 insertions, 2283 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..db8d88a --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/.sass-cache/ +*.css @@ -1,2 +1 @@ -ikiwiki -default +fixup @@ -1,6 +1,6 @@ From: Jonas Smedegaard <dr@jones.dk> -Subject: [PATCH] fixup +Subject: [PATCH] sass -Flaws in upstream code corrected. +Generate CSS files from the more flexible Sass source format. Signed-off-by: Jonas Smedegaard <dr@jones.dk> diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..077037e --- /dev/null +++ b/Makefile @@ -0,0 +1,9 @@ +cssprojects ?= default blueview actiontabs goldtype + +beautify ?= yes + +all: $(cssprojects) + +include include.mk + +.PHONY: all diff --git a/actiontabs/style.css b/actiontabs/style.css deleted file mode 100644 index 70890d5..0000000 --- a/actiontabs/style.css +++ /dev/null @@ -1,647 +0,0 @@ -/* ikiwiki style sheet */ - -/* Note that instead of modifying this style sheet, you can instead edit - * local.css and use it to override or change settings in this one. - */ - -/* html5 compat */ -article, -header, -footer, -nav { - display: block; -} - -.header { - margin: 0; - font-size: 140%; - font-weight: bold; - line-height: 1em; - display: block; -} - -.inlineheader .author { - margin: 0; - font-size: 112%; - font-weight: bold; - display: block; -} - -.actions ul { - margin: 0; - padding: 6px .4em; - height: 1em; - list-style-type: none; -} -.actions li { - display: inline; - padding: .2em; -} -.pageheader .actions ul { - border-bottom: 1px solid #000; -} - -.inlinepage .actions ul { - border-bottom: 0; -} - -#otherlanguages ul { - margin: 0; - padding: 6px; - list-style-type: none; -} -#otherlanguages li { - display: inline; - padding: .2em .4em; -} -.pageheader #otherlanguages { - border-bottom: 1px solid #000; -} - -.inlinecontent { - margin-top: .4em; -} - -.pagefooter, -.inlinefooter, -.comments { - clear: both; -} - -#pageinfo { - margin: 1em 0; - border-top: 1px solid #000; -} - -.tags { - margin-top: 1em; -} - -.inlinepage .tags { - display: inline; -} - -.mapparent { - text-decoration: none; -} - -.img caption { - font-size: 80%; - caption-side: bottom; - text-align: center; -} - -img.img { - margin: 0.5ex; -} - -.align-left { - float:left; -} - -.align-right { - float:right; -} - -#backlinks { - margin-top: 1em; -} - -#searchform { - display: inline; - float: right; -} - -#editcontent { - width: 98%; -} - -.editcontentdiv { - width: auto; - overflow: auto; -} - -img { - border-style: none; -} - -pre { - overflow: auto; -} - -div.recentchanges { - border-style: solid; - border-width: 1px; - overflow: auto; - width: auto; - clear: none; - background: #eee; - color: black !important; -} -.recentchanges .metadata { - padding: 0px 0.5em; -} -.recentchanges .changelog { - font-style: italic; - clear: both; - display: block; - padding: 1px 2px; - background: white !important; - color: black !important; -} -.recentchanges .desc { - display: none; -} -.recentchanges .diff { - display: none; -} -.recentchanges .committer { - float: left; - margin: 0; - width: 40%; -} -.recentchanges .committype { - float: left; - margin: 0; - width: 5%; - font-size: small; -} -.recentchanges .changedate { - float: left; - margin: 0; - width: 35%; - font-size: small; -} -.recentchanges .pagelinks, -.recentchanges .revert { - float: right; - margin: 0; - width: 60%; -} - -.blogform, #blogform { - padding: 10px 10px; - border: 1px solid #aaa; - background: #eee; - color: black !important; - width: auto; - overflow: auto; -} - -.inlinepage { - padding: 10px 10px; - border: 1px solid #aaa; - overflow: auto; -} - -.pagedate, -.pagelicense, -.pagecopyright { - font-style: italic; - display: block; - margin-top: 1em; -} - -.error { - color: #C00; -} - -.sidebar { - width: 20ex; - float: right; - margin-left: 4px; - margin-bottom: 4px; - margin-top: -1px; - padding: 0ex 2ex; - background: white; - border: 1px solid black; - color: black !important; -} - -hr.poll { - height: 10pt; - color: white !important; - background: #eee; - border: 2px solid black; -} -div.poll { - margin-top: 1ex; - margin-bottom: 1ex; - padding: 1ex 1ex; - border: 1px solid #aaa; -} - -span.color { - padding: 2px; -} - -.comment-header, -.microblog-header { - font-style: italic; - margin-top: .3em; -} -.comment .author, -.microblog .author { - font-weight: bold; -} -.comment-subject { - font-weight: bold; -} -.comment-avatar { - float: right; -} -.comment { - border: 1px solid #aaa; - padding: 3px; -} - -div.progress { - margin-top: 1ex; - margin-bottom: 1ex; - border: 1px solid #888; - width: 400px; - background: #eee; - color: black !important; - padding: 1px; -} -div.progress-done { - background: #ea6 !important; - color: black !important; - text-align: center; - padding: 1px; -} - -/* things to hide in printouts */ -@media print { - .actions { display: none; } - .tags { display: none; } - .feedbutton { display: none; } - #searchform { display: none; } - .blogform, #blogform { display: none; } - #backlinks { display: none; } -} - -/* infobox template */ -.infobox { - float: right; - margin-left: 2ex; - margin-top: 1ex; - margin-bottom: 1ex; - padding: 1ex 1ex; - border: 1px solid #aaa; - background: white; - color: black !important; -} - -/* notebox template */ -.notebox { - float: right; - margin-left: 2ex; - margin-top: 1ex; - margin-bottom: 1ex; - padding: 1ex 1ex; - border: 1px solid #aaa; - width: 25%; - background: white; - color: black !important; -} - -/* popup template and backlinks hiding */ -.popup { - border-bottom: 1px dotted #366; - color: #366; -} -.popup .balloon, -.popup .paren, -.popup .expand { - display: none; -} -.popup:hover .balloon, -.popup:focus .balloon { - position: absolute; - display: inline; - margin: 1em 0 0 -2em; - padding: 0.625em; - border: 2px solid; - background-color: #dee; - color: black; -} - -/* form styling */ -fieldset { - margin: 1ex 0; - border: 1px solid black; -} -legend { - padding: 0 1ex; -} -.fb_submit { - float: left; - margin: 2px 0; -} -label.block { - display: block; -} -label.inline { - display: inline; -} -input#openid_identifier { - background: url(wikiicons/openidlogin-bg.gif) no-repeat; - background-color: #fff; - background-position: 0 50%; - color: #000; - padding-left: 18px; -} -input#searchbox { - background: url(wikiicons/search-bg.gif) no-repeat; - background-color: #fff; - background-position: 100% 50%; - color: #000; - padding-right: 16px; -} -/* invalid form fields */ -.fb_invalid { - color: red; - background: white !important; -} -/* required form fields */ -.fb_required { - font-weight: bold; -} - -/* highlight plugin */ -pre.hl { color:#000000; background-color:#ffffff; } -.hl.num { color:#2928ff; } -.hl.esc { color:#ff00ff; } -.hl.str { color:#ff0000; } -.hl.dstr { color:#818100; } -.hl.slc { color:#838183; font-style:italic; } -.hl.com { color:#838183; font-style:italic; } -.hl.dir { color:#008200; } -.hl.sym { color:#000000; } -.hl.line { color:#555555; } -.hl.mark { background-color:#ffffbb; } -.hl.kwa { color:#000000; font-weight:bold; } -.hl.kwb { color:#830000; } -.hl.kwc { color:#000000; font-weight:bold; } -.hl.kwd { color:#010181; } - -/* calendar plugin */ -.month-calendar-day-this-day, -.year-calendar-this-month { - background-color: #eee; -} -.month-calendar-day-head, -.month-calendar-day-nolink, -.month-calendar-day-link, -.month-calendar-day-this-day, -.month-calendar-day-future { - text-align: right; -} -.month-calendar-arrow A:link, -.year-calendar-arrow A:link, -.month-calendar-arrow A:visited, -.year-calendar-arrow A:visited { - text-decoration: none; - font-weight: normal; - font-size: 150%; -} - -/* outlines */ -li.L1 { list-style: upper-roman; } -li.L2 { list-style: decimal; } -li.L3 { list-style: lower-alpha; } -li.L4 { list-style: disc; } -li.L5 { list-style: square; } -li.L6 { list-style: circle; } -li.L7 { list-style: lower-roman; } -li.L8 { list-style: upper-alpha; } - -/* tag cloud */ -.pagecloud { - float: right; - width: 30%; - text-align: center; - padding: 10px 10px; - border: 1px solid #aaa; - background: #eee; - color: black !important; -} -.smallestPC { font-size: 70%; } -.smallPC { font-size: 85%; } -.normalPC { font-size: 100%; } -.bigPC { font-size: 115%; } -.biggestPC { font-size: 130%; } - -/* orange feed button */ -.feedbutton { - background: #ff6600; - color: white !important; - border-left: 1px solid #cc9966; - border-top: 1px solid #ccaa99; - border-right: 1px solid #993300; - border-bottom: 1px solid #331100; - padding: 0px 0.5em 0px 0.5em; - font-family: sans-serif; - font-weight: bold; - font-size: small; - text-decoration: none; - margin-top: 1em; -} -.feedbutton:hover { - color: white !important; - background: #ff9900; -} - -.FlattrButton { - display: none; -} - -/* 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; -} - -.fileupload-content .ui-progressbar { - width: 200px; - height: 20px; -} -.fileupload-content .ui-progressbar-value { - background: url(ikiwiki/images/pbar-ani.gif); -} -/* actiontabs theme for ikiwiki - * - * by svend - */ - -a { - text-decoration: none; - color: #005a9c; -} - -a:hover { - text-decoration: underline; -} - - -hr { - border-style: none; - background-color: #999; - height: 1px; -} - -code, pre { - background: #eee; -} - -pre { - padding: .5em; -} - -body { - margin: 0; - padding: 0; - font-family: sans-serif; - color: black; - background: white; -} - -.pageheader { - margin: 0; - padding: 1em 2em; - position: relative; - overflow: hidden; - background: #eee; - border-color: #999; - border-style: none none solid none; - border-width: 1px; -} - -.pageheader .header { - float: left; - font-size: 120%; -} - -.header { - font-weight: normal; -} - -.title { - display: block; - margin-top: .2em; - font: 140% sans-serif; -} - -#searchform { - position: absolute; - top: 0.5em; - right: 2em; -} - -.pageheader .actions { - position: absolute; - bottom: 0; - right: 2em; - width: 100%; - text-align: right; - padding: 2px; -} - -#content, #comments, #footer { - margin: 1em 2em; -} - -#pageinfo { - border-color: #999; -} - -.inlinepage { - margin: .4em 0; - padding: .4em 0; - border-style: none; - border-top: 1px solid #aaa; -} - -.inlineheader { - font-size: 120%; -} - -h1 { font: 120% sans-serif } -h2 { font: bold 100% sans-serif } -h3, h4, h5, h6 { font: bold 80% sans-serif } - -/* Smaller headings for inline pages */ -.inlinepage h1 { font-size: 110% } -.inlinepage h2 { font-size: 100% } -.inlinepage h3 { font-size: 100% } - -.pageheader .actions ul { - border-style: none -} - -.actions ul { - padding: 0; - border-style: none; -} - -.actions ul li a { - text-decoration: none; -} - -.pageheader .actions ul li { - margin: 0; - padding: .1em .5em 0 .5em; - background: white; - border-color: #999; - border-style: solid solid none solid; - border-width: 1px; -} - -div.recentchanges { - border-style: none; -} - -.pagecloud { - width: auto; -} - -.sidebar { - border-bottom: 0; - border-right: 0; - border-top: 0; - margin-top: 0.5em; - padding: 0 0 0 2ex; - border-color: #999; -} diff --git a/actiontabs/style.scss b/actiontabs/style.scss new file mode 100644 index 0000000..84d4f51 --- /dev/null +++ b/actiontabs/style.scss @@ -0,0 +1,161 @@ +@import "../default/ikiwiki"; +@include ikiwiki; + +/* actiontabs theme for ikiwiki + * + * by svend + */ +a { + text-decoration: none; + color: #005a9c; +} + +a:hover { + text-decoration: underline; +} + +hr { + border-style: none; + background-color: #999; + height: 1px; +} + +code, pre { + background: #eee; +} + +pre { + padding: .5em; +} + +body { + margin: 0; + padding: 0; + font-family: sans-serif; + color: black; + background: white; +} + +.pageheader { + margin: 0; + padding: 1em 2em; + position: relative; + overflow: hidden; + background: #eee; + border-color: #999; + border-style: none none solid none; + border-width: 1px; +} + +.pageheader .header { + float: left; + font-size: 120%; +} + +.header { + font-weight: normal; +} + +.title { + display: block; + margin-top: .2em; + font: 140% sans-serif; +} + +#searchform { + position: absolute; + top: 0.5em; + right: 2em; +} + +.pageheader .actions { + position: absolute; + bottom: 0; + right: 2em; + width: 100%; + text-align: right; + padding: 2px; +} + +#content, #comments, #footer { + margin: 1em 2em; +} + +#pageinfo { + border-color: #999; +} + +.inlinepage { + margin: .4em 0; + padding: .4em 0; + border-style: none; + border-top: 1px solid #aaa; +} + +.inlineheader { + font-size: 120%; +} + +h1 { + font: 120% sans-serif; +} + +h2 { + font: bold 100% sans-serif; +} + +h3, h4, h5, h6 { + font: bold 80% sans-serif; +} + +/* Smaller headings for inline pages */ +.inlinepage h1 { + font-size: 110%; +} + +.inlinepage h2 { + font-size: 100%; +} + +.inlinepage h3 { + font-size: 100%; +} + +.pageheader .actions ul { + border-style: none; +} + +.actions ul { + padding: 0; + border-style: none; +} + +.actions ul li a { + text-decoration: none; +} + +.pageheader .actions ul li { + margin: 0; + padding: .1em .5em 0 .5em; + background: white; + border-color: #999; + border-style: solid solid none solid; + border-width: 1px; +} + +div.recentchanges { + border-style: none; +} + +.pagecloud { + width: auto; +} + +.sidebar { + border-bottom: 0; + border-right: 0; + border-top: 0; + margin-top: 0.5em; + padding: 0 0 0 2ex; + border-color: #999; +} diff --git a/blueview/style.css b/blueview/style.css deleted file mode 100644 index 93276dc..0000000 --- a/blueview/style.css +++ /dev/null @@ -1,783 +0,0 @@ -/* ikiwiki style sheet */ - -/* Note that instead of modifying this style sheet, you can instead edit - * local.css and use it to override or change settings in this one. - */ - -/* html5 compat */ -article, -header, -footer, -nav { - display: block; -} - -.header { - margin: 0; - font-size: 140%; - font-weight: bold; - line-height: 1em; - display: block; -} - -.inlineheader .author { - margin: 0; - font-size: 112%; - font-weight: bold; - display: block; -} - -.actions ul { - margin: 0; - padding: 6px .4em; - height: 1em; - list-style-type: none; -} -.actions li { - display: inline; - padding: .2em; -} -.pageheader .actions ul { - border-bottom: 1px solid #000; -} - -.inlinepage .actions ul { - border-bottom: 0; -} - -#otherlanguages ul { - margin: 0; - padding: 6px; - list-style-type: none; -} -#otherlanguages li { - display: inline; - padding: .2em .4em; -} -.pageheader #otherlanguages { - border-bottom: 1px solid #000; -} - -.inlinecontent { - margin-top: .4em; -} - -.pagefooter, -.inlinefooter, -.comments { - clear: both; -} - -#pageinfo { - margin: 1em 0; - border-top: 1px solid #000; -} - -.tags { - margin-top: 1em; -} - -.inlinepage .tags { - display: inline; -} - -.mapparent { - text-decoration: none; -} - -.img caption { - font-size: 80%; - caption-side: bottom; - text-align: center; -} - -img.img { - margin: 0.5ex; -} - -.align-left { - float:left; -} - -.align-right { - float:right; -} - -#backlinks { - margin-top: 1em; -} - -#searchform { - display: inline; - float: right; -} - -#editcontent { - width: 98%; -} - -.editcontentdiv { - width: auto; - overflow: auto; -} - -img { - border-style: none; -} - -pre { - overflow: auto; -} - -div.recentchanges { - border-style: solid; - border-width: 1px; - overflow: auto; - width: auto; - clear: none; - background: #eee; - color: black !important; -} -.recentchanges .metadata { - padding: 0px 0.5em; -} -.recentchanges .changelog { - font-style: italic; - clear: both; - display: block; - padding: 1px 2px; - background: white !important; - color: black !important; -} -.recentchanges .desc { - display: none; -} -.recentchanges .diff { - display: none; -} -.recentchanges .committer { - float: left; - margin: 0; - width: 40%; -} -.recentchanges .committype { - float: left; - margin: 0; - width: 5%; - font-size: small; -} -.recentchanges .changedate { - float: left; - margin: 0; - width: 35%; - font-size: small; -} -.recentchanges .pagelinks, -.recentchanges .revert { - float: right; - margin: 0; - width: 60%; -} - -.blogform, #blogform { - padding: 10px 10px; - border: 1px solid #aaa; - background: #eee; - color: black !important; - width: auto; - overflow: auto; -} - -.inlinepage { - padding: 10px 10px; - border: 1px solid #aaa; - overflow: auto; -} - -.pagedate, -.pagelicense, -.pagecopyright { - font-style: italic; - display: block; - margin-top: 1em; -} - -.error { - color: #C00; -} - -.sidebar { - width: 20ex; - float: right; - margin-left: 4px; - margin-bottom: 4px; - margin-top: -1px; - padding: 0ex 2ex; - background: white; - border: 1px solid black; - color: black !important; -} - -hr.poll { - height: 10pt; - color: white !important; - background: #eee; - border: 2px solid black; -} -div.poll { - margin-top: 1ex; - margin-bottom: 1ex; - padding: 1ex 1ex; - border: 1px solid #aaa; -} - -span.color { - padding: 2px; -} - -.comment-header, -.microblog-header { - font-style: italic; - margin-top: .3em; -} -.comment .author, -.microblog .author { - font-weight: bold; -} -.comment-subject { - font-weight: bold; -} -.comment-avatar { - float: right; -} -.comment { - border: 1px solid #aaa; - padding: 3px; -} - -div.progress { - margin-top: 1ex; - margin-bottom: 1ex; - border: 1px solid #888; - width: 400px; - background: #eee; - color: black !important; - padding: 1px; -} -div.progress-done { - background: #ea6 !important; - color: black !important; - text-align: center; - padding: 1px; -} - -/* things to hide in printouts */ -@media print { - .actions { display: none; } - .tags { display: none; } - .feedbutton { display: none; } - #searchform { display: none; } - .blogform, #blogform { display: none; } - #backlinks { display: none; } -} - -/* infobox template */ -.infobox { - float: right; - margin-left: 2ex; - margin-top: 1ex; - margin-bottom: 1ex; - padding: 1ex 1ex; - border: 1px solid #aaa; - background: white; - color: black !important; -} - -/* notebox template */ -.notebox { - float: right; - margin-left: 2ex; - margin-top: 1ex; - margin-bottom: 1ex; - padding: 1ex 1ex; - border: 1px solid #aaa; - width: 25%; - background: white; - color: black !important; -} - -/* popup template and backlinks hiding */ -.popup { - border-bottom: 1px dotted #366; - color: #366; -} -.popup .balloon, -.popup .paren, -.popup .expand { - display: none; -} -.popup:hover .balloon, -.popup:focus .balloon { - position: absolute; - display: inline; - margin: 1em 0 0 -2em; - padding: 0.625em; - border: 2px solid; - background-color: #dee; - color: black; -} - -/* form styling */ -fieldset { - margin: 1ex 0; - border: 1px solid black; -} -legend { - padding: 0 1ex; -} -.fb_submit { - float: left; - margin: 2px 0; -} -label.block { - display: block; -} -label.inline { - display: inline; -} -input#openid_identifier { - background: url(wikiicons/openidlogin-bg.gif) no-repeat; - background-color: #fff; - background-position: 0 50%; - color: #000; - padding-left: 18px; -} -input#searchbox { - background: url(wikiicons/search-bg.gif) no-repeat; - background-color: #fff; - background-position: 100% 50%; - color: #000; - padding-right: 16px; -} -/* invalid form fields */ -.fb_invalid { - color: red; - background: white !important; -} -/* required form fields */ -.fb_required { - font-weight: bold; -} - -/* highlight plugin */ -pre.hl { color:#000000; background-color:#ffffff; } -.hl.num { color:#2928ff; } -.hl.esc { color:#ff00ff; } -.hl.str { color:#ff0000; } -.hl.dstr { color:#818100; } -.hl.slc { color:#838183; font-style:italic; } -.hl.com { color:#838183; font-style:italic; } -.hl.dir { color:#008200; } -.hl.sym { color:#000000; } -.hl.line { color:#555555; } -.hl.mark { background-color:#ffffbb; } -.hl.kwa { color:#000000; font-weight:bold; } -.hl.kwb { color:#830000; } -.hl.kwc { color:#000000; font-weight:bold; } -.hl.kwd { color:#010181; } - -/* calendar plugin */ -.month-calendar-day-this-day, -.year-calendar-this-month { - background-color: #eee; -} -.month-calendar-day-head, -.month-calendar-day-nolink, -.month-calendar-day-link, -.month-calendar-day-this-day, -.month-calendar-day-future { - text-align: right; -} -.month-calendar-arrow A:link, -.year-calendar-arrow A:link, -.month-calendar-arrow A:visited, -.year-calendar-arrow A:visited { - text-decoration: none; - font-weight: normal; - font-size: 150%; -} - -/* outlines */ -li.L1 { list-style: upper-roman; } -li.L2 { list-style: decimal; } -li.L3 { list-style: lower-alpha; } -li.L4 { list-style: disc; } -li.L5 { list-style: square; } -li.L6 { list-style: circle; } -li.L7 { list-style: lower-roman; } -li.L8 { list-style: upper-alpha; } - -/* tag cloud */ -.pagecloud { - float: right; - width: 30%; - text-align: center; - padding: 10px 10px; - border: 1px solid #aaa; - background: #eee; - color: black !important; -} -.smallestPC { font-size: 70%; } -.smallPC { font-size: 85%; } -.normalPC { font-size: 100%; } -.bigPC { font-size: 115%; } -.biggestPC { font-size: 130%; } - -/* orange feed button */ -.feedbutton { - background: #ff6600; - color: white !important; - border-left: 1px solid #cc9966; - border-top: 1px solid #ccaa99; - border-right: 1px solid #993300; - border-bottom: 1px solid #331100; - padding: 0px 0.5em 0px 0.5em; - font-family: sans-serif; - font-weight: bold; - font-size: small; - text-decoration: none; - margin-top: 1em; -} -.feedbutton:hover { - color: white !important; - background: #ff9900; -} - -.FlattrButton { - display: none; -} - -/* 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; -} - -.fileupload-content .ui-progressbar { - width: 200px; - height: 20px; -} -.fileupload-content .ui-progressbar-value { - background: url(ikiwiki/images/pbar-ani.gif); -} -/* bzed theme for ikiwiki - * - * Copyright (C) 2010 Bernd Zeimetz - * Licensed under same license as ikiwiki: GPL v2 or later - * - * Parts of this file are based on the awesome YUI, - * these parts will stay under the BSD license, - * but you're free to apply the GPLv2 to them, of course. - */ - - - -/* ------------------------------------------------------------------------------------------------- -Based on reset-fonts-grids.css from yui. -Copyright (c) 2008, Yahoo! Inc. All rights reserved. -Code licensed under the BSD License: -http://developer.yahoo.net/yui/license.txt -version: 2.5.1 -*/ -body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,legend,p,blockquote,th,td{margin:0;padding:0;} -table{border-collapse:collapse;border-spacing:0;} -img{border:0;} -address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;} -li{list-style:none;} -caption,th{text-align:left;} -h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;} -q:before,q:after{content:'';} -abbr,acronym {border:0;font-variant:normal;} -sup {vertical-align:text-top;} -sub {vertical-align:text-bottom;} -input,textarea,select{font-family:inherit;font-size: 13px/1.23;font-weight:normal;} -input,textarea,select{*font-size:100%;} -legend{color:#000;} -/* body {font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;} */ -body {font:13px/1.231 "Lucida Grande",Verdana,Lucida,Helvetica,Arial,sans-serif;*font-size:small;*font:x-small;} -table {font-size:inherit;font:100%;} -pre,code,kbd,samp,tt{font-family:monospace;} - - -body{text-align:left;} -.inlinefooter{clear:both;} - -/* #doc,#doc2,#doc3,#doc4,.yui-t1,.yui-t2,.yui-t3,.yui-t4,.yui-t5,.yui-t6,.yui-t7{margin:auto;text-align:left;width:57.69em;*width:56.25em;min-width:750px;} */ -.page {margin:auto;text-align:left;width:57.69em;*width:56.25em;min-width:750px;} - -/* #doc3{margin:auto 10px;width:auto;} */ -.page {margin:auto 10px;width:auto;} - -#pagebody, .sidebar{position:relative;} -#pagebody, .sidebar{_position:static;} -#pagebody {position:static;} -.sidebar {float:right;width:16.5em;*width:16em;} -#pagebody {margin-right:19em;*margin-right:18.5em;} -/* #content {float:none;width:auto;} */ -#pagebody:after, .sidebar:after, .page:after{content:".";display:block;height:0;clear:both;visibility:hidden;} -.page f{zoom:1;} - -/* ------------------------------------------------------------------------------------------------ - * Taken from base.css, part of YUI's CSS Foundation - * Copyright (c) 2008, Yahoo! Inc. All rights reserved. - * Code licensed under the BSD License: - * http://developer.yahoo.net/yui/license.txt - * version: 2.5.1 -*/ -h1 { - /*18px via YUI Fonts CSS foundation*/ - font-size:138.5%; -} -h2 { - /*16px via YUI Fonts CSS foundation*/ - font-size:123.1%; -} -h3 { - /*14px via YUI Fonts CSS foundation*/ - font-size:108%; -} -h1,h2,h3 { - /* top & bottom margin based on font size */ - margin:1em 0; -} -h1,h2,h3,h4,h5,h6,strong { - /*bringing boldness back to headers and the strong element*/ - font-weight:bold; -} -abbr,acronym { - /*indicating to users that more info is available */ - border-bottom:1px dotted #000; - cursor:help; -} -em { - /*bringing italics back to the em element*/ - font-style:italic; -} -blockquote,ul,ol,dl { - /*giving blockquotes and lists room to breath*/ - margin:1em; -} -ol,ul,dl { - /*bringing lists on to the page with breathing room */ - margin-left:2em; -} -ol li { - /*giving OL's LIs generated numbers*/ - list-style: decimal outside; -} -ul li { - /*giving UL's LIs generated disc markers*/ - list-style: disc outside; -} -dl dd { - /*giving UL's LIs generated numbers*/ - margin-left:1em; -} -th,td { - /*borders and padding to make the table readable*/ - border:1px solid #000; - padding:.5em; -} -th { - /*distinguishing table headers from data cells*/ - font-weight:bold; - text-align:center; -} -caption { - /*coordinated margin to match cell's padding*/ - margin-bottom:.5em; - /*centered so it doesn't blend in to other content*/ - text-align:center; -} -p,fieldset,table,pre { - /*so things don't run into each other*/ - margin-bottom:1em; -} - -#searchbox { - width:21.5em;*width:21em; -} - - - -/* ------------------------------------------------------------------------------------------------ - * All CSS below is - * Copyright (C) 2010 Bernd Zeimetz - * Licensed under same license as ikiwiki: GPL v2 or later */ - -.page, .pageheader, .sidebar, #content, #comments, .inlinepage, .recentchanges, .pageheader .actions ul, #pagebody { - border: none; -} - -html, body { - color:#000; - /* background-image: url('body_background.png'); - background-repeat: repeat; */ - background-color: #8da1b8; -} - -body { - padding-left: 5%; - padding-right: 5%; - padding-top: 1em; - padding-bottom: 1em; -} - -.page { - background: #fff; - border: outset #ccc; - padding-left: 1em; - padding-right: 1em; - padding-top: 1em; -} - -.pageheader { - background-image: url('header_background.png'); - background-repeat: repeat-x; - height: 100px; - padding-left: 1em; - padding-right: 1em; - padding-bottom: 1em; - padding-top: 1em; -} - -.pageheader .header { - text-align: top; - clear: both; -} - -.pageheader .header form { - padding: 0em 0em 0em 0em; - float: right; - margin-top: 0.5em; -} - -.pageheader .header .title, .pageheader .header .parentlinks, - .inlinepage .inlineheader, - h1, h2, h3, h4, h5, h6 { - margin-top: 1em; - font-weight: bold; -} - -.pageheader .header .title, .pageheader .header .parentlinks, .pageheader .actions ul li, .pageheader .header span, .pageheader #otherlanguages ul li { - padding: 0.25em 0.25em 0.25em 0.25em; - background-image: url('background_darkness.png'); - background-repeat: repeat; - color: white; -} - -.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a, .pageheader #otherlanguages ul li a { - color: white; - text-decoration: none; -} - -.pageheader .actions { - text-align: right; - vertical-align: bottom; - clear: both; -} - -#pagebody { - padding-right: 1em; - padding-bottom: 2em; - border-right: ridge #eee; - clear: none; -} - -#content a, #comments a, .sidebar a { - color: #315485; - text-decoration: none; - font-weight: bold; -} - -.sidebar h2 { - border-bottom: ridge #eee; - padding-right: 0; -} - -.sidebar .menu { - margin-left: 1em; -} - - -.inlinepage, .recentchanges, div.recentchanges { - clear: none !important; - margin-bottom: 2em; -} - -.inlinefooter { - border-top: 1px dotted #315485; -} - -.inlinefooter .pagedate, .inlinefooter .tags { - display: inline; - clear: none; - margin-right: 2em; -} - -.calendar .month-calendar th, .calendar .month-calendar td { - padding: 0.22em; -} - -@media print { - .sidebar, .page .pageheader .header .parentlinks { - content:"."; - display:block; - height:0; - visibility:hidden; - } - .page { - padding: 1em 1em 1em 1em; - } - .pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a { - color: #315485; - } - #content, #comments, #pagebody { - margin-right: 0; - *margin-right: 0; - border-right: none; - } - -} - diff --git a/blueview/style.scss b/blueview/style.scss new file mode 100644 index 0000000..4557adb --- /dev/null +++ b/blueview/style.scss @@ -0,0 +1,397 @@ +@import "../default/ikiwiki"; +@include ikiwiki-boilerplate; + +/* bzed theme for ikiwiki + * + * Copyright (C) 2010 Bernd Zeimetz + * Licensed under same license as ikiwiki: GPL v2 or later + * + * Parts of this file are based on the awesome YUI, + * these parts will stay under the BSD license, + * but you're free to apply the GPLv2 to them, of course. + */ + +// TODO: include only relevant parts, and move below reset +@include ikiwiki-style; + +/* ------------------------------------------------------------------------------------------------- +Based on reset-fonts-grids.css from yui. +Copyright (c) 2008, Yahoo! Inc. All rights reserved. +Code licensed under the BSD License: +http://developer.yahoo.net/yui/license.txt +version: 2.5.1 +*/ +body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, legend, p, blockquote, th, td { + margin: 0; + padding: 0; +} + +table { + border-collapse: collapse; + border-spacing: 0; +} + +img { + border: 0; +} + +address, caption, cite, code, dfn, em, strong, th, var { + font-style: normal; + font-weight: normal; +} + +li { + list-style: none; +} + +caption, th { + text-align: left; +} + +h1, h2, h3, h4, h5, h6 { + font-size: 100%; + font-weight: normal; +} + +q:before, q:after { + content: ''; +} + +abbr, acronym { + border: 0; + font-variant: normal; +} + +sup { + vertical-align: text-top; +} + +sub { + vertical-align: text-bottom; +} + +input, textarea, select { + font-family: inherit; + font-size: 13px/1.23; + font-weight: normal; +} + +input, textarea, select { + *font-size: 100%; +} + +legend { + color: #000; +} + +/* body {font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;} */ +body { + font: 13px/1.231 "Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif; + *font-size: small; + *font: x-small; +} + +table { + font-size: inherit; + font: 100%; +} + +pre, code, kbd, samp, tt { + font-family: monospace; +} + +body { + text-align: left; +} + +.inlinefooter { + clear: both; +} + +/* #doc,#doc2,#doc3,#doc4,.yui-t1,.yui-t2,.yui-t3,.yui-t4,.yui-t5,.yui-t6,.yui-t7{margin:auto;text-align:left;width:57.69em;*width:56.25em;min-width:750px;} */ +.page { + margin: auto; + text-align: left; + width: 57.69em; + *width: 56.25em; + min-width: 750px; +} + +/* #doc3{margin:auto 10px;width:auto;} */ +.page { + margin: auto 10px; + width: auto; +} + +#pagebody, .sidebar { + position: relative; +} + +#pagebody, .sidebar { + _position: static; +} + +#pagebody { + position: static; +} + +.sidebar { + float: right; + width: 16.5em; + *width: 16em; +} + +#pagebody { + margin-right: 19em; + *margin-right: 18.5em; +} + +/* #content {float:none;width:auto;} */ +#pagebody:after, .sidebar:after, .page:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; +} + +.page f { + zoom: 1; +} + +/* ------------------------------------------------------------------------------------------------ + * Taken from base.css, part of YUI's CSS Foundation + * Copyright (c) 2008, Yahoo! Inc. All rights reserved. + * Code licensed under the BSD License: + * http://developer.yahoo.net/yui/license.txt + * version: 2.5.1 +*/ +h1 { + /*18px via YUI Fonts CSS foundation*/ + font-size: 138.5%; +} + +h2 { + /*16px via YUI Fonts CSS foundation*/ + font-size: 123.1%; +} + +h3 { + /*14px via YUI Fonts CSS foundation*/ + font-size: 108%; +} + +h1, h2, h3 { + /* top & bottom margin based on font size */ + margin: 1em 0; +} + +h1, h2, h3, h4, h5, h6, strong { + /*bringing boldness back to headers and the strong element*/ + font-weight: bold; +} + +abbr, acronym { + /*indicating to users that more info is available */ + border-bottom: 1px dotted #000; + cursor: help; +} + +em { + /*bringing italics back to the em element*/ + font-style: italic; +} + +blockquote, ul, ol, dl { + /*giving blockquotes and lists room to breath*/ + margin: 1em; +} + +ol, ul, dl { + /*bringing lists on to the page with breathing room */ + margin-left: 2em; +} + +ol li { + /*giving OL's LIs generated numbers*/ + list-style: decimal outside; +} + +ul li { + /*giving UL's LIs generated disc markers*/ + list-style: disc outside; +} + +dl dd { + /*giving UL's LIs generated numbers*/ + margin-left: 1em; +} + +th, td { + /*borders and padding to make the table readable*/ + border: 1px solid #000; + padding: .5em; +} + +th { + /*distinguishing table headers from data cells*/ + font-weight: bold; + text-align: center; +} + +caption { + /*coordinated margin to match cell's padding*/ + margin-bottom: .5em; + /*centered so it doesn't blend in to other content*/ + text-align: center; +} + +p, fieldset, table, pre { + /*so things don't run into each other*/ + margin-bottom: 1em; +} + +#searchbox { + width: 21.5em; + *width: 21em; +} + +/* ------------------------------------------------------------------------------------------------ + * All CSS below is + * Copyright (C) 2010 Bernd Zeimetz + * Licensed under same license as ikiwiki: GPL v2 or later */ +.page, .pageheader, .sidebar, #content, #comments, .inlinepage, .recentchanges, .pageheader .actions ul, #pagebody { + border: none; +} + +html, body { + color: #000; + /* background-image: url('body_background.png'); + background-repeat: repeat; */ + background-color: #8da1b8; +} + +body { + padding-left: 5%; + padding-right: 5%; + padding-top: 1em; + padding-bottom: 1em; +} + +.page { + background: #fff; + border: outset #ccc; + padding-left: 1em; + padding-right: 1em; + padding-top: 1em; +} + +.pageheader { + background-image: url("header_background.png"); + background-repeat: repeat-x; + height: 100px; + padding-left: 1em; + padding-right: 1em; + padding-bottom: 1em; + padding-top: 1em; +} + +.pageheader .header { + text-align: top; + clear: both; +} + +.pageheader .header form { + padding: 0em 0em 0em 0em; + float: right; + margin-top: 0.5em; +} + +.pageheader .header .title, .pageheader .header .parentlinks, +.inlinepage .inlineheader, +h1, h2, h3, h4, h5, h6 { + margin-top: 1em; + font-weight: bold; +} + +.pageheader .header .title, .pageheader .header .parentlinks, .pageheader .actions ul li, .pageheader .header span, .pageheader #otherlanguages ul li { + padding: 0.25em 0.25em 0.25em 0.25em; + background-image: url("background_darkness.png"); + background-repeat: repeat; + color: white; +} + +.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a, .pageheader #otherlanguages ul li a { + color: white; + text-decoration: none; +} + +.pageheader .actions { + text-align: right; + vertical-align: bottom; + clear: both; +} + +#pagebody { + padding-right: 1em; + padding-bottom: 2em; + border-right: ridge #eee; + clear: none; +} + +#content a, #comments a, .sidebar a { + color: #315485; + text-decoration: none; + font-weight: bold; +} + +.sidebar h2 { + border-bottom: ridge #eee; + padding-right: 0; +} + +.sidebar .menu { + margin-left: 1em; +} + +.inlinepage, .recentchanges, div.recentchanges { + clear: none !important; + margin-bottom: 2em; +} + +.inlinefooter { + border-top: 1px dotted #315485; +} + +.inlinefooter .pagedate, .inlinefooter .tags { + display: inline; + clear: none; + margin-right: 2em; +} + +.calendar .month-calendar th, .calendar .month-calendar td { + padding: 0.22em; +} + +@media print { + .sidebar, .page .pageheader .header .parentlinks { + content: "."; + display: block; + height: 0; + visibility: hidden; + } + + .page { + padding: 1em 1em 1em 1em; + } + + .pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a { + color: #315485; + } + + #content, #comments, #pagebody { + margin-right: 0; + *margin-right: 0; + border-right: none; + } +} diff --git a/default/style.css b/default/_ikiwiki.scss index 7bbfe5d..f42a5f6 100644 --- a/default/style.css +++ b/default/_ikiwiki.scss @@ -1,9 +1,11 @@ +@mixin ikiwiki-boilerplate { /* ikiwiki style sheet */ - /* Note that instead of modifying this style sheet, you can instead edit * local.css and use it to override or change settings in this one. */ +} +@mixin ikiwiki-reset { /* html5 compat */ article, header, @@ -11,7 +13,9 @@ footer, nav { display: block; } +} +@mixin ikiwiki-style { .header { margin: 0; font-size: 140%; @@ -33,10 +37,12 @@ nav { height: 1em; list-style-type: none; } + .actions li { display: inline; padding: .2em; } + .pageheader .actions ul { border-bottom: 1px solid #000; } @@ -50,10 +56,12 @@ nav { padding: 6px; list-style-type: none; } + #otherlanguages li { display: inline; padding: .2em .4em; } + .pageheader #otherlanguages { border-bottom: 1px solid #000; } @@ -78,7 +86,7 @@ nav { } .inlinepage .tags { - display: inline; + display: inline; } .mapparent { @@ -96,11 +104,11 @@ img.img { } .align-left { - float:left; + float: left; } .align-right { - float:right; + float: right; } #backlinks { @@ -138,9 +146,11 @@ div.recentchanges { background: #eee; color: black !important; } + .recentchanges .metadata { padding: 0px 0.5em; } + .recentchanges .changelog { font-style: italic; clear: both; @@ -149,29 +159,35 @@ div.recentchanges { background: white !important; color: black !important; } + .recentchanges .desc { display: none; } + .recentchanges .diff { display: none; } + .recentchanges .committer { float: left; margin: 0; width: 40%; } + .recentchanges .committype { float: left; margin: 0; width: 5%; font-size: small; } + .recentchanges .changedate { float: left; margin: 0; width: 35%; font-size: small; } + .recentchanges .pagelinks, .recentchanges .revert { float: right; @@ -179,7 +195,8 @@ div.recentchanges { width: 60%; } -.blogform, #blogform { +.blogform, +#blogform { padding: 10px 10px; border: 1px solid #aaa; background: #eee; @@ -224,6 +241,7 @@ hr.poll { background: #eee; border: 2px solid black; } + div.poll { margin-top: 1ex; margin-bottom: 1ex; @@ -240,16 +258,20 @@ span.color { font-style: italic; margin-top: .3em; } + .comment .author, .microblog .author { font-weight: bold; } + .comment-subject { font-weight: bold; } + .comment-avatar { float: right; } + .comment { border: 1px solid #aaa; padding: 3px; @@ -264,6 +286,7 @@ div.progress { color: black !important; padding: 1px; } + div.progress-done { background: #ea6 !important; color: black !important; @@ -273,12 +296,30 @@ div.progress-done { /* things to hide in printouts */ @media print { - .actions { display: none; } - .tags { display: none; } - .feedbutton { display: none; } - #searchform { display: none; } - .blogform, #blogform { display: none; } - #backlinks { display: none; } + .actions { + display: none; + } + + .tags { + display: none; + } + + .feedbutton { + display: none; + } + + #searchform { + display: none; + } + + .blogform, + #blogform { + display: none; + } + + #backlinks { + display: none; + } } /* infobox template */ @@ -311,11 +352,13 @@ div.progress-done { border-bottom: 1px dotted #366; color: #366; } + .popup .balloon, .popup .paren, .popup .expand { display: none; } + .popup:hover .balloon, .popup:focus .balloon { position: absolute; @@ -332,19 +375,24 @@ fieldset { margin: 1ex 0; border: 1px solid black; } + legend { padding: 0 1ex; } + .fb_submit { float: left; margin: 2px 0; } -label.block { - display: block; + +label.block { + display: block; } -label.inline { + +label.inline { display: inline; } + input#openid_identifier { background: url(wikiicons/openidlogin-bg.gif) no-repeat; background-color: #fff; @@ -352,6 +400,7 @@ input#openid_identifier { color: #000; padding-left: 18px; } + input#searchbox { background: url(wikiicons/search-bg.gif) no-repeat; background-color: #fff; @@ -359,38 +408,90 @@ input#searchbox { color: #000; padding-right: 16px; } + /* invalid form fields */ .fb_invalid { color: red; background: white !important; } + /* required form fields */ .fb_required { font-weight: bold; } /* highlight plugin */ -pre.hl { color:#000000; background-color:#ffffff; } -.hl.num { color:#2928ff; } -.hl.esc { color:#ff00ff; } -.hl.str { color:#ff0000; } -.hl.dstr { color:#818100; } -.hl.slc { color:#838183; font-style:italic; } -.hl.com { color:#838183; font-style:italic; } -.hl.dir { color:#008200; } -.hl.sym { color:#000000; } -.hl.line { color:#555555; } -.hl.mark { background-color:#ffffbb; } -.hl.kwa { color:#000000; font-weight:bold; } -.hl.kwb { color:#830000; } -.hl.kwc { color:#000000; font-weight:bold; } -.hl.kwd { color:#010181; } +pre.hl { + color: #000000; + background-color: #ffffff; +} + +.hl.num { + color: #2928ff; +} + +.hl.esc { + color: #ff00ff; +} + +.hl.str { + color: #ff0000; +} + +.hl.dstr { + color: #818100; +} + +.hl.slc { + color: #838183; + font-style: italic; +} + +.hl.com { + color: #838183; + font-style: italic; +} + +.hl.dir { + color: #008200; +} + +.hl.sym { + color: #000000; +} + +.hl.line { + color: #555555; +} + +.hl.mark { + background-color: #ffffbb; +} + +.hl.kwa { + color: #000000; + font-weight: bold; +} + +.hl.kwb { + color: #830000; +} + +.hl.kwc { + color: #000000; + font-weight: bold; +} + +.hl.kwd { + color: #010181; +} /* calendar plugin */ .month-calendar-day-this-day, .year-calendar-this-month { background-color: #eee; } + .month-calendar-day-head, .month-calendar-day-nolink, .month-calendar-day-link, @@ -398,6 +499,7 @@ pre.hl { color:#000000; background-color:#ffffff; } .month-calendar-day-future { text-align: right; } + .month-calendar-arrow A:link, .year-calendar-arrow A:link, .month-calendar-arrow A:visited, @@ -408,14 +510,37 @@ pre.hl { color:#000000; background-color:#ffffff; } } /* outlines */ -li.L1 { list-style: upper-roman; } -li.L2 { list-style: decimal; } -li.L3 { list-style: lower-alpha; } -li.L4 { list-style: disc; } -li.L5 { list-style: square; } -li.L6 { list-style: circle; } -li.L7 { list-style: lower-roman; } -li.L8 { list-style: upper-alpha; } +li.L1 { + list-style: upper-roman; +} + +li.L2 { + list-style: decimal; +} + +li.L3 { + list-style: lower-alpha; +} + +li.L4 { + list-style: disc; +} + +li.L5 { + list-style: square; +} + +li.L6 { + list-style: circle; +} + +li.L7 { + list-style: lower-roman; +} + +li.L8 { + list-style: upper-alpha; +} /* tag cloud */ .pagecloud { @@ -427,11 +552,26 @@ li.L8 { list-style: upper-alpha; } background: #eee; color: black !important; } -.smallestPC { font-size: 70%; } -.smallPC { font-size: 85%; } -.normalPC { font-size: 100%; } -.bigPC { font-size: 115%; } -.biggestPC { font-size: 130%; } + +.smallestPC { + font-size: 70%; +} + +.smallPC { + font-size: 85%; +} + +.normalPC { + font-size: 100%; +} + +.bigPC { + font-size: 115%; +} + +.biggestPC { + font-size: 130%; +} /* orange feed button */ .feedbutton { @@ -448,6 +588,7 @@ li.L8 { list-style: upper-alpha; } text-decoration: none; margin-top: 1em; } + .feedbutton:hover { color: white !important; background: #ff9900; @@ -461,35 +602,44 @@ li.L8 { list-style: upper-alpha; } #openid_choice { display: none; } + #openid_input_area { clear: both; padding: 10px; } -#openid_btns, #openid_btns br { + +#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; } @@ -501,3 +651,9 @@ a.openid_large_btn:focus { .fileupload-content .ui-progressbar-value { background: url(ikiwiki/images/pbar-ani.gif); } + +@mixin ikiwiki { + @include ikiwiki-boilerplate; + @include ikiwiki-reset; + @include ikiwiki-style; +} diff --git a/default/style.scss b/default/style.scss new file mode 100644 index 0000000..a23d692 --- /dev/null +++ b/default/style.scss @@ -0,0 +1,2 @@ +@import "ikiwiki"; +@include ikiwiki; diff --git a/goldtype/style.css b/goldtype/style.css deleted file mode 100644 index 9593ed6..0000000 --- a/goldtype/style.css +++ /dev/null @@ -1,806 +0,0 @@ -/* ikiwiki style sheet */ - -/* Note that instead of modifying this style sheet, you can instead edit - * local.css and use it to override or change settings in this one. - */ - -/* html5 compat */ -article, -header, -footer, -nav { - display: block; -} - -.header { - margin: 0; - font-size: 140%; - font-weight: bold; - line-height: 1em; - display: block; -} - -.inlineheader .author { - margin: 0; - font-size: 112%; - font-weight: bold; - display: block; -} - -.actions ul { - margin: 0; - padding: 6px .4em; - height: 1em; - list-style-type: none; -} -.actions li { - display: inline; - padding: .2em; -} -.pageheader .actions ul { - border-bottom: 1px solid #000; -} - -.inlinepage .actions ul { - border-bottom: 0; -} - -#otherlanguages ul { - margin: 0; - padding: 6px; - list-style-type: none; -} -#otherlanguages li { - display: inline; - padding: .2em .4em; -} -.pageheader #otherlanguages { - border-bottom: 1px solid #000; -} - -.inlinecontent { - margin-top: .4em; -} - -.pagefooter, -.inlinefooter, -.comments { - clear: both; -} - -#pageinfo { - margin: 1em 0; - border-top: 1px solid #000; -} - -.tags { - margin-top: 1em; -} - -.inlinepage .tags { - display: inline; -} - -.mapparent { - text-decoration: none; -} - -.img caption { - font-size: 80%; - caption-side: bottom; - text-align: center; -} - -img.img { - margin: 0.5ex; -} - -.align-left { - float:left; -} - -.align-right { - float:right; -} - -#backlinks { - margin-top: 1em; -} - -#searchform { - display: inline; - float: right; -} - -#editcontent { - width: 98%; -} - -.editcontentdiv { - width: auto; - overflow: auto; -} - -img { - border-style: none; -} - -pre { - overflow: auto; -} - -div.recentchanges { - border-style: solid; - border-width: 1px; - overflow: auto; - width: auto; - clear: none; - background: #eee; - color: black !important; -} -.recentchanges .metadata { - padding: 0px 0.5em; -} -.recentchanges .changelog { - font-style: italic; - clear: both; - display: block; - padding: 1px 2px; - background: white !important; - color: black !important; -} -.recentchanges .desc { - display: none; -} -.recentchanges .diff { - display: none; -} -.recentchanges .committer { - float: left; - margin: 0; - width: 40%; -} -.recentchanges .committype { - float: left; - margin: 0; - width: 5%; - font-size: small; -} -.recentchanges .changedate { - float: left; - margin: 0; - width: 35%; - font-size: small; -} -.recentchanges .pagelinks, -.recentchanges .revert { - float: right; - margin: 0; - width: 60%; -} - -.blogform, #blogform { - padding: 10px 10px; - border: 1px solid #aaa; - background: #eee; - color: black !important; - width: auto; - overflow: auto; -} - -.inlinepage { - padding: 10px 10px; - border: 1px solid #aaa; - overflow: auto; -} - -.pagedate, -.pagelicense, -.pagecopyright { - font-style: italic; - display: block; - margin-top: 1em; -} - -.error { - color: #C00; -} - -.sidebar { - width: 20ex; - float: right; - margin-left: 4px; - margin-bottom: 4px; - margin-top: -1px; - padding: 0ex 2ex; - background: white; - border: 1px solid black; - color: black !important; -} - -hr.poll { - height: 10pt; - color: white !important; - background: #eee; - border: 2px solid black; -} -div.poll { - margin-top: 1ex; - margin-bottom: 1ex; - padding: 1ex 1ex; - border: 1px solid #aaa; -} - -span.color { - padding: 2px; -} - -.comment-header, -.microblog-header { - font-style: italic; - margin-top: .3em; -} -.comment .author, -.microblog .author { - font-weight: bold; -} -.comment-subject { - font-weight: bold; -} -.comment-avatar { - float: right; -} -.comment { - border: 1px solid #aaa; - padding: 3px; -} - -div.progress { - margin-top: 1ex; - margin-bottom: 1ex; - border: 1px solid #888; - width: 400px; - background: #eee; - color: black !important; - padding: 1px; -} -div.progress-done { - background: #ea6 !important; - color: black !important; - text-align: center; - padding: 1px; -} - -/* things to hide in printouts */ -@media print { - .actions { display: none; } - .tags { display: none; } - .feedbutton { display: none; } - #searchform { display: none; } - .blogform, #blogform { display: none; } - #backlinks { display: none; } -} - -/* infobox template */ -.infobox { - float: right; - margin-left: 2ex; - margin-top: 1ex; - margin-bottom: 1ex; - padding: 1ex 1ex; - border: 1px solid #aaa; - background: white; - color: black !important; -} - -/* notebox template */ -.notebox { - float: right; - margin-left: 2ex; - margin-top: 1ex; - margin-bottom: 1ex; - padding: 1ex 1ex; - border: 1px solid #aaa; - width: 25%; - background: white; - color: black !important; -} - -/* popup template and backlinks hiding */ -.popup { - border-bottom: 1px dotted #366; - color: #366; -} -.popup .balloon, -.popup .paren, -.popup .expand { - display: none; -} -.popup:hover .balloon, -.popup:focus .balloon { - position: absolute; - display: inline; - margin: 1em 0 0 -2em; - padding: 0.625em; - border: 2px solid; - background-color: #dee; - color: black; -} - -/* form styling */ -fieldset { - margin: 1ex 0; - border: 1px solid black; -} -legend { - padding: 0 1ex; -} -.fb_submit { - float: left; - margin: 2px 0; -} -label.block { - display: block; -} -label.inline { - display: inline; -} -input#openid_identifier { - background: url(wikiicons/openidlogin-bg.gif) no-repeat; - background-color: #fff; - background-position: 0 50%; - color: #000; - padding-left: 18px; -} -input#searchbox { - background: url(wikiicons/search-bg.gif) no-repeat; - background-color: #fff; - background-position: 100% 50%; - color: #000; - padding-right: 16px; -} -/* invalid form fields */ -.fb_invalid { - color: red; - background: white !important; -} -/* required form fields */ -.fb_required { - font-weight: bold; -} - -/* highlight plugin */ -pre.hl { color:#000000; background-color:#ffffff; } -.hl.num { color:#2928ff; } -.hl.esc { color:#ff00ff; } -.hl.str { color:#ff0000; } -.hl.dstr { color:#818100; } -.hl.slc { color:#838183; font-style:italic; } -.hl.com { color:#838183; font-style:italic; } -.hl.dir { color:#008200; } -.hl.sym { color:#000000; } -.hl.line { color:#555555; } -.hl.mark { background-color:#ffffbb; } -.hl.kwa { color:#000000; font-weight:bold; } -.hl.kwb { color:#830000; } -.hl.kwc { color:#000000; font-weight:bold; } -.hl.kwd { color:#010181; } - -/* calendar plugin */ -.month-calendar-day-this-day, -.year-calendar-this-month { - background-color: #eee; -} -.month-calendar-day-head, -.month-calendar-day-nolink, -.month-calendar-day-link, -.month-calendar-day-this-day, -.month-calendar-day-future { - text-align: right; -} -.month-calendar-arrow A:link, -.year-calendar-arrow A:link, -.month-calendar-arrow A:visited, -.year-calendar-arrow A:visited { - text-decoration: none; - font-weight: normal; - font-size: 150%; -} - -/* outlines */ -li.L1 { list-style: upper-roman; } -li.L2 { list-style: decimal; } -li.L3 { list-style: lower-alpha; } -li.L4 { list-style: disc; } -li.L5 { list-style: square; } -li.L6 { list-style: circle; } -li.L7 { list-style: lower-roman; } -li.L8 { list-style: upper-alpha; } - -/* tag cloud */ -.pagecloud { - float: right; - width: 30%; - text-align: center; - padding: 10px 10px; - border: 1px solid #aaa; - background: #eee; - color: black !important; -} -.smallestPC { font-size: 70%; } -.smallPC { font-size: 85%; } -.normalPC { font-size: 100%; } -.bigPC { font-size: 115%; } -.biggestPC { font-size: 130%; } - -/* orange feed button */ -.feedbutton { - background: #ff6600; - color: white !important; - border-left: 1px solid #cc9966; - border-top: 1px solid #ccaa99; - border-right: 1px solid #993300; - border-bottom: 1px solid #331100; - padding: 0px 0.5em 0px 0.5em; - font-family: sans-serif; - font-weight: bold; - font-size: small; - text-decoration: none; - margin-top: 1em; -} -.feedbutton:hover { - color: white !important; - background: #ff9900; -} - -.FlattrButton { - display: none; -} - -/* 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; -} - -.fileupload-content .ui-progressbar { - width: 200px; - height: 20px; -} -.fileupload-content .ui-progressbar-value { - background: url(ikiwiki/images/pbar-ani.gif); -} -/* bzed theme for ikiwiki - * - * Copyright (C) 2010 Bernd Zeimetz - * Licensed under same license as ikiwiki: GPL v2 or later - * - * Parts of this file are based on the awesome YUI, - * these parts will stay under the BSD license, - * but you're free to apply the GPLv2 to them, of course. - */ - - - -/* ------------------------------------------------------------------------------------------------- -Based on reset-fonts-grids.css from yui. -Copyright (c) 2008, Yahoo! Inc. All rights reserved. -Code licensed under the BSD License: -http://developer.yahoo.net/yui/license.txt -version: 2.5.1 -*/ -body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,legend,p,blockquote,th,td{margin:0;padding:0;} -table{border-collapse:collapse;border-spacing:0;} -img{border:0;} -address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;} -li{list-style:none;} -caption,th{text-align:left;} -h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;} -q:before,q:after{content:'';} -abbr,acronym {border:0;font-variant:normal;} -sup {vertical-align:text-top;} -sub {vertical-align:text-bottom;} -input,textarea,select{font-family:inherit;font-size: 13px/1.23;font-weight:normal;} -input,textarea,select{*font-size:100%;} -legend{color:#000;} -/* body {font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;} */ -body {font:13px/1.231 "Lucida Grande",Verdana,Lucida,Helvetica,Arial,sans-serif;*font-size:small;*font:x-small;} -table {font-size:inherit;font:100%;} -pre,code,kbd,samp,tt{font-family:monospace;} - - -body{text-align:left;} -.inlinefooter{clear:both;} - -/* #doc,#doc2,#doc3,#doc4,.yui-t1,.yui-t2,.yui-t3,.yui-t4,.yui-t5,.yui-t6,.yui-t7{margin:auto;text-align:left;width:57.69em;*width:56.25em;min-width:750px;} */ -.page {margin:auto;text-align:left;width:57.69em;*width:56.25em;min-width:750px;} - -/* #doc3{margin:auto 10px;width:auto;} */ -.page {margin:auto 10px;width:auto;} - -#pagebody, .sidebar{position:relative;} -#pagebody, .sidebar{_position:static;} -#pagebody {position:static;} -.sidebar {float:right;width:16.5em;*width:16em;} -#pagebody {margin-right:19em;*margin-right:18.5em;} -/* #content {float:none;width:auto;} */ -#pagebody:after, .sidebar:after, .page:after{content:".";display:block;height:0;clear:both;visibility:hidden;} -.page f{zoom:1;} - -/* ------------------------------------------------------------------------------------------------ - * Taken from base.css, part of YUI's CSS Foundation - * Copyright (c) 2008, Yahoo! Inc. All rights reserved. - * Code licensed under the BSD License: - * http://developer.yahoo.net/yui/license.txt - * version: 2.5.1 -*/ -h1 { - /*18px via YUI Fonts CSS foundation*/ - font-size:138.5%; -} -h2 { - /*16px via YUI Fonts CSS foundation*/ - font-size:123.1%; -} -h3 { - /*14px via YUI Fonts CSS foundation*/ - font-size:108%; -} -h1,h2,h3 { - /* top & bottom margin based on font size */ - margin:1em 0; -} -h1,h2,h3,h4,h5,h6,strong { - /*bringing boldness back to headers and the strong element*/ - font-weight:bold; -} -abbr,acronym { - /*indicating to users that more info is available */ - border-bottom:1px dotted #000; - cursor:help; -} -em { - /*bringing italics back to the em element*/ - font-style:italic; -} -blockquote,ul,ol,dl { - /*giving blockquotes and lists room to breath*/ - margin:1em; -} -ol,ul,dl { - /*bringing lists on to the page with breathing room */ - margin-left:2em; -} -ol li { - /*giving OL's LIs generated numbers*/ - list-style: decimal outside; -} -ul li { - /*giving UL's LIs generated disc markers*/ - list-style: disc outside; -} -dl dd { - /*giving UL's LIs generated numbers*/ - margin-left:1em; -} -th,td { - /*borders and padding to make the table readable*/ - border:1px solid #000; - padding:.5em; -} -th { - /*distinguishing table headers from data cells*/ - font-weight:bold; - text-align:center; -} -caption { - /*coordinated margin to match cell's padding*/ - margin-bottom:.5em; - /*centered so it doesn't blend in to other content*/ - text-align:center; -} -p,fieldset,table,pre { - /*so things don't run into each other*/ - margin-bottom:1em; -} - -#searchbox { - width:21.5em;*width:21em; -} - - - -/* ------------------------------------------------------------------------------------------------ - * All CSS below is - * Copyright (C) 2010 Bernd Zeimetz - * Licensed under same license as ikiwiki: GPL v2 or later */ - -.page, .pageheader, .sidebar, #content, #comments, .inlinepage, .recentchanges, .pageheader .actions ul, #pagebody { - border: none; -} - -html, body { - color:#000; - /* background-image: url('body_background.png'); - background-repeat: repeat; */ - background-color: #8da1b8; -} - -body { - padding-left: 5%; - padding-right: 5%; - padding-top: 1em; - padding-bottom: 1em; -} - -.page { - background: #fff; - border: outset #ccc; - padding-left: 1em; - padding-right: 1em; - padding-top: 1em; -} - -.pageheader { - background-image: url('header_background.png'); - background-repeat: repeat-x; - height: 100px; - padding-left: 1em; - padding-right: 1em; - padding-bottom: 1em; - padding-top: 1em; -} - -.pageheader .header { - text-align: top; - clear: both; -} - -.pageheader .header form { - padding: 0em 0em 0em 0em; - float: right; - margin-top: 0.5em; -} - -.pageheader .header .title, .pageheader .header .parentlinks, - .inlinepage .inlineheader, - h1, h2, h3, h4, h5, h6 { - margin-top: 1em; - font-weight: bold; -} - -.pageheader .header .title, .pageheader .header .parentlinks, .pageheader .actions ul li, .pageheader .header span, .pageheader #otherlanguages ul li { - padding: 0.25em 0.25em 0.25em 0.25em; - background-image: url('background_darkness.png'); - background-repeat: repeat; - color: white; -} - -.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a, .pageheader #otherlanguages ul li a { - color: white; - text-decoration: none; -} - -.pageheader .actions { - text-align: right; - vertical-align: bottom; - clear: both; -} - -#pagebody { - padding-right: 1em; - padding-bottom: 2em; - border-right: ridge #eee; - clear: none; -} - -#content a, #comments a, .sidebar a { - color: #315485; - text-decoration: none; - font-weight: bold; -} - -.sidebar h2 { - border-bottom: ridge #eee; - padding-right: 0; -} - -.sidebar .menu { - margin-left: 1em; -} - - -.inlinepage, .recentchanges, div.recentchanges { - clear: none !important; - margin-bottom: 2em; -} - -.inlinefooter { - border-top: 1px dotted #315485; -} - -.inlinefooter .pagedate, .inlinefooter .tags { - display: inline; - clear: none; - margin-right: 2em; -} - -.calendar .month-calendar th, .calendar .month-calendar td { - padding: 0.22em; -} - -@media print { - .sidebar, .page .pageheader .header .parentlinks { - content:"."; - display:block; - height:0; - visibility:hidden; - } - .page { - padding: 1em 1em 1em 1em; - } - .pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a { - color: #315485; - } - #content, #comments, #pagebody { - margin-right: 0; - *margin-right: 0; - border-right: none; - } - -} - -/* - * goldtype theme for ikiwiki - */ - -.pageheader { - background-repeat: no-repeat; - background-color: #f2d98d; - padding: 0; - padding-right: 1em; - margin-bottom: 2em; -} - -html, body { - background-color: #f2d98d; -} - -#content a:hover, #comments a:hover, .sidebar a:hover, -#content a:visited:hover, #comments a:visited:hover, .sidebar a:visited:hover { - color: red; -} -#content a:visited, #comments a:visited, .sidebar a:visited { - color: #37485e; -} diff --git a/goldtype/style.scss b/goldtype/style.scss new file mode 100644 index 0000000..d955a42 --- /dev/null +++ b/goldtype/style.scss @@ -0,0 +1,25 @@ +@import "../blueview/style"; + +/* + * goldtype theme for ikiwiki + */ +.pageheader { + background-repeat: no-repeat; + background-color: #f2d98d; + padding: 0; + padding-right: 1em; + margin-bottom: 2em; +} + +html, body { + background-color: #f2d98d; +} + +#content a:hover, #comments a:hover, .sidebar a:hover, +#content a:visited:hover, #comments a:visited:hover, .sidebar a:visited:hover { + color: red; +} + +#content a:visited, #comments a:visited, .sidebar a:visited { + color: #37485e; +} diff --git a/include.mk b/include.mk new file mode 100644 index 0000000..48d2778 --- /dev/null +++ b/include.mk @@ -0,0 +1,12 @@ +cssprojectinfiles = $(foreach file,$(if $1,$(shell find $1 -name '*.scss')),$(if $(filter-out _%,$(notdir $(file))),$(file))) +cssprojectoutfiles = $(patsubst %.scss,%.css,$(call cssprojectinfiles,$1)) + +$(cssprojects): + sass --update --stop-on-error $(if $(beautify),--style expanded) $@ + $(if $(beautify),perl -i -pe 's/ /\t/g' $(call cssprojectoutfiles,$@)) + +clean:: + rm -f $(call cssprojectoutfiles,$(cssprojects)) + rm -rf .sass-cache + +.PHONY: clean $(cssprojects) |