test - poprawki

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

diff --git a/edumed/static/css/base.scss b/edumed/static/css/base.scss
index 5c38509..b87a3e8 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 {
@@ -16,14 +14,28 @@ a {
 }
 
 body {
-    font-family: Dosis;
+    @include base-font;
     margin: 0;
-    background: white;
-    color: $ciemny;
 }
 .clr {
     clear: both;
 }
+
+#banners {
+    margin: 0 auto;
+    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;
@@ -91,20 +103,37 @@ header.main {
             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-wspolpraca:before { background: url(../img/menu/wspolpraca.png) no-repeat 0 0; background-size: 100%;}
-        .menu-szkolenia:before { background: url(../img/menu/szkolenia.png) no-repeat 0 0; background-size: 100%;}
-        .menu-wesprzyj:before { background: url(../img/menu/wesprzyj.png) no-repeat 0 0; background-size: 100%;}
+        .menu-kompetencje:before { background: url(../img/menu/kompetencje.png) no-repeat 0 0; background-size: 100%;}
+        .menu-olimpiada:before { background: url(../img/menu/olimpiada.png) no-repeat 0 0; background-size: 100%;}
+        .menu-trener:before { background: url(../img/menu/dla-trenera.png) no-repeat 0 0; background-size: 100%;}
+        .menu-kurs:before { background: url(../img/menu/dla-ucznia.png) no-repeat 0 0; background-size: 100%;}
         .menu-o-nas:before { background: url(../img/menu/o-nas.png) no-repeat 0 0; background-size: 100%;}
-        .menu-kontakt:before { background: url(../img/menu/kontakt.png) no-repeat 0 0; background-size: 100%;}
+
         .menu-lekcje:hover:before { background: url(../img/menu/lekcje_active.png) no-repeat 0 0; background-size: 100%;}
-        .menu-kompetencje:hover:before { background: url(../img/menu/katalog_active.png) no-repeat 0 0; background-size: 100%;}
-        .menu-wspolpraca:hover:before { background: url(../img/menu/wspolpraca_active.png) no-repeat 0 0; background-size: 100%;}
-        .menu-szkolenia:hover:before { background: url(../img/menu/szkolenia_active.png) no-repeat 0 0; background-size: 100%;}
-        .menu-wesprzyj:hover:before { background: url(../img/menu/wesprzyj_active.png) no-repeat 0 0; background-size: 100%;}
+        .menu-kompetencje:hover:before { background: url(../img/menu/kompetencje_active.png) no-repeat 0 0; background-size: 100%;}
+        .menu-olimpiada:hover:before { background: url(../img/menu/olimpiada_active.png) no-repeat 0 0; background-size: 100%;}
+        .menu-trener:hover:before { background: url(../img/menu/dla-trenera_active.png) no-repeat 0 0; background-size: 100%;}
+        .menu-kurs:hover:before { background: url(../img/menu/dla-ucznia_active.png) no-repeat 0 0; background-size: 100%;}
         .menu-o-nas:hover:before { background: url(../img/menu/o-nas_active.png) no-repeat 0 0; background-size: 100%;}
-        .menu-kontakt:hover:before { background: url(../img/menu/kontakt_active.png) no-repeat 0 0; background-size: 100%;}
 
+        .menu-oc-program:before { background: url(../img/menu/olimpiada/program.png) no-repeat 0 0; background-size: 100%;}
+        .menu-oc-harmonogram:before { background: url(../img/menu/olimpiada/harmonogram.png) no-repeat 0 0; background-size: 100%;}
+        .menu-oc-regulamin:before { background: url(../img/menu/olimpiada/regulamin.png) no-repeat 0 0; background-size: 100%;}
+        .menu-oc-literatura:before { background: url(../img/menu/olimpiada/literatura.png) no-repeat 0 0; background-size: 100%;}
+        .menu-oc-komitet:before { background: url(../img/menu/olimpiada/komitet.png) no-repeat 0 0; background-size: 100%;}
+        .menu-oc-kontakt:before { background: url(../img/menu/olimpiada/kontakt.png) no-repeat 0 0; background-size: 100%;}
+        .menu-oc-program:hover:before {
+            background: url(../img/menu/olimpiada/program_active.png) no-repeat 0 0; background-size: 100%;}
+        .menu-oc-harmonogram:hover:before {
+            background: url(../img/menu/olimpiada/harmonogram_active.png) no-repeat 0 0; background-size: 100%;}
+        .menu-oc-regulamin:hover:before {
+            background: url(../img/menu/olimpiada/regulamin_active.png) no-repeat 0 0; background-size: 100%;}
+        .menu-oc-literatura:hover:before {
+            background: url(../img/menu/olimpiada/literatura_active.png) no-repeat 0 0; background-size: 100%;}
+        .menu-oc-komitet:hover:before {
+            background: url(../img/menu/olimpiada/komitet_active.png) no-repeat 0 0; background-size: 100%;}
+        .menu-oc-kontakt:hover:before {
+            background: url(../img/menu/olimpiada/kontakt_active.png) no-repeat 0 0; background-size: 100%;}
     }
 
     #tagline {
@@ -140,7 +169,7 @@ footer.main {
     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;
 
     p {
@@ -159,6 +188,9 @@ footer.main {
             font-size: .75em;
         }
     }
+    .footer-extra p {
+        margin-top: 0;
+    }
 }
 
 
@@ -239,3 +271,10 @@ footer.main {
         margin: 1em 0;
     }
 }
+
+.flatpage {
+    img {
+        border: 5*$px solid #eee;
+        margin: 1.3em;
+    }
+}