fix after merge

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

diff --git a/edumed/static/css/base.css b/edumed/static/css/base.css
index c59a82d..5ab583d 100644 (file)
--- a/edumed/static/css/base.css
+++ b/edumed/static/css/base.css
@@ -1,5 +1,5 @@
 @charset "UTF-8";
-@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);
 a {
   text-decoration: none;
   color: #ed7831; }
@@ -9,22 +9,33 @@ a {
 
 body {
   font-family: Dosis;
-  margin: 0;
   background: white;
-  color: #363a3e; }
+  color: #363a3e;
+  margin: 0; }
 
 .clr {
   clear: both; }
 
+#banners {
+  margin: 0 auto;
+  width: 58.75em; }
+  #banners > a {
+    display: block;
+    width: 100%; }
+  #banners img {
+    display: block;
+    margin: 0 auto;
+    width: 100%; }
+
 #header-wrapper {
   background-image: url(../img/header-bar.png);
   background-repeat: repeat-x;
   background-position: 0 100%; }
 
 header.main {
-  margin: 0 auto 1.438em;
+  margin: 0 auto 1.4375em;
   width: 58.75em;
-  padding: 1.813em 0.625em 0; }
+  padding: 1.8125em 0.625em 0; }
   header.main #logo {
     float: left;
     margin-bottom: 1.25em; }
@@ -67,43 +78,73 @@ header.main {
     background: url(../img/menu/lekcje.png) no-repeat 0 0;
     background-size: 100%; }
   header.main nav .menu-kompetencje:before {
-    background: url(../img/menu/katalog.png) no-repeat 0 0;
+    background: url(../img/menu/kompetencje.png) no-repeat 0 0;
     background-size: 100%; }
-  header.main nav .menu-wspolpraca:before {
-    background: url(../img/menu/wspolpraca.png) no-repeat 0 0;
+  header.main nav .menu-olimpiada:before {
+    background: url(../img/menu/olimpiada.png) no-repeat 0 0;
     background-size: 100%; }
-  header.main nav .menu-szkolenia:before {
-    background: url(../img/menu/szkolenia.png) no-repeat 0 0;
+  header.main nav .menu-trener:before {
+    background: url(../img/menu/dla-trenera.png) no-repeat 0 0;
     background-size: 100%; }
-  header.main nav .menu-wesprzyj:before {
-    background: url(../img/menu/wesprzyj.png) no-repeat 0 0;
+  header.main nav .menu-kurs:before {
+    background: url(../img/menu/dla-ucznia.png) no-repeat 0 0;
     background-size: 100%; }
   header.main nav .menu-o-nas:before {
     background: url(../img/menu/o-nas.png) no-repeat 0 0;
     background-size: 100%; }
-  header.main nav .menu-kontakt:before {
-    background: url(../img/menu/kontakt.png) no-repeat 0 0;
-    background-size: 100%; }
   header.main nav .menu-lekcje:hover:before {
     background: url(../img/menu/lekcje_active.png) no-repeat 0 0;
     background-size: 100%; }
   header.main nav .menu-kompetencje:hover:before {
-    background: url(../img/menu/katalog_active.png) no-repeat 0 0;
+    background: url(../img/menu/kompetencje_active.png) no-repeat 0 0;
     background-size: 100%; }
-  header.main nav .menu-wspolpraca:hover:before {
-    background: url(../img/menu/wspolpraca_active.png) no-repeat 0 0;
+  header.main nav .menu-olimpiada:hover:before {
+    background: url(../img/menu/olimpiada_active.png) no-repeat 0 0;
     background-size: 100%; }
-  header.main nav .menu-szkolenia:hover:before {
-    background: url(../img/menu/szkolenia_active.png) no-repeat 0 0;
+  header.main nav .menu-trener:hover:before {
+    background: url(../img/menu/dla-trenera_active.png) no-repeat 0 0;
     background-size: 100%; }
-  header.main nav .menu-wesprzyj:hover:before {
-    background: url(../img/menu/wesprzyj_active.png) no-repeat 0 0;
+  header.main nav .menu-kurs:hover:before {
+    background: url(../img/menu/dla-ucznia_active.png) no-repeat 0 0;
     background-size: 100%; }
   header.main nav .menu-o-nas:hover:before {
     background: url(../img/menu/o-nas_active.png) no-repeat 0 0;
     background-size: 100%; }
-  header.main nav .menu-kontakt:hover:before {
-    background: url(../img/menu/kontakt_active.png) no-repeat 0 0;
+  header.main nav .menu-oc-program:before {
+    background: url(../img/menu/olimpiada/program.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.main nav .menu-oc-harmonogram:before {
+    background: url(../img/menu/olimpiada/harmonogram.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.main nav .menu-oc-regulamin:before {
+    background: url(../img/menu/olimpiada/regulamin.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.main nav .menu-oc-literatura:before {
+    background: url(../img/menu/olimpiada/literatura.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.main nav .menu-oc-komitet:before {
+    background: url(../img/menu/olimpiada/komitet.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.main nav .menu-oc-kontakt:before {
+    background: url(../img/menu/olimpiada/kontakt.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.main nav .menu-oc-program:hover:before {
+    background: url(../img/menu/olimpiada/program_active.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.main nav .menu-oc-harmonogram:hover:before {
+    background: url(../img/menu/olimpiada/harmonogram_active.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.main nav .menu-oc-regulamin:hover:before {
+    background: url(../img/menu/olimpiada/regulamin_active.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.main nav .menu-oc-literatura:hover:before {
+    background: url(../img/menu/olimpiada/literatura_active.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.main nav .menu-oc-komitet:hover:before {
+    background: url(../img/menu/olimpiada/komitet_active.png) no-repeat 0 0;
+    background-size: 100%; }
+  header.main nav .menu-oc-kontakt:hover:before {
+    background: url(../img/menu/olimpiada/kontakt_active.png) no-repeat 0 0;
     background-size: 100%; }
   header.main #tagline {
     clear: both;
@@ -203,5 +244,7 @@ footer.main {
     margin: 1em 0; }
 
 .flatpage img {
-  border: 0.313em solid #eeeeee;
+  border: 0.3125em solid #eee;
   margin: 1.3em; }
+
+/*# sourceMappingURL=base.css.map */