Merge remote-tracking branch 'origin/filmowa' into filmowa

[edumed.git] / edumed / static / css / base.scss

diff --git a/edumed/static/css/base.scss b/edumed/static/css/base.scss
index b21a555..b68b892 100644 (file)
--- a/edumed/static/css/base.scss
+++ b/edumed/static/css/base.scss
@@ -1,9 +1,7 @@
-@import url(http://fonts.googleapis.com/css?family=Dosis:400,700&subset=latin,latin-ext);
+@import url(//fonts.googleapis.com/css?family=Dosis:400,700&subset=latin,latin-ext);

 
 

-$px: .0625em;
-$oranji: #ed7831;
-$ciemny: #363a3e;
-$zielony: #16a487;
+@import "vars";
+@import "mixins";

 
 
 a {
 
 
 a {


@@ -16,14 +14,29 @@ a {
 }
 
 body {
 }
 
 body {

-    font-family: Dosis;
+    @include base-font;

     margin: 0;
     margin: 0;

-    background: white;
-    color: $ciemny;

 }
 .clr {
     clear: both;
 }
 }
 .clr {
     clear: both;
 }

+
+#banners {
+    display: inline-block;
+    margin: 0 auto 1.4375em;
+    width: 58.75em;
+
+    > a {
+        display: block;
+        width: 100%;
+    }
+
+    img {
+        display: block;
+        margin: 0 auto;
+        width: 100%;
+    }
+}

 #header-wrapper {
     background-image: url(../img/header-bar.png);
     background-repeat: repeat-x;
 #header-wrapper {
     background-image: url(../img/header-bar.png);
     background-repeat: repeat-x;


@@ -88,6 +101,7 @@ header.main {
             height: 34*$px;
             text-align:center;
             margin: auto;
             height: 34*$px;
             text-align:center;
             margin: auto;

+            margin-bottom: .8em;

         }
         .menu-lekcje:before { background: url(../img/menu/lekcje.png) no-repeat 0 0; background-size: 100%;}
         .menu-kompetencje:before { background: url(../img/menu/katalog.png) no-repeat 0 0; background-size: 100%;}
         }
         .menu-lekcje:before { background: url(../img/menu/lekcje.png) no-repeat 0 0; background-size: 100%;}
         .menu-kompetencje:before { background: url(../img/menu/katalog.png) no-repeat 0 0; background-size: 100%;}


@@ -139,16 +153,16 @@ footer.main {
     border-top: 1px solid #c9ccce;
     width: 940 * $px;
     padding: .2em 10 * $px;
     border-top: 1px solid #c9ccce;
     width: 940 * $px;
     padding: .2em 10 * $px;

-    margin: 40*$px auto 0 auto;
+    margin: 40*$px auto 1em auto;

     color: #9a9c9e;
 
     color: #9a9c9e;
 

+    p {
+        font-size: .75em;
+    }

     .footer-item {
         float: left;
         margin-right: 20 * $px;
         width: 220 * $px;
     .footer-item {
         float: left;
         margin-right: 20 * $px;
         width: 220 * $px;

-        p {
-            font-size: .75em;
-        }

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


@@ -158,6 +172,9 @@ footer.main {
             font-size: .75em;
         }
     }
             font-size: .75em;
         }
     }

+    .footer-extra p {
+        margin-top: 0;
+    }

 }
 
 
 }
 
 


@@ -223,6 +240,13 @@ footer.main {
         color: $oranji;
     }
 }
         color: $oranji;
     }
 }

+.link-list-colored {
+    a {
+        color: $oranji;
+    }
+}
+
+

 .plain {
     margin: 0;
     padding: 0;
 .plain {
     margin: 0;
     padding: 0;


@@ -231,3 +255,10 @@ footer.main {
         margin: 1em 0;
     }
 }
         margin: 1em 0;
     }
 }

+
+.flatpage {
+    img {
+        border: 5*$px solid #eee;
+        margin: 1.3em;
+    }
+}