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 0923f80..45e383c 100755 (executable)
--- a/src/wolnelektury/static/scss/main/base.scss
+++ b/src/wolnelektury/static/scss/main/base.scss
@@ -83,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;
   }
 }
@@ -214,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;}
+}