Merge branch 'app'

[wolnelektury.git] / src / wolnelektury / static / scss / main / base.scss

diff --git a/src/wolnelektury/static/scss/main/base.scss b/src/wolnelektury/static/scss/main/base.scss
index 3d1097f..45e383c 100755 (executable)
--- a/src/wolnelektury/static/scss/main/base.scss
+++ b/src/wolnelektury/static/scss/main/base.scss
@@ -8,13 +8,17 @@ html, body {
   clear: both;
 }
 
+.hide {
+  display: none !important;
+}
+
 /* Basic colors and fonts */
 body {
-  font-family: Georgia;
+  font-family: Georgia, serif;
   background: #f7f7f7;
   color: black;
 
-  @include size(font-size, 13px);
+  @include size(font-size, 15px);
 }
 
 a {
@@ -37,12 +41,12 @@ h1 {
 }
 
 h2 {
-  @include size(font-size, 20px);
+  @include size(font-size, 23px);
   font-weight: normal;
 }
 
 h3 {
-  @include size(font-size, 15px);
+  @include size(font-size, 17px);
   font-weight: normal;
 }
 
@@ -79,15 +83,21 @@ ul.plain {
 
 .left-column, .right-column {
   @include size(max-width, 600px);
+  @include size(padding-left, 1em);
+  @include size(padding-right, 1em);
 }
 
 @media screen and (min-width: 62.5em) {
-  .left-column {
+  .left-column, .right-column {
     @include size(width, 470px);
+    padding-left: 0;
+    padding-right: 0;
+  }
+
+  .left-column {
     float: left;
   }
   .right-column {
-    @include size(width, 470px);
     float: right;
   }
 }
@@ -132,6 +142,7 @@ ul.plain {
 
     .initial-block {
       display: inline-block;
+      width: 100%;
     }
   }
 
@@ -176,15 +187,13 @@ ul.plain {
         border-bottom-right-radius: 4px;
       }
     }
-    .active {
-      > a, span {
-        &, &:hover, &:focus {
-          z-index: 2;
-          color: #fff;
-          cursor: default;
-          background-color: #337ab7;
-          border-color: #337ab7;
-        }
+    .current {
+      &, &:hover, &:focus {
+        z-index: 2;
+        color: #fff;
+        cursor: default;
+        background-color: #337ab7;
+        border-color: #337ab7;
       }
     }
     .disabled {
@@ -211,3 +220,7 @@ ul.plain {
     @include size(margin-bottom, 10px);
   }
 }
+
+@media screen and (max-width: 62.5em) {
+  .mobile-margins {margin-left: 1em; margin-right: 1em;}
+}