From c5c9057f8229b28ceedd34df45cc0c5c91ea0393 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Tue, 1 Feb 2011 14:26:20 +0100 Subject: convert css to sass 2/2: normalize sass files by generating css onto itself i.e. for each theme...: mv -f style.scss style.css sassc --style expanded style.css > style.scss perl -i -pe 's/ /\t/g' style.scss rm -f style.css ...or with git, when rebasing fails: git checkout HEAD^ . [...] git rm -f style.css --- default/style.scss | 237 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 189 insertions(+), 48 deletions(-) (limited to 'default/style.scss') diff --git a/default/style.scss b/default/style.scss index 9f82899..2ebbc20 100644 --- a/default/style.scss +++ b/default/style.scss @@ -1,12 +1,10 @@ /* 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,aside,details,figcaption,figure, -footer,header,hgroup,menu,nav,section { +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { display: block; } @@ -31,10 +29,12 @@ div.header, header.header { height: 1em; list-style-type: none; } + .actions li { display: inline; padding: .2em; } + .pageheader .actions ul { border-bottom: 1px solid #000; } @@ -48,10 +48,12 @@ div.header, header.header { padding: 6px; list-style-type: none; } + #otherlanguages li { display: inline; padding: .2em .4em; } + .pageheader #otherlanguages { border-bottom: 1px solid #000; } @@ -77,7 +79,7 @@ div.header, header.header { } .inlinepage .tags { - display: inline; + display: inline; } .mapparent { @@ -95,11 +97,11 @@ img.img { } .align-left { - float:left; + float: left; } .align-right { - float:right; + float: right; } #backlinks { @@ -137,9 +139,11 @@ div.recentchanges { background: #eee; color: black !important; } + .recentchanges .metadata { padding: 0px 0.5em; } + .recentchanges .changelog { font-style: italic; clear: both; @@ -148,29 +152,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; @@ -204,6 +214,7 @@ div.recentchanges { .archivepagedate { font-style: italic; } + .archivepage { margin-bottom: 1em; } @@ -230,6 +241,7 @@ hr.poll { background: #eee; border: 2px solid black; } + div.poll { margin-top: 1ex; margin-bottom: 1ex; @@ -246,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; @@ -270,6 +286,7 @@ div.progress { color: black !important; padding: 1px; } + div.progress-done { background: #ea6 !important; color: black !important; @@ -279,14 +296,30 @@ 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; } - .addcomment { display: none; } + .actions { + display: none; + } + .tags { + display: none; + } + .trails { + display: none; + } + .feedbutton { + display: none; + } + #searchform { + display: none; + } + .blogform, #blogform { + display: none; + } + #backlinks { + display: none; + } + .addcomment { + display: none; + } } /* infobox template */ @@ -319,12 +352,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; @@ -341,19 +376,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; @@ -361,6 +401,7 @@ input#openid_identifier { color: #000; padding-left: 18px; } + input#searchbox { background: url(wikiicons/search-bg.gif) no-repeat; background-color: #fff; @@ -368,38 +409,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, @@ -407,6 +500,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, @@ -417,14 +511,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 { @@ -436,11 +553,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 { @@ -457,6 +589,7 @@ li.L8 { list-style: upper-alpha; } text-decoration: none; margin-top: 1em; } + .feedbutton:hover { color: white !important; background: #ff9900; @@ -470,35 +603,43 @@ li.L8 { list-style: upper-alpha; } #login_choice { display: none; } + #login_input_area { clear: both; padding: 10px; } + #login_btns, #login_btns br { clear: both; } + #login_highlight { background-color: black; float: left; } + .login_large_btn { padding: 1em 1.5em; border: 1px solid #DDD; margin: 3px; float: left; } + .login_small_btn { padding: 4px 4px; border: 1px solid #DDD; margin: 3px; float: left; } + a.login_large_btn:focus { outline: none; } + a.login_large_btn:focus { outline-style: none; } + .login_selected { border: 4px solid #DDD; } @@ -507,6 +648,7 @@ a.login_large_btn:focus { width: 200px; height: 20px; } + .fileupload-content .ui-progressbar-value { background: url(ikiwiki/images/pbar-ani.gif); } @@ -515,6 +657,7 @@ a.login_large_btn:focus { margin-top: 1em; margin-bottom: 1em; } + .trail { display: block; clear: both; @@ -558,7 +701,6 @@ a.login_large_btn:focus { margin-top: 0; border: none; } - /* if the mobile browser is new enough, use flex layout to shuffle * the sidebar to the end */ .page { @@ -589,7 +731,6 @@ a.login_large_btn:focus { -ms-flex-order: 1; order: 1; } - .blogform, #blogform { padding: 4px 4px; } -- cgit v1.2.3