Merge branch 'master' into rwd

[wolnelektury.git] / apps / wolnelektury_core / static / css / main / base.scss

diff --git a/apps/wolnelektury_core/static/css/main/base.scss b/apps/wolnelektury_core/static/css/main/base.scss
index 193a88c..0926569 100755 (executable)
--- a/apps/wolnelektury_core/static/css/main/base.scss
+++ b/apps/wolnelektury_core/static/css/main/base.scss
@@ -1,10 +1,26 @@
 @import "tools";
 
+
+/* Basic layout */
+html, body {
+    margin: 0;
+    padding: 0;
+}
+
+
+.clearboth {
+    clear: both;
+}
+
+
+
 /* Basic colors and fonts */
 body {
     font-family: Georgia;
     background: #f7f7f7;
     color: black;
+
+    @include size-px(font-size, 13);
 }
 
 a {
@@ -16,14 +32,73 @@ a {
     }
 }
 
+h1 {
+    @include size-px(font-size, 35);
+    font-weight: normal;
+    @include size-px(margin-top, 14);
 
-/* Basic layout */
-html, body {
+    a {
+        color: inherit;
+    }
+}
+
+h2 {
+    @include size-px(font-size, 20);
+    font-weight: normal;
+}
+
+h3 {
+    @include size-px(font-size, 15);
+    font-weight: normal;
+}
+
+
+.normal-text {
+    line-height: 1.3em;
+}
+
+.white-box {
+    @include size-px(padding, 10);
+    @include white-box;
+}
+
+
+ul.plain {
+    list-style:none;
     margin: 0;
     padding: 0;
 }
 
 
-.clearboth {
-    clear: both;
+.theme-list-link {
+    @include mono;
+    @include size-px(font-size, 11);
+    
+    &:after {
+        @include size-px(padding-left, 11);
+        content: url("/static/img/arrow-teal.png");
+        vertical-align: middle;
+    }
+}
+
+
+.left-column, .right-column {
+    @include size-px(max-width, 600);
+}
+@media screen and (min-width: 62.5em) {
+    .left-column {
+        @include size-px(width, 470);
+        float: left;
+    }
+    .right-column {
+        @include size-px(width, 470);
+        float:right;
+    }
+}
+
+.pagination {
+    display: block;
+    @include size-px(font-size, 12);
+    @include size-px(padding, 6);
+    text-align:center;
 }