From 5a48673ccb604e2583e54286fa521d6face5ea2e Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 1 Feb 2011 14:26:20 +0100 Subject: Normalize Sass files by Sass'ing onto itself. --- actiontabs/style.scss | 269 ++++++++++++++++++++------ blueview/style.scss | 501 +++++++++++++++++++++++++++++++++++++------------ default/style.scss | 234 ++++++++++++++++++----- goldtype/style.scss | 507 +++++++++++++++++++++++++++++++++++++------------- monochrome/style.scss | 282 ++++++++++++++++++++++------ 5 files changed, 1391 insertions(+), 402 deletions(-) diff --git a/actiontabs/style.scss b/actiontabs/style.scss index 27712e8..467bfc0 100644 --- a/actiontabs/style.scss +++ b/actiontabs/style.scss @@ -1,9 +1,7 @@ /* 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, @@ -33,10 +31,12 @@ nav { height: 1em; list-style-type: none; } + .actions li { display: inline; padding: .2em; } + .pageheader .actions ul { border-bottom: 1px solid #000; } @@ -50,10 +50,12 @@ nav { padding: 6px; list-style-type: none; } + #otherlanguages li { display: inline; padding: .2em .4em; } + .pageheader #otherlanguages { border-bottom: 1px solid #000; } @@ -79,7 +81,7 @@ nav { } .inlinepage .tags { - display: inline; + display: inline; } .mapparent { @@ -97,11 +99,11 @@ img.img { } .align-left { - float:left; + float: left; } .align-right { - float:right; + float: right; } #backlinks { @@ -139,9 +141,11 @@ div.recentchanges { background: #eee; color: black !important; } + .recentchanges .metadata { padding: 0px 0.5em; } + .recentchanges .changelog { font-style: italic; clear: both; @@ -150,29 +154,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; @@ -206,6 +216,7 @@ div.recentchanges { .archivepagedate { font-style: italic; } + .archivepage { margin-bottom: 1em; } @@ -232,6 +243,7 @@ hr.poll { background: #eee; border: 2px solid black; } + div.poll { margin-top: 1ex; margin-bottom: 1ex; @@ -248,16 +260,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; @@ -272,6 +288,7 @@ div.progress { color: black !important; padding: 1px; } + div.progress-done { background: #ea6 !important; color: black !important; @@ -281,15 +298,34 @@ div.progress-done { /* things to hide in printouts */ @media print { - .actions { display: none; } - .tags { display: none; } - .trails { display: none; } - .feedbutton { display: none; } - #searchform { display: none; } - .blogform, #blogform { display: none; } - #backlinks { display: none; } -} + .actions { + display: none; + } + + .tags { + display: none; + } + + .trails { + display: none; + } + + .feedbutton { + display: none; + } + #searchform { + display: none; + } + + .blogform, #blogform { + display: none; + } + + #backlinks { + display: none; + } +} /* infobox template */ .infobox { float: right; @@ -320,12 +356,14 @@ div.progress-done { border-bottom: 1px dotted #366; color: #366; } + .popup .balloon, .popup .paren, .popup .expand { display: none; text-align: left; } + .popup:hover .balloon, .popup:focus .balloon { position: absolute; @@ -342,19 +380,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; @@ -362,6 +405,7 @@ input#openid_identifier { color: #000; padding-left: 18px; } + input#searchbox { background: url(wikiicons/search-bg.gif) no-repeat; background-color: #fff; @@ -369,38 +413,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, @@ -408,6 +504,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, @@ -418,14 +515,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 { @@ -437,11 +557,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 { @@ -458,6 +593,7 @@ li.L8 { list-style: upper-alpha; } text-decoration: none; margin-top: 1em; } + .feedbutton:hover { color: white !important; background: #ff9900; @@ -471,35 +607,43 @@ li.L8 { list-style: upper-alpha; } #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; } @@ -508,6 +652,7 @@ a.openid_large_btn:focus { width: 200px; height: 20px; } + .fileupload-content .ui-progressbar-value { background: url(ikiwiki/images/pbar-ani.gif); } @@ -516,6 +661,7 @@ a.openid_large_btn:focus { margin-top: 1em; margin-bottom: 1em; } + .trail { display: block; clear: both; @@ -550,11 +696,11 @@ a.openid_large_btn:focus { .trailsep { display: none; } + /* actiontabs theme for ikiwiki * * by svend */ - a { text-decoration: none; color: #005a9c; @@ -564,7 +710,6 @@ a:hover { text-decoration: underline; } - hr { border-style: none; background-color: #999; @@ -647,17 +792,33 @@ body { font-size: 120%; } -h1 { font: 120% sans-serif } -h2 { font: bold 100% sans-serif } -h3, h4, h5, h6 { font: bold 80% sans-serif } +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% } +.inlinepage h1 { + font-size: 110%; +} + +.inlinepage h2 { + font-size: 100%; +} + +.inlinepage h3 { + font-size: 100%; +} .pageheader .actions ul { - border-style: none + border-style: none; } .actions ul { @@ -687,7 +848,7 @@ div.recentchanges { } .sidebar { - border-bottom: 0; + border-bottom: 0; border-right: 0; border-top: 0; margin-top: 0.5em; diff --git a/blueview/style.scss b/blueview/style.scss index 3efb027..c37cf6f 100644 --- a/blueview/style.scss +++ b/blueview/style.scss @@ -1,9 +1,7 @@ /* 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, @@ -33,10 +31,12 @@ nav { height: 1em; list-style-type: none; } + .actions li { display: inline; padding: .2em; } + .pageheader .actions ul { border-bottom: 1px solid #000; } @@ -50,10 +50,12 @@ nav { padding: 6px; list-style-type: none; } + #otherlanguages li { display: inline; padding: .2em .4em; } + .pageheader #otherlanguages { border-bottom: 1px solid #000; } @@ -79,7 +81,7 @@ nav { } .inlinepage .tags { - display: inline; + display: inline; } .mapparent { @@ -97,11 +99,11 @@ img.img { } .align-left { - float:left; + float: left; } .align-right { - float:right; + float: right; } #backlinks { @@ -139,9 +141,11 @@ div.recentchanges { background: #eee; color: black !important; } + .recentchanges .metadata { padding: 0px 0.5em; } + .recentchanges .changelog { font-style: italic; clear: both; @@ -150,29 +154,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; @@ -206,6 +216,7 @@ div.recentchanges { .archivepagedate { font-style: italic; } + .archivepage { margin-bottom: 1em; } @@ -232,6 +243,7 @@ hr.poll { background: #eee; border: 2px solid black; } + div.poll { margin-top: 1ex; margin-bottom: 1ex; @@ -248,16 +260,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; @@ -272,6 +288,7 @@ div.progress { color: black !important; padding: 1px; } + div.progress-done { background: #ea6 !important; color: black !important; @@ -281,15 +298,34 @@ div.progress-done { /* things to hide in printouts */ @media print { - .actions { display: none; } - .tags { display: none; } - .trails { display: none; } - .feedbutton { display: none; } - #searchform { display: none; } - .blogform, #blogform { display: none; } - #backlinks { display: none; } -} + .actions { + display: none; + } + + .tags { + display: none; + } + + .trails { + display: none; + } + + .feedbutton { + display: none; + } + + #searchform { + display: none; + } + + .blogform, #blogform { + display: none; + } + #backlinks { + display: none; + } +} /* infobox template */ .infobox { float: right; @@ -320,12 +356,14 @@ div.progress-done { border-bottom: 1px dotted #366; color: #366; } + .popup .balloon, .popup .paren, .popup .expand { display: none; text-align: left; } + .popup:hover .balloon, .popup:focus .balloon { position: absolute; @@ -342,19 +380,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; @@ -362,6 +405,7 @@ input#openid_identifier { color: #000; padding-left: 18px; } + input#searchbox { background: url(wikiicons/search-bg.gif) no-repeat; background-color: #fff; @@ -369,38 +413,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, @@ -408,6 +504,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, @@ -418,14 +515,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 { @@ -437,11 +557,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 { @@ -458,6 +593,7 @@ li.L8 { list-style: upper-alpha; } text-decoration: none; margin-top: 1em; } + .feedbutton:hover { color: white !important; background: #ff9900; @@ -471,35 +607,43 @@ li.L8 { list-style: upper-alpha; } #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; } @@ -508,6 +652,7 @@ a.openid_large_btn:focus { width: 200px; height: 20px; } + .fileupload-content .ui-progressbar-value { background: url(ikiwiki/images/pbar-ani.gif); } @@ -516,6 +661,7 @@ a.openid_large_btn:focus { margin-top: 1em; margin-bottom: 1em; } + .trail { display: block; clear: both; @@ -550,18 +696,16 @@ a.openid_large_btn:focus { .trailsep { display: none; } -/* bzed theme for ikiwiki + +/* bzed theme for ikiwiki * - * Copyright (C) 2010 Bernd Zeimetz - * Licensed under same license as ikiwiki: GPL v2 or later + * 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. + * 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. @@ -569,43 +713,143 @@ 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, 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 { + 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; +} -body{text-align:left;} -.inlinefooter{clear:both;} +.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;} +.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;} +.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; +} -#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;} +#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 @@ -616,91 +860,104 @@ body{text-align:left;} */ h1 { /*18px via YUI Fonts CSS foundation*/ - font-size:138.5%; + font-size: 138.5%; } + h2 { /*16px via YUI Fonts CSS foundation*/ - font-size:123.1%; + font-size: 123.1%; } + h3 { /*14px via YUI Fonts CSS foundation*/ - font-size:108%; + font-size: 108%; } -h1,h2,h3 { + +h1, h2, h3 { /* top & bottom margin based on font size */ - margin:1em 0; + margin: 1em 0; } -h1,h2,h3,h4,h5,h6,strong { + +h1, h2, h3, h4, h5, h6, strong { /*bringing boldness back to headers and the strong element*/ - font-weight:bold; + font-weight: bold; } -abbr,acronym { + +abbr, acronym { /*indicating to users that more info is available */ - border-bottom:1px dotted #000; - cursor:help; + border-bottom: 1px dotted #000; + cursor: help; } + em { /*bringing italics back to the em element*/ - font-style:italic; + font-style: italic; } -blockquote,ul,ol,dl { + +blockquote, ul, ol, dl { /*giving blockquotes and lists room to breath*/ - margin:1em; + margin: 1em; } -ol,ul,dl { + +ol, ul, dl { /*bringing lists on to the page with breathing room */ - margin-left:2em; + 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; + margin-left: 1em; } -th,td { + +th, td { /*borders and padding to make the table readable*/ - border:1px solid #000; - padding:.5em; + border: 1px solid #000; + padding: .5em; } + th { /*distinguishing table headers from data cells*/ - font-weight:bold; - text-align:center; + font-weight: bold; + text-align: center; } + caption { /*coordinated margin to match cell's padding*/ - margin-bottom:.5em; + margin-bottom: .5em; /*centered so it doesn't blend in to other content*/ - text-align:center; + text-align: center; } -p,fieldset,table,pre { + +p, fieldset, table, pre { /*so things don't run into each other*/ - margin-bottom:1em; + margin-bottom: 1em; } #searchbox { - width:21.5em;*width:21em; + 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, #enclosure, #comments, .inlinepage, .recentchanges, .pageheader .actions ul, #pagebody { border: none; } html, body { - color:#000; + color: #000; /* background-image: url('body_background.png'); background-repeat: repeat; */ background-color: #8da1b8; @@ -722,7 +979,7 @@ body { } .pageheader { - background-image: url('header_background.png'); + background-image: url("header_background.png"); background-repeat: repeat-x; height: 100px; padding-left: 1em; @@ -743,15 +1000,15 @@ body { } .pageheader .header .title, .pageheader .header .parentlinks, - .inlinepage .inlineheader, - h1, h2, h3, h4, h5, h6 { +.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, .pageheader .trailprev, .pageheader .trailnext, .pageheader .trailup { padding: 0.25em 0.25em 0.25em 0.25em; - background-image: url('background_darkness.png'); + background-image: url("background_darkness.png"); background-repeat: repeat; color: white; } @@ -790,7 +1047,6 @@ body { margin-left: 1em; } - .inlinepage, .recentchanges, div.recentchanges { clear: none !important; margin-bottom: 2em; @@ -812,22 +1068,23 @@ body { @media print { .sidebar, .page .pageheader .header .parentlinks { - content:"."; - display:block; - height:0; - visibility:hidden; + 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, #enclosure, #comments, #pagebody { margin-right: 0; *margin-right: 0; border-right: none; } - } - diff --git a/default/style.scss b/default/style.scss index 067a3bf..e706894 100644 --- a/default/style.scss +++ b/default/style.scss @@ -1,9 +1,7 @@ /* 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, @@ -33,10 +31,12 @@ nav { height: 1em; list-style-type: none; } + .actions li { display: inline; padding: .2em; } + .pageheader .actions ul { border-bottom: 1px solid #000; } @@ -50,10 +50,12 @@ nav { padding: 6px; list-style-type: none; } + #otherlanguages li { display: inline; padding: .2em .4em; } + .pageheader #otherlanguages { border-bottom: 1px solid #000; } @@ -79,7 +81,7 @@ nav { } .inlinepage .tags { - display: inline; + display: inline; } .mapparent { @@ -97,11 +99,11 @@ img.img { } .align-left { - float:left; + float: left; } .align-right { - float:right; + float: right; } #backlinks { @@ -139,9 +141,11 @@ div.recentchanges { background: #eee; color: black !important; } + .recentchanges .metadata { padding: 0px 0.5em; } + .recentchanges .changelog { font-style: italic; clear: both; @@ -150,29 +154,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; @@ -206,6 +216,7 @@ div.recentchanges { .archivepagedate { font-style: italic; } + .archivepage { margin-bottom: 1em; } @@ -232,6 +243,7 @@ hr.poll { background: #eee; border: 2px solid black; } + div.poll { margin-top: 1ex; margin-bottom: 1ex; @@ -248,16 +260,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; @@ -272,6 +288,7 @@ div.progress { color: black !important; padding: 1px; } + div.progress-done { background: #ea6 !important; color: black !important; @@ -281,15 +298,34 @@ div.progress-done { /* things to hide in printouts */ @media print { - .actions { display: none; } - .tags { display: none; } - .trails { display: none; } - .feedbutton { display: none; } - #searchform { display: none; } - .blogform, #blogform { display: none; } - #backlinks { display: none; } -} + .actions { + display: none; + } + + .tags { + display: none; + } + + .trails { + display: none; + } + + .feedbutton { + display: none; + } + + #searchform { + display: none; + } + .blogform, #blogform { + display: none; + } + + #backlinks { + display: none; + } +} /* infobox template */ .infobox { float: right; @@ -320,12 +356,14 @@ div.progress-done { border-bottom: 1px dotted #366; color: #366; } + .popup .balloon, .popup .paren, .popup .expand { display: none; text-align: left; } + .popup:hover .balloon, .popup:focus .balloon { position: absolute; @@ -342,19 +380,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; @@ -362,6 +405,7 @@ input#openid_identifier { color: #000; padding-left: 18px; } + input#searchbox { background: url(wikiicons/search-bg.gif) no-repeat; background-color: #fff; @@ -369,38 +413,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, @@ -408,6 +504,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, @@ -418,14 +515,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 { @@ -437,11 +557,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 { @@ -458,6 +593,7 @@ li.L8 { list-style: upper-alpha; } text-decoration: none; margin-top: 1em; } + .feedbutton:hover { color: white !important; background: #ff9900; @@ -471,35 +607,43 @@ li.L8 { list-style: upper-alpha; } #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; } @@ -508,6 +652,7 @@ a.openid_large_btn:focus { width: 200px; height: 20px; } + .fileupload-content .ui-progressbar-value { background: url(ikiwiki/images/pbar-ani.gif); } @@ -516,6 +661,7 @@ a.openid_large_btn:focus { margin-top: 1em; margin-bottom: 1em; } + .trail { display: block; clear: both; diff --git a/goldtype/style.scss b/goldtype/style.scss index ab2216d..3b60a6a 100644 --- a/goldtype/style.scss +++ b/goldtype/style.scss @@ -1,9 +1,7 @@ /* 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, @@ -33,10 +31,12 @@ nav { height: 1em; list-style-type: none; } + .actions li { display: inline; padding: .2em; } + .pageheader .actions ul { border-bottom: 1px solid #000; } @@ -50,10 +50,12 @@ nav { padding: 6px; list-style-type: none; } + #otherlanguages li { display: inline; padding: .2em .4em; } + .pageheader #otherlanguages { border-bottom: 1px solid #000; } @@ -79,7 +81,7 @@ nav { } .inlinepage .tags { - display: inline; + display: inline; } .mapparent { @@ -97,11 +99,11 @@ img.img { } .align-left { - float:left; + float: left; } .align-right { - float:right; + float: right; } #backlinks { @@ -139,9 +141,11 @@ div.recentchanges { background: #eee; color: black !important; } + .recentchanges .metadata { padding: 0px 0.5em; } + .recentchanges .changelog { font-style: italic; clear: both; @@ -150,29 +154,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; @@ -206,6 +216,7 @@ div.recentchanges { .archivepagedate { font-style: italic; } + .archivepage { margin-bottom: 1em; } @@ -232,6 +243,7 @@ hr.poll { background: #eee; border: 2px solid black; } + div.poll { margin-top: 1ex; margin-bottom: 1ex; @@ -248,16 +260,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; @@ -272,6 +288,7 @@ div.progress { color: black !important; padding: 1px; } + div.progress-done { background: #ea6 !important; color: black !important; @@ -281,15 +298,34 @@ div.progress-done { /* things to hide in printouts */ @media print { - .actions { display: none; } - .tags { display: none; } - .trails { display: none; } - .feedbutton { display: none; } - #searchform { display: none; } - .blogform, #blogform { display: none; } - #backlinks { display: none; } -} + .actions { + display: none; + } + + .tags { + display: none; + } + + .trails { + display: none; + } + .feedbutton { + display: none; + } + + #searchform { + display: none; + } + + .blogform, #blogform { + display: none; + } + + #backlinks { + display: none; + } +} /* infobox template */ .infobox { float: right; @@ -320,12 +356,14 @@ div.progress-done { border-bottom: 1px dotted #366; color: #366; } + .popup .balloon, .popup .paren, .popup .expand { display: none; text-align: left; } + .popup:hover .balloon, .popup:focus .balloon { position: absolute; @@ -342,19 +380,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; @@ -362,6 +405,7 @@ input#openid_identifier { color: #000; padding-left: 18px; } + input#searchbox { background: url(wikiicons/search-bg.gif) no-repeat; background-color: #fff; @@ -369,38 +413,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, @@ -408,6 +504,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, @@ -418,14 +515,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 { @@ -437,11 +557,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 { @@ -458,6 +593,7 @@ li.L8 { list-style: upper-alpha; } text-decoration: none; margin-top: 1em; } + .feedbutton:hover { color: white !important; background: #ff9900; @@ -471,35 +607,43 @@ li.L8 { list-style: upper-alpha; } #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; } @@ -508,6 +652,7 @@ a.openid_large_btn:focus { width: 200px; height: 20px; } + .fileupload-content .ui-progressbar-value { background: url(ikiwiki/images/pbar-ani.gif); } @@ -516,6 +661,7 @@ a.openid_large_btn:focus { margin-top: 1em; margin-bottom: 1em; } + .trail { display: block; clear: both; @@ -550,18 +696,16 @@ a.openid_large_btn:focus { .trailsep { display: none; } -/* bzed theme for ikiwiki + +/* bzed theme for ikiwiki * - * Copyright (C) 2010 Bernd Zeimetz - * Licensed under same license as ikiwiki: GPL v2 or later + * 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. + * 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. @@ -569,43 +713,143 @@ 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, 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 { + 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; +} -body{text-align:left;} -.inlinefooter{clear:both;} +.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;} +.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;} +.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; +} -#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;} +#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 @@ -616,91 +860,104 @@ body{text-align:left;} */ h1 { /*18px via YUI Fonts CSS foundation*/ - font-size:138.5%; + font-size: 138.5%; } + h2 { /*16px via YUI Fonts CSS foundation*/ - font-size:123.1%; + font-size: 123.1%; } + h3 { /*14px via YUI Fonts CSS foundation*/ - font-size:108%; + font-size: 108%; } -h1,h2,h3 { + +h1, h2, h3 { /* top & bottom margin based on font size */ - margin:1em 0; + margin: 1em 0; } -h1,h2,h3,h4,h5,h6,strong { + +h1, h2, h3, h4, h5, h6, strong { /*bringing boldness back to headers and the strong element*/ - font-weight:bold; + font-weight: bold; } -abbr,acronym { + +abbr, acronym { /*indicating to users that more info is available */ - border-bottom:1px dotted #000; - cursor:help; + border-bottom: 1px dotted #000; + cursor: help; } + em { /*bringing italics back to the em element*/ - font-style:italic; + font-style: italic; } -blockquote,ul,ol,dl { + +blockquote, ul, ol, dl { /*giving blockquotes and lists room to breath*/ - margin:1em; + margin: 1em; } -ol,ul,dl { + +ol, ul, dl { /*bringing lists on to the page with breathing room */ - margin-left:2em; + 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; + margin-left: 1em; } -th,td { + +th, td { /*borders and padding to make the table readable*/ - border:1px solid #000; - padding:.5em; + border: 1px solid #000; + padding: .5em; } + th { /*distinguishing table headers from data cells*/ - font-weight:bold; - text-align:center; + font-weight: bold; + text-align: center; } + caption { /*coordinated margin to match cell's padding*/ - margin-bottom:.5em; + margin-bottom: .5em; /*centered so it doesn't blend in to other content*/ - text-align:center; + text-align: center; } -p,fieldset,table,pre { + +p, fieldset, table, pre { /*so things don't run into each other*/ - margin-bottom:1em; + margin-bottom: 1em; } #searchbox { - width:21.5em;*width:21em; + 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, #enclosure, #comments, .inlinepage, .recentchanges, .pageheader .actions ul, #pagebody { border: none; } html, body { - color:#000; + color: #000; /* background-image: url('body_background.png'); background-repeat: repeat; */ background-color: #8da1b8; @@ -722,7 +979,7 @@ body { } .pageheader { - background-image: url('header_background.png'); + background-image: url("header_background.png"); background-repeat: repeat-x; height: 100px; padding-left: 1em; @@ -743,15 +1000,15 @@ body { } .pageheader .header .title, .pageheader .header .parentlinks, - .inlinepage .inlineheader, - h1, h2, h3, h4, h5, h6 { +.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, .pageheader .trailprev, .pageheader .trailnext, .pageheader .trailup { padding: 0.25em 0.25em 0.25em 0.25em; - background-image: url('background_darkness.png'); + background-image: url("background_darkness.png"); background-repeat: repeat; color: white; } @@ -790,7 +1047,6 @@ body { margin-left: 1em; } - .inlinepage, .recentchanges, div.recentchanges { clear: none !important; margin-bottom: 2em; @@ -812,29 +1068,29 @@ body { @media print { .sidebar, .page .pageheader .header .parentlinks { - content:"."; - display:block; - height:0; - visibility:hidden; + 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, #enclosure, #comments, #pagebody { margin-right: 0; *margin-right: 0; border-right: none; } - } - /* * goldtype theme for ikiwiki */ - .pageheader { background-repeat: no-repeat; background-color: #f2d98d; @@ -850,9 +1106,10 @@ html, body { #content a:hover, #enclosure a:hover, #comments a:hover, .sidebar a:hover, #content a:visited:hover, #enclosure a:visited:hover, #comments a:visited:hover, .sidebar a:visited:hover { - color: red; + color: red; } + #content a:visited, #enclosure a:visited, #comments a:visited, .sidebar a:visited { - color: #37485e; + color: #37485e; } diff --git a/monochrome/style.scss b/monochrome/style.scss index 8d69c13..8f5e3d5 100644 --- a/monochrome/style.scss +++ b/monochrome/style.scss @@ -1,9 +1,9 @@ +@charset "UTF-8"; +@import url(http://fonts.googleapis.com/css?family=Lato&v2); /* 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, @@ -33,10 +33,12 @@ nav { height: 1em; list-style-type: none; } + .actions li { display: inline; padding: .2em; } + .pageheader .actions ul { border-bottom: 1px solid #000; } @@ -50,10 +52,12 @@ nav { padding: 6px; list-style-type: none; } + #otherlanguages li { display: inline; padding: .2em .4em; } + .pageheader #otherlanguages { border-bottom: 1px solid #000; } @@ -79,7 +83,7 @@ nav { } .inlinepage .tags { - display: inline; + display: inline; } .mapparent { @@ -97,11 +101,11 @@ img.img { } .align-left { - float:left; + float: left; } .align-right { - float:right; + float: right; } #backlinks { @@ -139,9 +143,11 @@ div.recentchanges { background: #eee; color: black !important; } + .recentchanges .metadata { padding: 0px 0.5em; } + .recentchanges .changelog { font-style: italic; clear: both; @@ -150,29 +156,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; @@ -206,6 +218,7 @@ div.recentchanges { .archivepagedate { font-style: italic; } + .archivepage { margin-bottom: 1em; } @@ -232,6 +245,7 @@ hr.poll { background: #eee; border: 2px solid black; } + div.poll { margin-top: 1ex; margin-bottom: 1ex; @@ -248,16 +262,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; @@ -272,6 +290,7 @@ div.progress { color: black !important; padding: 1px; } + div.progress-done { background: #ea6 !important; color: black !important; @@ -281,15 +300,34 @@ div.progress-done { /* things to hide in printouts */ @media print { - .actions { display: none; } - .tags { display: none; } - .trails { display: none; } - .feedbutton { display: none; } - #searchform { display: none; } - .blogform, #blogform { display: none; } - #backlinks { display: none; } -} + .actions { + display: none; + } + + .tags { + display: none; + } + .trails { + display: none; + } + + .feedbutton { + display: none; + } + + #searchform { + display: none; + } + + .blogform, #blogform { + display: none; + } + + #backlinks { + display: none; + } +} /* infobox template */ .infobox { float: right; @@ -320,12 +358,14 @@ div.progress-done { border-bottom: 1px dotted #366; color: #366; } + .popup .balloon, .popup .paren, .popup .expand { display: none; text-align: left; } + .popup:hover .balloon, .popup:focus .balloon { position: absolute; @@ -342,19 +382,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; @@ -362,6 +407,7 @@ input#openid_identifier { color: #000; padding-left: 18px; } + input#searchbox { background: url(wikiicons/search-bg.gif) no-repeat; background-color: #fff; @@ -369,38 +415,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, @@ -408,6 +506,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, @@ -418,14 +517,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 { @@ -437,11 +559,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 { @@ -458,6 +595,7 @@ li.L8 { list-style: upper-alpha; } text-decoration: none; margin-top: 1em; } + .feedbutton:hover { color: white !important; background: #ff9900; @@ -471,35 +609,43 @@ li.L8 { list-style: upper-alpha; } #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; } @@ -508,6 +654,7 @@ a.openid_large_btn:focus { width: 200px; height: 20px; } + .fileupload-content .ui-progressbar-value { background: url(ikiwiki/images/pbar-ani.gif); } @@ -516,6 +663,7 @@ a.openid_large_btn:focus { margin-top: 1em; margin-bottom: 1em; } + .trail { display: block; clear: both; @@ -550,22 +698,19 @@ a.openid_large_btn:focus { .trailsep { display: none; } + /* * monochrome - ikiwiki theme © Jon Dowland 2012 * based on ikiwiki style.css and bits from jmtd.net at the time * License: GPL-2+ */ - -@import url(http://fonts.googleapis.com/css?family=Lato&v2); - body { margin-left: auto; margin-right: auto; width: 48em; - background: url(gradient.png) repeat-x white 0px -16px; - margin-top: 48px; /* height of gradient.png that we want to see */ - + margin-top: 48px; + /* height of gradient.png that we want to see */ color: #555; font-family: 'Lato', sans-serif; } @@ -573,6 +718,7 @@ body { .header { margin-bottom: 0.5em; } + .pageheader .actions ul { border-bottom: 2px solid #c00040; } @@ -591,19 +737,41 @@ body { #content a[href^="https:"]:after, #enclosure a[href^="http:"]:after, #enclosure a[href^="https:"]:after { - content: "↗"; + content: "↗"; } + /* you will want to replicate this for your own domain in local.css */ #content a[href^="http://localhost"]:after, #content a[href^="http://ikiwiki.info"]:after, #enclosure a[href^="http://localhost"]:after, #enclosure a[href^="http://ikiwiki.info"]:after { - content: none; + content: none; } /* colouring */ -a:link { color: #c00040; font-weight: bold; text-decoration: none; } -a:hover { color: #f01070; text-decoration: underline;} -a:active { color: #c00040; } -a:visited { color: #c08080; font-weight: normal; font-style: italic; } -hr { border: none; border-top: 2px solid #c00040; clear: both; } +a:link { + color: #c00040; + font-weight: bold; + text-decoration: none; +} + +a:hover { + color: #f01070; + text-decoration: underline; +} + +a:active { + color: #c00040; +} + +a:visited { + color: #c08080; + font-weight: normal; + font-style: italic; +} + +hr { + border: none; + border-top: 2px solid #c00040; + clear: both; +} -- cgit v1.2.3