summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiri Reiter <siri@jones.dk>2013-12-01 22:11:54 +0100
committerSiri Reiter <siri@jones.dk>2013-12-01 22:11:54 +0100
commit115c4cddded6594fc29f1469ae29f277057628c9 (patch)
treea53685e62077044e845b96d3cea3ba4532bdce93
parenta49a839300fcb13089538546590bafe1d5a1a45a (diff)
Use h5bp, and tidy misc. details.
-rw-r--r--partials/_base-h5bp.scss5
-rw-r--r--partials/_base.scss10
-rw-r--r--style.scss (renamed from local.scss)31
3 files changed, 31 insertions, 15 deletions
diff --git a/partials/_base-h5bp.scss b/partials/_base-h5bp.scss
new file mode 100644
index 0000000..c9ab66b
--- /dev/null
+++ b/partials/_base-h5bp.scss
@@ -0,0 +1,5 @@
+// Compass integration
+//
+// No styleguide reference.
+$font-size: $baseFontSize;
+$line-height: $baseLineHeight;
diff --git a/partials/_base.scss b/partials/_base.scss
new file mode 100644
index 0000000..6302f0a
--- /dev/null
+++ b/partials/_base.scss
@@ -0,0 +1,10 @@
+// Typography
+//
+// No styleguide reference.
+$baseFontSize: 12px;
+$baseLineHeight: ($baseFontSize * 2);
+
+// Framework integrations
+//
+// No styleguide reference.
+@import "base-h5bp";
diff --git a/local.scss b/style.scss
index 4b5227b..7338d71 100644
--- a/local.scss
+++ b/style.scss
@@ -1,4 +1,15 @@
+@import "partials/base";
+@import "h5bp";
+@import "compass/typography/links";
+@import "../shared/themes/default/ikiwiki";
+
+// site defaults
+@include h5bp-normalize;
+@include h5bp-main;
+@include ikiwiki-style;
+
h1 {
+ font-weight: normal;
color: DarkRed;
}
@@ -15,6 +26,7 @@ h6 {
}
h2 {
+ font-weight: normal;
font-size: 1.4em;
}
@@ -25,6 +37,7 @@ h3 {
}
a {
+ @include hover-link;
color: darkblue;
font-weight: normal;
}
@@ -40,20 +53,6 @@ body {
font-family: sans-serif;
}
-.header {
- padding: 0;
- background-color: LightBlue;
- color: LightBlue;
-}
-
-.header,
-.author,
-.recentchanges,
-.committype,
-#footer {
- font-size: 80%;
-}
-
.pageheader .title {
display: none;
}
@@ -172,7 +171,6 @@ body {
}
.inlinepage .header a {
- font-size: 0.9em;
font-weight: normal;
color: DarkRed;
}
@@ -198,6 +196,9 @@ body {
padding-left: 0.5em;
margin-bottom:0;
margin-top:0;
+ p {
+ margin: 1em 0;
+ }
}
.sidebar ul li {