summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2013-10-01 23:46:31 +0200
committerJonas Smedegaard <dr@jones.dk>2013-10-01 23:48:26 +0200
commit8f915139be76a6bd0f447b0548c469309488cf32 (patch)
treed42361970ad4ce616e69520c35a6d04da235a302
parent9443679ee5494c87dc9fca911323817542b7d31b (diff)
Tighten styleguide order: Style content before header.
-rw-r--r--style.scss88
1 files changed, 44 insertions, 44 deletions
diff --git a/style.scss b/style.scss
index 95d9175..2c6697d 100644
--- a/style.scss
+++ b/style.scss
@@ -17,8 +17,8 @@
// layout
// layout - main content
@include ikiwiki-inlinepage;
-@include ikiwiki-inlineheader;
@include ikiwiki-inlinecontent;
+@include ikiwiki-inlineheader;
@include ikiwiki-plugin-comments;
// layout - header
@include ikiwiki-header;
@@ -107,6 +107,49 @@ body {
font-family: Helvetica, Verdana, Sans-serif;
}
+div#wrapper,
+div#pagebody {
+ float: left;
+ width: 100%;
+}
+
+div#content {
+ min-height: rhythm(25);
+ max-width: 48em;
+ margin: rhythm() 40% rhythm(2) 20%;
+ padding: 0;
+ text-align: left;
+ background-color: none;
+}
+
+div#content IMG {
+ display: block;
+ clear: both;
+ float: right;
+ width: 50%;
+ max-width: 200px;
+ margin-right: -50%;
+ padding: 0 rhythm() rhythm();
+ background-color: none;
+}
+
+div.inlinepage {
+ border: 0;
+ padding: rhythm(.5);
+ margin: 0 -1em;
+ background-color: LightYellow;
+}
+
+div.inlinepage SPAN.header a {
+ @include adjust-font-size-to(14px);
+ font-weight: normal;
+ color: DarkRed;
+}
+
+div.inlinefooter {
+ display: none;
+}
+
div.header {
padding: rhythm(.5) 0 0 1em;
background-color: LightBlue;
@@ -194,49 +237,6 @@ div.topbar img {
margin: 0 20px;
}
-div#wrapper,
-div#pagebody {
- float: left;
- width: 100%;
-}
-
-div#content {
- min-height: rhythm(25);
- max-width: 48em;
- margin: rhythm() 40% rhythm(2) 20%;
- padding: 0;
- text-align: left;
- background-color: none;
-}
-
-div#content IMG {
- display: block;
- clear: both;
- float: right;
- width: 50%;
- max-width: 200px;
- margin-right: -50%;
- padding: 0 rhythm() rhythm();
- background-color: none;
-}
-
-div.inlinepage {
- border: 0;
- padding: rhythm(.5);
- margin: 0 -1em;
- background-color: LightYellow;
-}
-
-div.inlinepage SPAN.header a {
- @include adjust-font-size-to(14px);
- font-weight: normal;
- color: DarkRed;
-}
-
-div.inlinefooter {
- display: none;
-}
-
div#sidebar,
div.sidebar {
float: left;