Merge remote-tracking branch 'zawadzki/new-design'

[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
old mode 100755 (executable)
new mode 100644 (file)
index 0923f80..7def77d
--- a/src/wolnelektury/static/scss/main/base.scss
+++ b/src/wolnelektury/static/scss/main/base.scss
@@ -14,13 +14,17 @@ html, body {
 
 /* Basic colors and fonts */
 body {
 
 /* Basic colors and fonts */
 body {

-  font-family: Georgia, serif;
+  font-family: Gelasio, Georgia, serif;

   background: #f7f7f7;
   color: black;
 
   @include size(font-size, 15px);
 }
 
   background: #f7f7f7;
   color: black;
 
   @include size(font-size, 15px);
 }
 

+p {
+    margin: 1em 0;
+}
+

 a {
   color: #0d7e85;
   text-decoration: none;
 a {
   color: #0d7e85;
   text-decoration: none;


@@ -32,6 +36,7 @@ a {
 
 h1 {
   @include size(font-size, 35px);
 
 h1 {
   @include size(font-size, 35px);

+  line-height: 1.1em;

   font-weight: normal;
   @include size(margin-top, 14px);
 
   font-weight: normal;
   @include size(margin-top, 14px);
 


@@ -42,6 +47,7 @@ h1 {
 
 h2 {
   @include size(font-size, 23px);
 
 h2 {
   @include size(font-size, 23px);

+  line-height: 1.1em;

   font-weight: normal;
 }
 
   font-weight: normal;
 }
 


@@ -83,15 +89,21 @@ ul.plain {
 
 .left-column, .right-column {
   @include size(max-width, 600px);
 
 .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) {
 }
 
 @media screen and (min-width: 62.5em) {

-  .left-column {
+  .left-column, .right-column {

     @include size(width, 470px);
     @include size(width, 470px);

+    padding-left: 0;
+    padding-right: 0;
+  }
+
+  .left-column {

     float: left;
   }
   .right-column {
     float: left;
   }
   .right-column {

-    @include size(width, 470px);

     float: right;
   }
 }
     float: right;
   }
 }


@@ -214,3 +226,19 @@ ul.plain {
     @include size(margin-bottom, 10px);
   }
 }
     @include size(margin-bottom, 10px);
   }
 }

+
+@media screen and (max-width: 62.5em) {
+  .mobile-margins {margin-left: 1em; margin-right: 1em;}
+}
+
+
+table.table {
+    margin: auto;
+    border-collapse: collapse;
+    
+    td, th {
+        border: 1px solid #444;
+        padding: .5em;
+        text-align: center;
+    }
+}