From a6b047be4ea244715a4ae5182d7c469c8948c31c Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 12 Oct 2013 15:59:29 +0200 Subject: Sync with ikiwiki 3.20130904.1. --- actiontabs/style.css | 13 +- blueview/style.css | 17 +- goldtype/style.css | 25 +- monochrome/gradient.png | Bin 0 -> 2466 bytes monochrome/style.css | 609 ++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 651 insertions(+), 13 deletions(-) create mode 100644 monochrome/gradient.png create mode 100644 monochrome/style.css diff --git a/actiontabs/style.css b/actiontabs/style.css index 65e66bf..27712e8 100644 --- a/actiontabs/style.css +++ b/actiontabs/style.css @@ -58,7 +58,8 @@ nav { border-bottom: 1px solid #000; } -.inlinecontent { +.inlinecontent, +.inlineenclosure { margin-top: .4em; } @@ -202,6 +203,13 @@ div.recentchanges { margin-top: 1em; } +.archivepagedate { + font-style: italic; +} +.archivepage { + margin-bottom: 1em; +} + .error { color: #C00; } @@ -316,6 +324,7 @@ div.progress-done { .popup .paren, .popup .expand { display: none; + text-align: left; } .popup:hover .balloon, .popup:focus .balloon { @@ -619,7 +628,7 @@ body { padding: 2px; } -#content, #comments, #footer { +#content, #enclosure, #comments, #footer { margin: 1em 2em; } diff --git a/blueview/style.css b/blueview/style.css index 2e10fad..ed8c28c 100644 --- a/blueview/style.css +++ b/blueview/style.css @@ -58,7 +58,8 @@ nav { border-bottom: 1px solid #000; } -.inlinecontent { +.inlinecontent, +.inlineenclosure { margin-top: .4em; } @@ -202,6 +203,13 @@ div.recentchanges { margin-top: 1em; } +.archivepagedate { + font-style: italic; +} +.archivepage { + margin-bottom: 1em; +} + .error { color: #C00; } @@ -316,6 +324,7 @@ div.progress-done { .popup .paren, .popup .expand { display: none; + text-align: left; } .popup:hover .balloon, .popup:focus .balloon { @@ -686,7 +695,7 @@ p,fieldset,table,pre { * 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 { +.page, .pageheader, .sidebar, #content, #enclosure, #comments, .inlinepage, .recentchanges, .pageheader .actions ul, #pagebody { border: none; } @@ -766,7 +775,7 @@ body { clear: none; } -#content a, #comments a, .sidebar a { +#content a, #enclosure a, #comments a, .sidebar a { color: #315485; text-decoration: none; font-weight: bold; @@ -814,7 +823,7 @@ body { .pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a { color #315485; } - #content, #comments, #pagebody { + #content, #enclosure, #comments, #pagebody { margin-right: 0; *margin-right: 0; border-right: none; diff --git a/goldtype/style.css b/goldtype/style.css index 89c16ef..3656fd9 100644 --- a/goldtype/style.css +++ b/goldtype/style.css @@ -58,7 +58,8 @@ nav { border-bottom: 1px solid #000; } -.inlinecontent { +.inlinecontent, +.inlineenclosure { margin-top: .4em; } @@ -202,6 +203,13 @@ div.recentchanges { margin-top: 1em; } +.archivepagedate { + font-style: italic; +} +.archivepage { + margin-bottom: 1em; +} + .error { color: #C00; } @@ -316,6 +324,7 @@ div.progress-done { .popup .paren, .popup .expand { display: none; + text-align: left; } .popup:hover .balloon, .popup:focus .balloon { @@ -686,7 +695,7 @@ p,fieldset,table,pre { * 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 { +.page, .pageheader, .sidebar, #content, #enclosure, #comments, .inlinepage, .recentchanges, .pageheader .actions ul, #pagebody { border: none; } @@ -766,7 +775,7 @@ body { clear: none; } -#content a, #comments a, .sidebar a { +#content a, #enclosure a, #comments a, .sidebar a { color: #315485; text-decoration: none; font-weight: bold; @@ -814,7 +823,7 @@ body { .pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a { color #315485; } - #content, #comments, #pagebody { + #content, #enclosure, #comments, #pagebody { margin-right: 0; *margin-right: 0; border-right: none; @@ -838,10 +847,12 @@ 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 { +#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; } -#content a:visited, #comments a:visited, .sidebar a:visited { +#content a:visited, #enclosure a:visited, #comments a:visited, +.sidebar a:visited { color: #37485e; } diff --git a/monochrome/gradient.png b/monochrome/gradient.png new file mode 100644 index 0000000..7363185 Binary files /dev/null and b/monochrome/gradient.png differ diff --git a/monochrome/style.css b/monochrome/style.css new file mode 100644 index 0000000..8d69c13 --- /dev/null +++ b/monochrome/style.css @@ -0,0 +1,609 @@ +/* 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, +.inlineenclosure { + 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; +} + +.archivepagedate { + font-style: italic; +} +.archivepage { + margin-bottom: 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; } + .trails { 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; + text-align: left; +} +.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); +} + +.trails { + margin-top: 1em; + margin-bottom: 1em; +} +.trail { + display: block; + clear: both; + position: relative; +} + +.trailprev { + display: block; + text-align: left; + position: absolute; + top: 0%; + left: 3%; + width: 30%; +} + +.trailup { + display: block; + text-align: center; + margin-left: 35%; + margin-right: 35%; +} + +.trailnext { + display: block; + text-align: right; + position: absolute; + top: 0%; + width: 30%; + right: 3%; +} + +.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 */ + + color: #555; + font-family: 'Lato', sans-serif; +} + +.header { + margin-bottom: 0.5em; +} +.pageheader .actions ul { + border-bottom: 2px solid #c00040; +} + +#pageinfo { + border-top: 2px solid #c00040; + text-align: center; + color: #aaa; +} + +/* + * css3 external links stuff + * thanks to + */ +#content a[href^="http:"]:after, +#content a[href^="https:"]:after, +#enclosure a[href^="http:"]:after, +#enclosure a[href^="https:"]:after { + 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; +} + +/* 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; } -- cgit v1.2.3