diff options
Diffstat (limited to 'default')
-rw-r--r-- | default/_ikiwiki.scss (renamed from default/style.css) | 428 | ||||
-rw-r--r-- | default/style.scss | 2 |
2 files changed, 388 insertions, 42 deletions
diff --git a/default/style.css b/default/_ikiwiki.scss index 4c48e5c..02ccc9d 100644 --- a/default/style.css +++ b/default/_ikiwiki.scss @@ -1,15 +1,19 @@ +@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,aside,details,figcaption,figure, footer,header,hgroup,menu,nav,section { display: block; } +} +@mixin ikiwiki-header { .header { margin: 0; font-size: 140%; @@ -17,24 +21,30 @@ footer,header,hgroup,menu,nav,section { line-height: 1em; display: block; } +} +@mixin ikiwiki-inlineheader { .inlineheader .author { margin: 0; font-size: 112%; font-weight: bold; display: block; } +} +@mixin ikiwiki-actions { .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; } @@ -42,48 +52,64 @@ footer,header,hgroup,menu,nav,section { .inlinepage .actions ul { border-bottom: 0; } +} +@mixin ikiwiki-plugin-po { #otherlanguages ul { margin: 0; padding: 6px; list-style-type: none; } + #otherlanguages li { display: inline; padding: .2em .4em; } + .pageheader #otherlanguages { border-bottom: 1px solid #000; } +} +@mixin ikiwiki-inlinecontent { .inlinecontent, .inlineenclosure { margin-top: .4em; } +} +@mixin ikiwiki-footer { .pagefooter, .inlinefooter, .comments { clear: both; } +} +@mixin ikiwiki-pageinfo { #pageinfo { margin: 1em 0; border-top: 1px solid #000; } +} +@mixin ikiwiki-tags { .tags { margin-top: 1em; } .inlinepage .tags { - display: inline; + display: inline; +} } +@mixin ikiwiki-plugin-map { .mapparent { text-decoration: none; } +} +@mixin ikiwiki-plugin-img { .img caption { font-size: 80%; caption-side: bottom; @@ -93,24 +119,32 @@ footer,header,hgroup,menu,nav,section { img.img { margin: 0.5ex; } +} +@mixin ikiwiki-alignment { .align-left { - float:left; + float: left; } .align-right { - float:right; + float: right; +} } +@mixin ikiwiki-backlinks { #backlinks { margin-top: 1em; } +} +@mixin ikiwiki-plugin-search { #searchform { display: inline; float: right; } +} +@mixin ikiwiki-plugin-editpage { #editcontent { width: 98%; } @@ -119,15 +153,21 @@ img.img { width: auto; overflow: auto; } +} +@mixin ikiwiki-images { img { border-style: none; } +} +@mixin ikiwiki-pre { pre { overflow: auto; } +} +@mixin ikiwiki-plugin-recentchanges { div.recentchanges { border-style: solid; border-width: 1px; @@ -137,9 +177,11 @@ div.recentchanges { background: #eee; color: black !important; } + .recentchanges .metadata { padding: 0px 0.5em; } + .recentchanges .changelog { font-style: italic; clear: both; @@ -148,36 +190,44 @@ 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; margin: 0; width: 60%; } +} +@mixin ikiwiki-blogform { .blogform, #blogform { padding: 10px 10px; border: 1px solid #aaa; @@ -186,13 +236,17 @@ div.recentchanges { width: auto; overflow: auto; } +} +@mixin ikiwiki-inlinepage { .inlinepage { padding: 10px 10px; border: 1px solid #aaa; overflow: auto; } +} +@mixin ikiwiki-authorship { .pagedate, .pagelicense, .pagecopyright { @@ -200,18 +254,25 @@ div.recentchanges { display: block; margin-top: 1em; } +} +@mixin ikiwiki-archivepage { .archivepagedate { font-style: italic; } + .archivepage { margin-bottom: 1em; } +} +@mixin ikiwiki-debug { .error { color: #C00; } +} +@mixin ikiwiki-plugin-sidebar { .sidebar { width: 20ex; float: right; @@ -223,44 +284,57 @@ div.recentchanges { border: 1px solid black; color: black !important; } +} +@mixin ikiwiki-plugin-poll { 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; } +} +@mixin ikiwiki-plugin-color { span.color { padding: 2px; } +} +@mixin ikiwiki-plugin-comments { .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; } +} +@mixin ikiwiki-plugin-progress { div.progress { margin-top: 1ex; margin-bottom: 1ex; @@ -270,24 +344,49 @@ div.progress { color: black !important; padding: 1px; } + div.progress-done { background: #ea6 !important; color: black !important; text-align: center; padding: 1px; } +} +@mixin ikiwiki-site-print { /* 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; + } +} } +@mixin ikiwiki-infobox { /* infobox template */ .infobox { float: right; @@ -299,7 +398,9 @@ div.progress-done { background: white; color: black !important; } +} +@mixin ikiwiki-notebook { /* notebox template */ .notebox { float: right; @@ -312,18 +413,22 @@ div.progress-done { background: white; color: black !important; } +} +@mixin ikiwiki-popup { /* 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; @@ -334,25 +439,32 @@ div.progress-done { background-color: #dee; color: black; } +} +@mixin ikiwiki-forms { /* 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.block { + display: block; } -label.inline { + +label.inline { display: inline; } + input#openid_identifier { background: url(wikiicons/openidlogin-bg.gif) no-repeat; background-color: #fff; @@ -360,6 +472,7 @@ input#openid_identifier { color: #000; padding-left: 18px; } + input#searchbox { background: url(wikiicons/search-bg.gif) no-repeat; background-color: #fff; @@ -367,38 +480,94 @@ 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; } +} +@mixin ikiwiki-plugin-highlight { /* 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; +} +} + +@mixin ikiwiki-plugin-calendar { /* 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, @@ -406,6 +575,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, @@ -414,17 +584,44 @@ pre.hl { color:#000000; background-color:#ffffff; } font-weight: normal; font-size: 150%; } +} +@mixin ikiwiki-lists { /* 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; +} +} +@mixin ikiwiki-plugin-pagestats { /* tag cloud */ .pagecloud { float: right; @@ -435,12 +632,29 @@ 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%; +} +} + +@mixin ikiwiki-feedbutton { /* orange feed button */ .feedbutton { background: #ff6600; @@ -456,64 +670,83 @@ li.L8 { list-style: upper-alpha; } text-decoration: none; margin-top: 1em; } + .feedbutton:hover { color: white !important; background: #ff9900; } +} +@mixin ikiwiki-plugin-flattr { .FlattrButton { display: none; } +} +@mixin ikiwiki-plugin-openid { /* 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; } +} +@mixin ikiwiki-plugin-attachment { .fileupload-content .ui-progressbar { width: 200px; height: 20px; } + .fileupload-content .ui-progressbar-value { background: url(ikiwiki/images/pbar-ani.gif); } +} +@mixin ikiwiki-plugin-trail { .trails { margin-top: 1em; margin-bottom: 1em; } + .trail { display: block; clear: both; @@ -548,3 +781,114 @@ a.openid_large_btn:focus { .trailsep { display: none; } +} + +// all styles in same order as original Ikiwiki stylesheet +@mixin ikiwiki-style-legacy { + @include ikiwiki-header; + @include ikiwiki-inlineheader; + @include ikiwiki-actions; + @include ikiwiki-plugin-po; + @include ikiwiki-inlinecontent; + @include ikiwiki-footer; + @include ikiwiki-pageinfo; + @include ikiwiki-tags; + @include ikiwiki-plugin-map; + @include ikiwiki-plugin-img; + @include ikiwiki-alignment; + @include ikiwiki-backlinks; + @include ikiwiki-plugin-search; + @include ikiwiki-plugin-editpage; + @include ikiwiki-images; + @include ikiwiki-pre; + @include ikiwiki-plugin-recentchanges; + @include ikiwiki-blogform; + @include ikiwiki-inlinepage; + @include ikiwiki-authorship; + @include ikiwiki-archivepage; + @include ikiwiki-debug; + @include ikiwiki-plugin-sidebar; + @include ikiwiki-plugin-poll; + @include ikiwiki-plugin-color; + @include ikiwiki-plugin-comments; + @include ikiwiki-plugin-progress; + @include ikiwiki-site-print; + @include ikiwiki-infobox; + @include ikiwiki-notebook; + @include ikiwiki-popup; + @include ikiwiki-forms; + @include ikiwiki-plugin-highlight; + @include ikiwiki-plugin-calendar; + @include ikiwiki-lists; + @include ikiwiki-plugin-pagestats; + @include ikiwiki-feedbutton; + @include ikiwiki-plugin-flattr; + @include ikiwiki-plugin-openid; + @include ikiwiki-plugin-attachment; + @include ikiwiki-plugin-trail; +} + +@mixin ikiwiki-site { + // main content + @include ikiwiki-inlinepage; + @include ikiwiki-inlineheader; + @include ikiwiki-inlinecontent; + @include ikiwiki-plugin-comments; + // header + @include ikiwiki-header; + @include ikiwiki-plugin-search; + @include ikiwiki-actions; + @include ikiwiki-plugin-po; + // footer + @include ikiwiki-footer; + @include ikiwiki-pageinfo; + @include ikiwiki-tags; + @include ikiwiki-backlinks; + @include ikiwiki-authorship; + // aside + @include ikiwiki-plugin-sidebar; + @include ikiwiki-plugin-trail; +} + +// http://www.louddog.com/2008/create-maintainable-code-with-a-css-styleguide/ +@mixin ikiwiki-style { + // site defaults + @include ikiwiki-images; + @include ikiwiki-pre; + // generic styles + @include ikiwiki-lists; + @include ikiwiki-plugin-img; + @include ikiwiki-feedbutton; + @include ikiwiki-forms; + @include ikiwiki-alignment; + @include ikiwiki-debug; + @include ikiwiki-plugin-highlight; + @include ikiwiki-plugin-color; + // shell + // layout + @include ikiwiki-site; + @include ikiwiki-site-print; + // modulars + @include ikiwiki-infobox; + @include ikiwiki-notebook; + @include ikiwiki-popup; + @include ikiwiki-plugin-calendar; + @include ikiwiki-plugin-progress; + @include ikiwiki-plugin-map; + @include ikiwiki-plugin-poll; + @include ikiwiki-plugin-pagestats; + @include ikiwiki-plugin-flattr; + @include ikiwiki-blogform; + // section/page specific + @include ikiwiki-archivepage; + @include ikiwiki-plugin-recentchanges; + @include ikiwiki-plugin-editpage; + @include ikiwiki-plugin-attachment; + @include ikiwiki-plugin-openid; +} + +@mixin ikiwiki { + @include ikiwiki-boilerplate; + @include ikiwiki-reset; + @include ikiwiki-style-legacy; +} 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; |