summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--Makefile3
-rw-r--r--blueview/style.scss222
-rw-r--r--goab/style.scss4
-rw-r--r--include.mk4
5 files changed, 21 insertions, 214 deletions
diff --git a/.gitignore b/.gitignore
index db8d88a..01d11ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/.sass-cache/
+*/.sass-cache/
*.css
diff --git a/Makefile b/Makefile
index 0d66cc3..1f0693a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
-cssprojects ?= default blueview actiontabs goldtype
+cssprojects ?= default blueview actiontabs goldtype goab
#beautify = yes
-#finalize = yes
all: $(cssprojects)
diff --git a/blueview/style.scss b/blueview/style.scss
index 539e32f..ec18416 100644
--- a/blueview/style.scss
+++ b/blueview/style.scss
@@ -1,3 +1,6 @@
+$default-font-family: "Lucida Grande",Verdana,Lucida,Helvetica,Arial,sans-serif;
+$hilite: #315485;
+
@import "../default/ikiwiki";
@include ikiwiki-boilerplate;
@@ -14,91 +17,12 @@
// TODO: include only relevant parts, and move below reset
@include ikiwiki-style;
-/* -------------------------------------------------------------------------------------------------
-Based on reset-fonts-grids.css from yui.
-Copyright (c) 2008, Yahoo! Inc. All rights reserved.
-Code licensed under the BSD License:
-http://developer.yahoo.net/yui/license.txt
-version: 2.5.1
-*/
-body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, legend, p, blockquote, th, td {
- margin: 0;
- padding: 0;
-}
-
-table {
- border-collapse: collapse;
- border-spacing: 0;
-}
-
-img {
- border: 0;
-}
-
-address, caption, cite, code, dfn, em, strong, th, var {
- font-style: normal;
- font-weight: normal;
-}
-
-li {
- list-style: none;
-}
-
-caption, th {
- text-align: left;
-}
-
-h1, h2, h3, h4, h5, h6 {
- font-size: 100%;
- font-weight: normal;
-}
+@import "yui";
+@import "compass/reset";
-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;
-}
+@include yui-base;
+@include yui-base-fonts($default-font-family);
+@include yui-grids-init("div#pagebody","div.sidebar, aside.sidebar","article.page, div.page");
body {
text-align: left;
@@ -108,27 +32,12 @@ body {
clear: both;
}
-/* #doc,#doc2,#doc3,#doc4,.yui-t1,.yui-t2,.yui-t3,.yui-t4,.yui-t5,.yui-t6,.yui-t7{margin:auto;text-align:left;width:57.69em;*width:56.25em;min-width:750px;} */
-.page {
- margin: auto;
- text-align: left;
- width: 57.69em;
- *width: 56.25em;
- min-width: 750px;
-}
-
-/* #doc3{margin:auto 10px;width:auto;} */
.page {
- margin: auto 10px;
- width: auto;
+ @include yui-document(fluid);
}
#pagebody, .sidebar {
- position: relative;
-}
-
-#pagebody, .sidebar {
- _position: static;
+ @include yui-block-base;
}
#pagebody {
@@ -146,111 +55,6 @@ body {
*margin-right: 18.5em;
}
-/* #content {float:none;width:auto;} */
-#pagebody:after, .sidebar:after, .page:after {
- content: ".";
- display: block;
- height: 0;
- clear: both;
- visibility: hidden;
-}
-
-.page f {
- zoom: 1;
-}
-
-/* ------------------------------------------------------------------------------------------------
- * Taken from base.css, part of YUI's CSS Foundation
- * Copyright (c) 2008, Yahoo! Inc. All rights reserved.
- * Code licensed under the BSD License:
- * http://developer.yahoo.net/yui/license.txt
- * version: 2.5.1
-*/
-h1 {
- /*18px via YUI Fonts CSS foundation*/
- font-size: 138.5%;
-}
-
-h2 {
- /*16px via YUI Fonts CSS foundation*/
- font-size: 123.1%;
-}
-
-h3 {
- /*14px via YUI Fonts CSS foundation*/
- font-size: 108%;
-}
-
-h1, h2, h3 {
- /* top & bottom margin based on font size */
- margin: 1em 0;
-}
-
-h1, h2, h3, h4, h5, h6, strong {
- /*bringing boldness back to headers and the strong element*/
- font-weight: bold;
-}
-
-abbr, acronym {
- /*indicating to users that more info is available */
- border-bottom: 1px dotted #000;
- cursor: help;
-}
-
-em {
- /*bringing italics back to the em element*/
- font-style: italic;
-}
-
-blockquote, ul, ol, dl {
- /*giving blockquotes and lists room to breath*/
- margin: 1em;
-}
-
-ol, ul, dl {
- /*bringing lists on to the page with breathing room */
- margin-left: 2em;
-}
-
-ol li {
- /*giving OL's LIs generated numbers*/
- list-style: decimal outside;
-}
-
-ul li {
- /*giving UL's LIs generated disc markers*/
- list-style: disc outside;
-}
-
-dl dd {
- /*giving UL's LIs generated numbers*/
- margin-left: 1em;
-}
-
-th, td {
- /*borders and padding to make the table readable*/
- border: 1px solid #000;
- padding: .5em;
-}
-
-th {
- /*distinguishing table headers from data cells*/
- font-weight: bold;
- text-align: center;
-}
-
-caption {
- /*coordinated margin to match cell's padding*/
- margin-bottom: .5em;
- /*centered so it doesn't blend in to other content*/
- text-align: center;
-}
-
-p, fieldset, table, pre {
- /*so things don't run into each other*/
- margin-bottom: 1em;
-}
-
#searchbox {
width: 21.5em;
*width: 21em;
@@ -341,7 +145,7 @@ h1, h2, h3, h4, h5, h6 {
}
#content a, #enclosure a, #comments a, .sidebar a {
- color: #315485;
+ color: $hilite;
text-decoration: none;
font-weight: bold;
}
@@ -361,7 +165,7 @@ h1, h2, h3, h4, h5, h6 {
}
.inlinefooter {
- border-top: 1px dotted #315485;
+ border-top: 1px dotted $hilite;
}
.inlinefooter .pagedate, .inlinefooter .tags {
@@ -387,7 +191,7 @@ h1, h2, h3, h4, h5, h6 {
}
.pageheader .header span a, .pageheader .actions ul li a, .pageheader .header .parentlinks a {
- color: #315485;
+ color: $hilite;
}
#content, #enclosure, #comments, #pagebody {
diff --git a/goab/style.scss b/goab/style.scss
new file mode 100644
index 0000000..30f71b2
--- /dev/null
+++ b/goab/style.scss
@@ -0,0 +1,4 @@
+@import "compass/reset";
+@import "../default/ikiwiki";
+
+@include ikiwiki-style;
diff --git a/include.mk b/include.mk
index 6c41050..9081786 100644
--- a/include.mk
+++ b/include.mk
@@ -4,11 +4,11 @@ cssprojectinfiles = $(foreach file,$(if $1,$(shell find $1 -name '*.scss')),$(if
cssprojectoutfiles = $(patsubst %.scss,%.css,$(call cssprojectinfiles,$1))
$(cssprojects):
- sass --update --stop-on-error$(if $(beautify), --style expanded)$(if $(finalize),, --debug-info)$(if $(always-make), --force) $@
+ compass compile$(if $(wildcard $@/config.rb),, --sass-dir= --css-dir= --images-dir= --javascripts-dir= --fonts-dir= --relative-assets) --output-style $(if $(beautify),expanded,compressed) --sourcemap$(if $(always-make), --force) $@
$(if $(beautify),perl -i -pe 's/ /\t/g' $(call cssprojectoutfiles,$@))
clean::
rm -f $(call cssprojectoutfiles,$(cssprojects))
- rm -rf .sass-cache
+ rm -rf $(cssprojects:=/.sass-cache)
.PHONY: clean $(cssprojects)