Improve instruction

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

diff --git a/edumed/static/css/base.scss b/edumed/static/css/base.scss
index da9312c..38f8a09 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(http://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,10 +14,8 @@ a {
 }
 
 body {
 }
 
 body {

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

     margin: 0;
     margin: 0;

-    background: white;
-    color: $ciemny;

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


@@ -46,7 +42,12 @@ header.main {
     }
     #organizer {
         float: right;
     }
     #organizer {
         float: right;

-        margin-top: 1.3em;
+        font-size: .75em;
+        color: #777;
+        
+        img {
+            margin-top: .5em;
+        }

     }
 
 
     }
 
 


@@ -70,30 +71,35 @@ header.main {
             display: block;
             vertical-align: bottom;
             font-size: .85em;
             display: block;
             vertical-align: bottom;
             font-size: .85em;

-            

         }
         a:hover {
             color: $oranji;
         }
         }
         a:hover {
             color: $oranji;
         }

+

         a:before {
         a:before {

+            content: " ";

             display: block;
             margin-bottom: .8em;
             display: block;
             margin-bottom: .8em;

+            width: 44*$px;
+            height: 34*$px;
+            text-align:center;
+            margin: auto;
+            margin-bottom: .8em;

         }
         }

-        .menu-lekcje:before { content: url(../img/menu/lekcje.png);}
-        .menu-kompetencje:before { content: url(../img/menu/katalog.png); }
-        .menu-wspolpraca:before { content: url(../img/menu/wspolpraca.png);}
-        .menu-szkolenia:before { content: url(../img/menu/szkolenia.png); }
-        .menu-wesprzyj:before { content: url(../img/menu/wesprzyj.png);}
-        .menu-o-nas:before { content: url(../img/menu/o-nas.png); }
-        .menu-kontakt:before { content: url(../img/menu/kontakt.png); }
-        .menu-lekcje:hover:before { content: url(../img/menu/lekcje_active.png);}
-        .menu-kompetencje:hover:before { content: url(../img/menu/katalog_active.png); }
-        .menu-wspolpraca:hover:before { content: url(../img/menu/wspolpraca_active.png);}
-        .menu-szkolenia:hover:before { content: url(../img/menu/szkolenia_active.png); }
-        .menu-wesprzyj:hover:before { content: url(../img/menu/wesprzyj_active.png);}
-        .menu-o-nas:hover:before { content: url(../img/menu/o-nas_active.png); }
-        .menu-kontakt:hover:before { content: url(../img/menu/kontakt_active.png); }
-
+        .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-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-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%;}

 
     }
 
 
     }
 


@@ -130,25 +136,28 @@ 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;
-        }

     }
     }

-    .footer-item-half {
+    .sponsors-column {

         float: left;
         float: left;

-        margin-right: 20 * $px;
+        margin-left: 20 * $px;

         width: 100 * $px;
         p {
             font-size: .75em;
         }
     }
         width: 100 * $px;
         p {
             font-size: .75em;
         }
     }

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

 }
 
 
 }
 
 


@@ -199,6 +208,10 @@ footer.main {
     list-style: none;
     padding: 0;
 
     list-style: none;
     padding: 0;
 

+    li {
+        margin-bottom: .5em;
+    }
+

     a:before {
         content: "→";
         margin-right: .5em;
     a:before {
         content: "→";
         margin-right: .5em;


@@ -210,3 +223,25 @@ footer.main {
         color: $oranji;
     }
 }
         color: $oranji;
     }
 }

+.link-list-colored {
+    a {
+        color: $oranji;
+    }
+}
+
+
+.plain {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+    li {
+        margin: 1em 0;
+    }
+}
+
+.flatpage {
+    img {
+        border: 5*$px solid #eee;
+        margin: 1.3em;
+    }
+}