some frontend changes

diff --git a/catalogue/static/catalogue/css/carousel.css b/catalogue/static/catalogue/css/carousel.css
index fdf14f3..3392bb2 100644 (file)
--- a/catalogue/static/catalogue/css/carousel.css
+++ b/catalogue/static/catalogue/css/carousel.css
@@ -17,20 +17,19 @@
       top: 0;
       left: 0;
       height: 100%;
       top: 0;
       left: 0;
       height: 100%;

-      background-image: url(/static/test.jpg);
-      /* set real background image */
+      /* background-image: url(/static/test.jpg);  set real background image */

       background-size: 100% 100%;
       border-top-left-radius: 0.938em 6.38%;
       border-bottom-left-radius: 0.938em 6.38%; }
       #catalogue-carousel #catalogue-carousel-links li a {
         display: block;
       background-size: 100% 100%;
       border-top-left-radius: 0.938em 6.38%;
       border-bottom-left-radius: 0.938em 6.38%; }
       #catalogue-carousel #catalogue-carousel-links li a {
         display: block;

+        overflow: hidden;

         width: 28.75em;
         height: 100%;
         background-image: url(/static/catalogue/img/carousel-left.png);
         background-position: 100% 0;
         background-repeat: no-repeat;
         width: 28.75em;
         height: 100%;
         background-image: url(/static/catalogue/img/carousel-left.png);
         background-position: 100% 0;
         background-repeat: no-repeat;

-        background-size: 4.375em 100%;
-        /* left part of mask as background */ }
+        background-size: 4.375em 100%; }

   #catalogue-carousel #catalogue-carousel-switcher {
     margin: 0;
     padding: 3.125em 0 0 3.625em;
   #catalogue-carousel #catalogue-carousel-switcher {
     margin: 0;
     padding: 3.125em 0 0 3.625em;


@@ -41,30 +40,37 @@
     top: 0;
     list-style: none;
     border-radius: 0 0.938em 0.938em 0;
     top: 0;
     list-style: none;
     border-radius: 0 0.938em 0.938em 0;

-    background-color: #16a487;
+    background-color: #ed7831;

     background-image: url(/static/catalogue/img/carousel-right.png);
     background-position: 0 0;
     background-repeat: no-repeat;
     background-size: auto 14.688em;
     /* right part of mask as background */ }
     #catalogue-carousel #catalogue-carousel-switcher li {
     background-image: url(/static/catalogue/img/carousel-right.png);
     background-position: 0 0;
     background-repeat: no-repeat;
     background-size: auto 14.688em;
     /* right part of mask as background */ }
     #catalogue-carousel #catalogue-carousel-switcher li {

-      margin-bottom: .9em;
-      /* TODO: active sprites */ }
+      margin-bottom: .9em; }

       #catalogue-carousel #catalogue-carousel-switcher li a {
         text-transform: uppercase;
         color: #363a3e;
         font-size: .9em;
         font-weight: bold; }
       #catalogue-carousel #catalogue-carousel-switcher li a {
         text-transform: uppercase;
         color: #363a3e;
         font-size: .9em;
         font-weight: bold; }

-      #catalogue-carousel #catalogue-carousel-switcher li a.active {
-        color: white; }

       #catalogue-carousel #catalogue-carousel-switcher li a:before {
         vertical-align: top;
         margin-right: 1.5em; }
       #catalogue-carousel #catalogue-carousel-switcher li .knowledge:before {
       #catalogue-carousel #catalogue-carousel-switcher li a:before {
         vertical-align: top;
         margin-right: 1.5em; }
       #catalogue-carousel #catalogue-carousel-switcher li .knowledge:before {

-        content: url(/static/img/icons/knowledge.png); }
+        content: url(/static/img/icons/knowledge_dark.png); }

       #catalogue-carousel #catalogue-carousel-switcher li .activity:before {
       #catalogue-carousel #catalogue-carousel-switcher li .activity:before {

-        content: url(/static/img/icons/activity.png); }
+        content: url(/static/img/icons/activity_dark.png); }

       #catalogue-carousel #catalogue-carousel-switcher li .lesson-plan:before {
       #catalogue-carousel #catalogue-carousel-switcher li .lesson-plan:before {

-        content: url(/static/img/icons/lesson-plan.png); }
+        content: url(/static/img/icons/lesson-plan_dark.png); }

       #catalogue-carousel #catalogue-carousel-switcher li .reference:before {
       #catalogue-carousel #catalogue-carousel-switcher li .reference:before {

-        content: url(/static/img/icons/reference.png); }
+        content: url(/static/img/icons/reference_dark.png); }
+    #catalogue-carousel #catalogue-carousel-switcher li.activeSlide a {
+      color: white; }
+    #catalogue-carousel #catalogue-carousel-switcher li.activeSlide .knowledge:before {
+      content: url(/static/img/icons/knowledge_white.png); }
+    #catalogue-carousel #catalogue-carousel-switcher li.activeSlide .activity:before {
+      content: url(/static/img/icons/activity_white.png); }
+    #catalogue-carousel #catalogue-carousel-switcher li.activeSlide .lesson-plan:before {
+      content: url(/static/img/icons/lesson-plan_white.png); }
+    #catalogue-carousel #catalogue-carousel-switcher li.activeSlide .reference:before {
+      content: url(/static/img/icons/reference_white.png); }

diff --git a/catalogue/static/catalogue/css/carousel.scss b/catalogue/static/catalogue/css/carousel.scss
index 9f1fceb..ec28f71 100755 (executable)
--- a/catalogue/static/catalogue/css/carousel.scss
+++ b/catalogue/static/catalogue/css/carousel.scss
@@ -1,5 +1,8 @@
 $px: .0625em;
 
 $px: .0625em;
 

+$ciemny: #363a3e;
+
+

 #catalogue-carousel {
     float: left;
     position: relative;
 #catalogue-carousel {
     float: left;
     position: relative;


@@ -21,21 +24,20 @@ $px: .0625em;
             top: 0;
             left: 0;
             height: 100%;
             top: 0;
             left: 0;
             height: 100%;

-            background-image: url(/static/test.jpg); /* set real background image */
+            /* background-image: url(/static/test.jpg);  set real background image */

             background-size: 100% 100%;
             border-top-left-radius: 15*$px 6.38%;
             border-bottom-left-radius: 15*$px 6.38%;
 
             a {
                 display: block;
             background-size: 100% 100%;
             border-top-left-radius: 15*$px 6.38%;
             border-bottom-left-radius: 15*$px 6.38%;
 
             a {
                 display: block;

+                overflow: hidden;

                 width: 460*$px;
                 height: 100%;
                 background-image: url(/static/catalogue/img/carousel-left.png);
                 background-position: 100% 0;
                 background-repeat: no-repeat;
                 background-size: 70*$px 100%;
                 width: 460*$px;
                 height: 100%;
                 background-image: url(/static/catalogue/img/carousel-left.png);
                 background-position: 100% 0;
                 background-repeat: no-repeat;
                 background-size: 70*$px 100%;

-
-                /* left part of mask as background */

             }
         }
     }
             }
         }
     }


@@ -49,7 +51,7 @@ $px: .0625em;
         top: 0;
         list-style: none;
         border-radius: 0 15*$px 15*$px 0;
         top: 0;
         list-style: none;
         border-radius: 0 15*$px 15*$px 0;

-        background-color: #16a487;
+        background-color: #ed7831;

         background-image: url(/static/catalogue/img/carousel-right.png);
         background-position: 0 0;
         background-repeat: no-repeat;
         background-image: url(/static/catalogue/img/carousel-right.png);
         background-position: 0 0;
         background-repeat: no-repeat;


@@ -62,22 +64,27 @@ $px: .0625em;
 
             a {
                 text-transform: uppercase;
 
             a {
                 text-transform: uppercase;

-                color: #363a3e;
+                color: $ciemny;

                 font-size: .9em;
                 font-weight: bold;
             }
                 font-size: .9em;
                 font-weight: bold;
             }

-            a.active {
-                color: white;
-            }

             a:before {
                 vertical-align: top;
                 margin-right: 1.5em;
             }
             a:before {
                 vertical-align: top;
                 margin-right: 1.5em;
             }

-            .knowledge:before {content: url(/static/img/icons/knowledge.png);}
-            .activity:before {content: url(/static/img/icons/activity.png);}
-            .lesson-plan:before {content: url(/static/img/icons/lesson-plan.png);}
-            .reference:before {content: url(/static/img/icons/reference.png);}
-            /* TODO: active sprites */
+            .knowledge:before {content: url(/static/img/icons/knowledge_dark.png);}
+            .activity:before {content: url(/static/img/icons/activity_dark.png);}
+            .lesson-plan:before {content: url(/static/img/icons/lesson-plan_dark.png);}
+            .reference:before {content: url(/static/img/icons/reference_dark.png);}
+        }
+        li.activeSlide {
+            a {
+                color: white;
+            }
+            .knowledge:before {content: url(/static/img/icons/knowledge_white.png);}
+            .activity:before {content: url(/static/img/icons/activity_white.png);}
+            .lesson-plan:before {content: url(/static/img/icons/lesson-plan_white.png);}
+            .reference:before {content: url(/static/img/icons/reference_white.png);}

         }
     }
 
         }
     }
 

diff --git a/catalogue/static/catalogue/css/layout.css b/catalogue/static/catalogue/css/layout.css
index 0006fdc..b972784 100644 (file)
--- a/catalogue/static/catalogue/css/layout.css
+++ b/catalogue/static/catalogue/css/layout.css
@@ -11,15 +11,18 @@
       margin: 0; }
     #sidebar section h1.realisation {
       font-weight: normal; }
       margin: 0; }
     #sidebar section h1.realisation {
       font-weight: normal; }

-    #sidebar section h1.realisation:before {
-      content: url(/static/img/icons/time.png);
-      vertical-align: middle;
-      margin-right: 0.625em; }

   #sidebar .box {
   #sidebar .box {

-    background-color: #16a487;
+    background-color: #d4d6d8;

     border-radius: 0.938em;
     padding: 1.063em 0.75em 1.063em 0.75em; }
     border-radius: 0.938em;
     padding: 1.063em 0.75em 1.063em 0.75em; }

-    #sidebar .box .dl-button {
+    #sidebar .box h1 {
+      font-size: 1em;
+      text-transform: uppercase; }
+  #sidebar .box-button {
+    background-color: #ed7831;
+    border-radius: 0.938em;
+    padding: 1.063em 0.75em 1.063em 0.75em; }
+    #sidebar .box-button .dl-button {

       color: white; }
   #sidebar .dl-button {
     color: #363a3e;
       color: white; }
   #sidebar .dl-button {
     color: #363a3e;

diff --git a/catalogue/static/catalogue/css/layout.scss b/catalogue/static/catalogue/css/layout.scss
index 1e14cf0..ed4cb33 100755 (executable)
--- a/catalogue/static/catalogue/css/layout.scss
+++ b/catalogue/static/catalogue/css/layout.scss
@@ -16,18 +16,21 @@ $new_black: #363a3e;
         h1.realisation {
             font-weight: normal;
         }
         h1.realisation {
             font-weight: normal;
         }

-        h1.realisation:before {
-            content: url(/static/img/icons/time.png);
-            vertical-align: middle;
-            margin-right: 10*$px;
-        }

     }
 
     .box {
     }
 
     .box {

-        background-color: #16a487;
+        background-color: #d4d6d8;
+        border-radius: 15*$px;
+        padding: 17*$px 12*$px 17*$px 12*$px;
+        h1 {
+            font-size: 1em;
+            text-transform: uppercase;
+        }
+    }
+    .box-button {
+        background-color: #ed7831;

         border-radius: 15*$px;
         padding: 17*$px 12*$px 17*$px 12*$px;
         border-radius: 15*$px;
         padding: 17*$px 12*$px 17*$px 12*$px;

-

         .dl-button {
             color: white;
         }
         .dl-button {
             color: white;
         }

diff --git a/catalogue/static/catalogue/img/carousel-right.png b/catalogue/static/catalogue/img/carousel-right.png
index 1c8949b..3987678 100644 (file)
Binary files a/catalogue/static/catalogue/img/carousel-right.png and b/catalogue/static/catalogue/img/carousel-right.png differ

diff --git a/catalogue/static/catalogue/js/carousel.js b/catalogue/static/catalogue/js/carousel.js
index 0b61b47..e340eaa 100755 (executable)
--- a/catalogue/static/catalogue/js/carousel.js
+++ b/catalogue/static/catalogue/js/carousel.js
@@ -21,7 +21,8 @@ $("#catalogue-carousel-links").cycle({
     easeIn: 'easeInQuad',
     easeOut: 'easeOutQuad',
     speed: 1000,
     easeIn: 'easeInQuad',
     easeOut: 'easeOutQuad',
     speed: 1000,

-    
+    pager: '#catalogue-carousel-switcher',
+    pagerAnchorBuilder: function(){},

 });
 
 
 });
 
 

diff --git a/catalogue/templates/catalogue/latest_blog_posts.html b/catalogue/templates/catalogue/latest_blog_posts.html
index d2c90e1..e9eb109 100755 (executable)
--- a/catalogue/templates/catalogue/latest_blog_posts.html
+++ b/catalogue/templates/catalogue/latest_blog_posts.html
@@ -1,5 +1,5 @@
-<ol>
+<ol class="link-list">

 {% for post in posts %}
     <li><a href="{{ post.link }}">{{ post.title }}</a></li>
 {% endfor %}
 {% for post in posts %}
     <li><a href="{{ post.link }}">{{ post.title }}</a></li>
 {% endfor %}

-</ol>
\ No newline at end of file
+</ol>

diff --git a/catalogue/templates/catalogue/lesson_detail.html b/catalogue/templates/catalogue/lesson_detail.html
index 2197ea8..81ca932 100755 (executable)
--- a/catalogue/templates/catalogue/lesson_detail.html
+++ b/catalogue/templates/catalogue/lesson_detail.html
@@ -11,22 +11,22 @@
         <h1 class="realisation">Realizacja i czas lekcji</h1>
         {% if object.depth == 0 %}
         <p>To lekcja jest syntezą działu
         <h1 class="realisation">Realizacja i czas lekcji</h1>
         {% if object.depth == 0 %}
         <p>To lekcja jest syntezą działu

-        {{ object.section }}.
+        <strong>{{ object.section }}</strong>.

         Dostępny jest również
         Dostępny jest również

-        <a href="{% url 'catalogue_lessons' %}#{{ object.section.slug }}">szczegółowy kurs</a>
+        <strong><a href="{% url 'catalogue_lessons' %}#{{ object.section.slug }}">szczegółowy kurs</a></strong>

         dla tego działu.
         </p>
         {% else %}
         <p>Ta lekcja jest częścią działu
         dla tego działu.
         </p>
         {% else %}
         <p>Ta lekcja jest częścią działu

-        {{ object.section }}.
+        <strong>{{ object.section }}</strong>.

         Dostępna jest również
         Dostępna jest również

-        <a href="">lekcja syntetyczna</a>
+        <strong><a href="">lekcja syntetyczna</a></strong>

         dla tego działu.
         </p>
         {% endif %}
         <p>Czas trwania: 45 minut.</p>
     </section>
         dla tego działu.
         </p>
         {% endif %}
         <p>Czas trwania: 45 minut.</p>
     </section>

-    <section class="box"><a href="" class="dl-button">Pobierz całą lekcję</a></section>
+    <section class="box-button"><a href="" class="dl-button">Pobierz całą lekcję</a></section>

     <section><a href="" class="dl-button">Pobierz lekcję w wersji dla ucznia</a></section>
     <section class="section">
         <h1>Korzystanie z informacji</h1>
     <section><a href="" class="dl-button">Pobierz lekcję w wersji dla ucznia</a></section>
     <section class="section">
         <h1>Korzystanie z informacji</h1>

diff --git a/catalogue/templates/catalogue/section_list.html b/catalogue/templates/catalogue/section_list.html
index 6ab5580..1dd9cb9 100755 (executable)
--- a/catalogue/templates/catalogue/section_list.html
+++ b/catalogue/templates/catalogue/section_list.html
@@ -14,14 +14,14 @@
         </p>
         <p>Czas trwania: 45 minut</p>
     </section>
         </p>
         <p>Czas trwania: 45 minut</p>
     </section>

-    <section class="box"><a href="" class="dl-button">Pobierz wszystkie lekcje</a></section>
+    <section class="box-button"><a href="" class="dl-button">Pobierz wszystkie lekcje</a></section>

     <section><a href="" class="dl-button">Pobierz wszystkie lekcje w&nbsp;wersji dla ucznia</a></section>
     <section class="section-minor">
         <h1>Zebrane z wszystkich działów</h1>
     <section><a href="" class="dl-button">Pobierz wszystkie lekcje w&nbsp;wersji dla ucznia</a></section>
     <section class="section-minor">
         <h1>Zebrane z wszystkich działów</h1>

-        <ul>
-            <li>Słowniczek</li>
-            <li>Czytelnia</li>
-            <li>Używane metody edukacyjne</li>
+        <ul class="link-list">
+            <li><a href="">Słowniczek</a></li>
+            <li><a href="">Czytelnia</a></li>
+            <li><a href="">Używane metody edukacyjne</a></li>

         </ul>
     </section>
 </aside>
         </ul>
     </section>
 </aside>

diff --git a/catalogue/templates/catalogue/snippets/carousel.html b/catalogue/templates/catalogue/snippets/carousel.html
index 2c0106d..692a9b8 100755 (executable)
--- a/catalogue/templates/catalogue/snippets/carousel.html
+++ b/catalogue/templates/catalogue/snippets/carousel.html
@@ -1,17 +1,24 @@
+{% load url from future %}

 
 <section id="catalogue-carousel">
     <ul id="catalogue-carousel-links">
 
 <section id="catalogue-carousel">
     <ul id="catalogue-carousel-links">

-        <li>
-            <a href="" class="catalogue-carousel-link"> </a>
+        <li style="background-image: url(/static/carousel/img1.jpg); z-index: 100;">
+            <a href="{% url 'catalogue_lesson' 'jak-planowac-prace-z-informacja' %}" class="catalogue-carousel-link"></a>

         </li>
         </li>

-        <li>
-            <a href="" class="catalogue-carousel-link"> </a>
+        <li style="background-image: url(/static/carousel/img2.jpg)">
+            <a href="{% url 'catalogue_lesson' 'jak-planowac-prace-z-informacja' %}" class="catalogue-carousel-link"></a>
+        </li>
+        <li style="background-image: url(/static/carousel/img3.jpg)">
+            <a href="{% url 'catalogue_lesson' 'jak-planowac-prace-z-informacja' %}" class="catalogue-carousel-link"></a>
+        </li>
+        <li style="background-image: url(/static/carousel/img4.jpg)">
+            <a href="{% url 'catalogue_lesson' 'jak-planowac-prace-z-informacja' %}" class="catalogue-carousel-link"></a>

         </li>
     </ul>
     <ul id="catalogue-carousel-switcher">
         </li>
     </ul>
     <ul id="catalogue-carousel-switcher">

-        <li><a href="" class="knowledge">wiedza w pigułce</a></li>
-        <li><a href="" class="activity active">ćwiczenia</a></li>
-        <li><a href="" class="lesson-plan">scenariusze</a></li>
-        <li><a href="" class="reference">słowniczek</a></li>
+        <li><a href="{% url 'catalogue_lesson' 'jak-planowac-prace-z-informacja' %}" class="knowledge">wiedza w pigułce</a></li>
+        <li><a href="{% url 'catalogue_lesson' 'jak-planowac-prace-z-informacja' %}" class="activity">ćwiczenia</a></li>
+        <li><a href="{% url 'catalogue_lesson' 'jak-planowac-prace-z-informacja' %}" class="lesson-plan">scenariusze</a></li>
+        <li><a href="{% url 'catalogue_lesson' 'jak-planowac-prace-z-informacja' %}" class="reference">słowniczek</a></li>

     </ul>
 </section>
     </ul>
 </section>

diff --git a/catalogue/templates/catalogue/snippets/chosen_topics.html b/catalogue/templates/catalogue/snippets/chosen_topics.html
index 725ba91..fe9ff43 100755 (executable)
--- a/catalogue/templates/catalogue/snippets/chosen_topics.html
+++ b/catalogue/templates/catalogue/snippets/chosen_topics.html
@@ -1,6 +1,6 @@
-<ul>
+<ul class="link-list">

     <li><a href="">język polski</a></li>
     <li><a href="">informatykę</a></li>
     <li><a href="">wiedzę o społeczeństwie</a></li>
     <li><a href="">muzykę</a></li>
     <li><a href="">język polski</a></li>
     <li><a href="">informatykę</a></li>
     <li><a href="">wiedzę o społeczeństwie</a></li>
     <li><a href="">muzykę</a></li>

-</ul>
\ No newline at end of file
+</ul>

diff --git a/catalogue/templates/catalogue/snippets/section_buttons.html b/catalogue/templates/catalogue/snippets/section_buttons.html
index 6964726..d926dbe 100755 (executable)
--- a/catalogue/templates/catalogue/snippets/section_buttons.html
+++ b/catalogue/templates/catalogue/snippets/section_buttons.html
@@ -3,6 +3,6 @@
 <ul class="section-buttons">
 {% for object in object_list %}
     {% url "catalogue_lessons" as lessons_url %}
 <ul class="section-buttons">
 {% for object in object_list %}
     {% url "catalogue_lessons" as lessons_url %}

-    <li class="box{{ object.order }}"><a href="{{ lessons_url }}#{{  object.slug }}">{{ object }}</a></li>
+    <li class="box{{ object.order }}"><a href="{{ lessons_url }}#{{  object.slug }}"><span>{{ object }}</span></a></li>

 {% endfor %}
 {% endfor %}

-</ul>
\ No newline at end of file
+</ul>

diff --git a/edumed/static/css/base.css b/edumed/static/css/base.css
index 24cc530..424469c 100644 (file)
--- a/edumed/static/css/base.css
+++ b/edumed/static/css/base.css
@@ -1,3 +1,4 @@
+@charset "UTF-8";

 @import url(http://fonts.googleapis.com/css?family=Dosis:400,700&subset=latin,latin-ext);
 a {
   text-decoration: none;
 @import url(http://fonts.googleapis.com/css?family=Dosis:400,700&subset=latin,latin-ext);
 a {
   text-decoration: none;


@@ -44,12 +45,12 @@ header.main {
     text-align: center;
     /*position:relative;*/ }
   header.main nav a {
     text-align: center;
     /*position:relative;*/ }
   header.main nav a {

-    color: #ed7831;
+    color: #363a3e;

     display: block;
     vertical-align: bottom;
     font-size: .85em; }
   header.main nav a:hover {
     display: block;
     vertical-align: bottom;
     font-size: .85em; }
   header.main nav a:hover {

-    color: #363a3e; }
+    color: #ed7831; }

   header.main nav a:before {
     display: block;
     margin-bottom: .8em; }
   header.main nav a:before {
     display: block;
     margin-bottom: .8em; }


@@ -152,3 +153,14 @@ footer.main {
     text-transform: uppercase; }
   #search input::-ms-placeholder {
     text-transform: uppercase; }
     text-transform: uppercase; }
   #search input::-ms-placeholder {
     text-transform: uppercase; }

+
+.link-list {
+  list-style: none;
+  padding: 0; }
+  .link-list a:before {
+    content: "→";
+    margin-right: .5em; }
+  .link-list a {
+    color: #363a3e; }
+  .link-list a:hover {
+    color: #ed7831; }

diff --git a/edumed/static/css/base.scss b/edumed/static/css/base.scss
index 4b3a53d..da9312c 100644 (file)
--- a/edumed/static/css/base.scss
+++ b/edumed/static/css/base.scss
@@ -66,14 +66,14 @@ header.main {
             /*position:relative;*/
         }
         a {
             /*position:relative;*/
         }
         a {

-            color: $oranji;
+            color: $ciemny;

             display: block;
             vertical-align: bottom;
             font-size: .85em;
             
         }
         a:hover {
             display: block;
             vertical-align: bottom;
             font-size: .85em;
             
         }
         a:hover {

-            color: $ciemny;
+            color: $oranji;

         }
         a:before {
             display: block;
         }
         a:before {
             display: block;


@@ -192,4 +192,21 @@ footer.main {
         text-transform: uppercase;
     }
 
         text-transform: uppercase;
     }
 

-}
\ No newline at end of file
+}
+
+
+.link-list {
+    list-style: none;
+    padding: 0;
+
+    a:before {
+        content: "→";
+        margin-right: .5em;
+    }
+    a {
+        color: $ciemny;
+    }
+    a:hover {
+        color: $oranji;
+    }
+}

diff --git a/edumed/static/css/main.css b/edumed/static/css/main.css
index 71a4e6c..98fb208 100644 (file)
--- a/edumed/static/css/main.css
+++ b/edumed/static/css/main.css
@@ -1,10 +1,7 @@
 #main-promobox {
 #main-promobox {

-  /*position: absolute;
-  top: 0;
-  right: 10 * $px;*/

   float: right;
   border-radius: 0.938em;
   float: right;
   border-radius: 0.938em;

-  background: #f8b323;
+  background: #16a487;

   padding: 1.5em 1.25em;
   width: 11.25em;
   height: 11.688em; }
   padding: 1.5em 1.25em;
   width: 11.25em;
   height: 11.688em; }


@@ -14,7 +11,7 @@
     text-transform: uppercase;
     font-size: .9em; }
   #main-promobox h1:before {
     text-transform: uppercase;
     font-size: .9em; }
   #main-promobox h1:before {

-    content: url(/static/img/icons/announce.png);
+    content: url(/static/img/icons/announce_white.png);

     margin-right: 1.2em;
     vertical-align: top; }
   #main-promobox h2 {
     margin-right: 1.2em;
     vertical-align: top; }
   #main-promobox h2 {


@@ -48,16 +45,26 @@
       float: left;
       width: 10em;
       height: 5.625em;
       float: left;
       width: 10em;
       height: 5.625em;

-      border-radius: 0.938em;
-      display: table; }
+      border-radius: 0.938em; }

       #main-sections ul li a {
       #main-sections ul li a {

-        display: table-cell;
-        padding-left: 1.688em;
-        vertical-align: middle;
-        height: 100%;

         color: white;
         text-transform: uppercase;
         color: white;
         text-transform: uppercase;

-        font-size: .9em; }
+        display: block;
+        height: 4.375em;
+        width: 8.75em;
+        display: table;
+        padding: 0.625em; }
+        #main-sections ul li a span {
+          font-size: .9em;
+          height: 100%;
+          width: 100%;
+          display: table-cell;
+          vertical-align: middle;
+          border: 1px solid transparent;
+          border-radius: 0.625em;
+          padding-left: 1em; }
+      #main-sections ul li a:hover span {
+        border: 1px solid white; }

     #main-sections ul .box1 {
       background-color: #adaeaf; }
     #main-sections ul .box2 {
     #main-sections ul .box1 {
       background-color: #adaeaf; }
     #main-sections ul .box2 {


@@ -84,15 +91,11 @@
     margin: 0 0 0 1.4em;
     text-transform: uppercase; }
   #main-chosen ul {
     margin: 0 0 0 1.4em;
     text-transform: uppercase; }
   #main-chosen ul {

-    margin: 1.063em 0 0 1.4em;
-    padding: 0;
-    list-style-position: inside; }
+    margin: 1.063em 0 0 1.4em; }

     #main-chosen ul li {
       font-size: .9em;
       text-transform: uppercase;
       line-height: 1.25em; }
     #main-chosen ul li {
       font-size: .9em;
       text-transform: uppercase;
       line-height: 1.25em; }

-      #main-chosen ul li a {
-        color: #363a3e; }

 
 #main-tools {
   clear: both; }
 
 #main-tools {
   clear: both; }


@@ -107,10 +110,5 @@
       text-transform: uppercase; }
     #main-tools .main-tools-box ul, #main-tools .main-tools-box ol {
       margin: 1.1em 0 0 0;
       text-transform: uppercase; }
     #main-tools .main-tools-box ul, #main-tools .main-tools-box ol {
       margin: 1.1em 0 0 0;

-      padding: 0;
-      list-style-position: inside;
-      color: #ed7831;

       font-size: .9em;
       line-height: 1.15em; }
       font-size: .9em;
       line-height: 1.15em; }

-      #main-tools .main-tools-box ul li a, #main-tools .main-tools-box ol li a {
-        color: #ed7831; }

diff --git a/edumed/static/css/main.scss b/edumed/static/css/main.scss
index 2905854..59422de 100755 (executable)
--- a/edumed/static/css/main.scss
+++ b/edumed/static/css/main.scss
@@ -1,14 +1,11 @@
 $px: .0625em;
 
 #main-promobox {
 $px: .0625em;
 
 #main-promobox {

-    /*position: absolute;
-    top: 0;
-    right: 10 * $px;*/

     float: right;
 
     border-radius: 15*$px;
 
     float: right;
 
     border-radius: 15*$px;
 

-    background: #f8b323;
+    background: #16a487;

     padding: 1.5em 20*$px;
     width: 220*$px - 2 * 20*$px;
     height: 235*$px - 2 * 1.5em;
     padding: 1.5em 20*$px;
     width: 220*$px - 2 * 20*$px;
     height: 235*$px - 2 * 1.5em;


@@ -20,7 +17,7 @@ $px: .0625em;
         font-size: .9em;
     }
     h1:before {
         font-size: .9em;
     }
     h1:before {

-        content: url(/static/img/icons/announce.png);
+        content: url(/static/img/icons/announce_white.png);

         margin-right: 1.2em;
         vertical-align: top;
     }
         margin-right: 1.2em;
         vertical-align: top;
     }


@@ -64,16 +61,29 @@ $px: .0625em;
             width: 160*$px;
             height: 90*$px;
             border-radius: 15*$px;
             width: 160*$px;
             height: 90*$px;
             border-radius: 15*$px;

-            display: table;

 
             a {
 
             a {

-                display: table-cell;
-                padding-left: 27*$px;
-                vertical-align: middle;
-                height: 100%;

                 color: white;
                 text-transform: uppercase;
                 color: white;
                 text-transform: uppercase;

-                font-size: .9em;
+                display: block;
+                height: 70*$px;
+                width: 140*$px;
+                display: table;
+                padding: 10*$px;
+
+                span {
+                    font-size: .9em;
+                    height: 100%;
+                    width: 100%;
+                    display: table-cell;
+                    vertical-align: middle;
+                    border: 1px solid transparent;
+                    border-radius: 10*$px;
+                    padding-left: 16*$px;
+                }
+            }
+            a:hover span {
+                border: 1px solid white;

             }
         }
         .box1 {background-color: #adaeaf;}
             }
         }
         .box1 {background-color: #adaeaf;}


@@ -100,17 +110,11 @@ $px: .0625em;
 
     ul {
         margin: 17*$px 0 0 1.4em;;
 
     ul {
         margin: 17*$px 0 0 1.4em;;

-        padding: 0;
-        list-style-position:inside;

 
         li {
             font-size: .9em;
             text-transform: uppercase;
             line-height: 1.25em;
 
         li {
             font-size: .9em;
             text-transform: uppercase;
             line-height: 1.25em;

-
-            a {
-                color: #363a3e;
-            }

         }
     }
 }
         }
     }
 }


@@ -131,17 +135,8 @@ $px: .0625em;
 
         ul, ol {
             margin: 1.1em 0 0 0;
 
         ul, ol {
             margin: 1.1em 0 0 0;

-            padding: 0;
-            list-style-position:inside;
-            color: #ed7831;

             font-size: .9em;
             line-height: 1.15em;
             font-size: .9em;
             line-height: 1.15em;

-
-            li {
-                a {
-                    color: #ed7831;
-                }
-            }

         }
     }
 }
         }
     }
 }

diff --git a/edumed/static/img/icons/activity.png b/edumed/static/img/icons/activity.png
deleted file mode 100644 (file)
index 2a9f829..0000000
Binary files a/edumed/static/img/icons/activity.png and /dev/null differ

diff --git a/edumed/static/img/icons/activity_dark.png b/edumed/static/img/icons/activity_dark.png
new file mode 100644 (file)
index 0000000..a2cbaba
Binary files /dev/null and b/edumed/static/img/icons/activity_dark.png differ

diff --git a/edumed/static/img/icons/activity_orange.png b/edumed/static/img/icons/activity_orange.png
new file mode 100644 (file)
index 0000000..2a9f829
Binary files /dev/null and b/edumed/static/img/icons/activity_orange.png differ

diff --git a/edumed/static/img/icons/activity_white.png b/edumed/static/img/icons/activity_white.png
new file mode 100644 (file)
index 0000000..a8550f0
Binary files /dev/null and b/edumed/static/img/icons/activity_white.png differ

diff --git a/edumed/static/img/icons/announce.png b/edumed/static/img/icons/announce.png
deleted file mode 100644 (file)
index 1f1eb01..0000000
Binary files a/edumed/static/img/icons/announce.png and /dev/null differ

diff --git a/edumed/static/img/icons/announce_dark.png b/edumed/static/img/icons/announce_dark.png
new file mode 100644 (file)
index 0000000..485c358
Binary files /dev/null and b/edumed/static/img/icons/announce_dark.png differ

diff --git a/edumed/static/img/icons/announce_orange.png b/edumed/static/img/icons/announce_orange.png
new file mode 100644 (file)
index 0000000..1f1eb01
Binary files /dev/null and b/edumed/static/img/icons/announce_orange.png differ

diff --git a/edumed/static/img/icons/announce_white.png b/edumed/static/img/icons/announce_white.png
new file mode 100644 (file)
index 0000000..0142525
Binary files /dev/null and b/edumed/static/img/icons/announce_white.png differ

diff --git a/edumed/static/img/icons/knowledge.png b/edumed/static/img/icons/knowledge.png
deleted file mode 100644 (file)
index 129689f..0000000
Binary files a/edumed/static/img/icons/knowledge.png and /dev/null differ

diff --git a/edumed/static/img/icons/knowledge_dark.png b/edumed/static/img/icons/knowledge_dark.png
new file mode 100644 (file)
index 0000000..3cfdd36
Binary files /dev/null and b/edumed/static/img/icons/knowledge_dark.png differ

diff --git a/edumed/static/img/icons/knowledge_orange.png b/edumed/static/img/icons/knowledge_orange.png
new file mode 100644 (file)
index 0000000..129689f
Binary files /dev/null and b/edumed/static/img/icons/knowledge_orange.png differ

diff --git a/edumed/static/img/icons/knowledge_white.png b/edumed/static/img/icons/knowledge_white.png
new file mode 100644 (file)
index 0000000..62d9b8b
Binary files /dev/null and b/edumed/static/img/icons/knowledge_white.png differ

diff --git a/edumed/static/img/icons/lesson-plan.png b/edumed/static/img/icons/lesson-plan.png
deleted file mode 100644 (file)
index 1402d17..0000000
Binary files a/edumed/static/img/icons/lesson-plan.png and /dev/null differ

diff --git a/edumed/static/img/icons/lesson-plan_dark.png b/edumed/static/img/icons/lesson-plan_dark.png
new file mode 100644 (file)
index 0000000..07ce96b
Binary files /dev/null and b/edumed/static/img/icons/lesson-plan_dark.png differ

diff --git a/edumed/static/img/icons/lesson-plan_orange.png b/edumed/static/img/icons/lesson-plan_orange.png
new file mode 100644 (file)
index 0000000..1402d17
Binary files /dev/null and b/edumed/static/img/icons/lesson-plan_orange.png differ

diff --git a/edumed/static/img/icons/lesson-plan_white.png b/edumed/static/img/icons/lesson-plan_white.png
new file mode 100644 (file)
index 0000000..63a516b
Binary files /dev/null and b/edumed/static/img/icons/lesson-plan_white.png differ

diff --git a/edumed/static/img/icons/reference.png b/edumed/static/img/icons/reference.png
deleted file mode 100644 (file)
index f087312..0000000
Binary files a/edumed/static/img/icons/reference.png and /dev/null differ

diff --git a/edumed/static/img/icons/reference_active.png b/edumed/static/img/icons/reference_active.png
deleted file mode 100644 (file)
index fa7663a..0000000
Binary files a/edumed/static/img/icons/reference_active.png and /dev/null differ

diff --git a/edumed/static/img/icons/reference_dark.png b/edumed/static/img/icons/reference_dark.png
new file mode 100644 (file)
index 0000000..6df814c
Binary files /dev/null and b/edumed/static/img/icons/reference_dark.png differ

diff --git a/edumed/static/img/icons/reference_orange.png b/edumed/static/img/icons/reference_orange.png
new file mode 100644 (file)
index 0000000..f087312
Binary files /dev/null and b/edumed/static/img/icons/reference_orange.png differ

diff --git a/edumed/static/img/icons/reference_white.png b/edumed/static/img/icons/reference_white.png
new file mode 100644 (file)
index 0000000..6487417
Binary files /dev/null and b/edumed/static/img/icons/reference_white.png differ

diff --git a/edumed/static/img/icons/time.png b/edumed/static/img/icons/time.png
deleted file mode 100644 (file)
index 80ee73a..0000000
Binary files a/edumed/static/img/icons/time.png and /dev/null differ

diff --git a/edumed/static/img/icons/time_dark.png b/edumed/static/img/icons/time_dark.png
new file mode 100644 (file)
index 0000000..157b759
Binary files /dev/null and b/edumed/static/img/icons/time_dark.png differ

diff --git a/edumed/static/img/icons/time_orange.png b/edumed/static/img/icons/time_orange.png
new file mode 100644 (file)
index 0000000..80ee73a
Binary files /dev/null and b/edumed/static/img/icons/time_orange.png differ

diff --git a/edumed/static/img/icons/time_white.png b/edumed/static/img/icons/time_white.png
new file mode 100644 (file)
index 0000000..ab4ec8f
Binary files /dev/null and b/edumed/static/img/icons/time_white.png differ

diff --git a/edumed/static/img/menu/katalog.png b/edumed/static/img/menu/katalog.png
index c4de4a7..429c03f 100644 (file)
Binary files a/edumed/static/img/menu/katalog.png and b/edumed/static/img/menu/katalog.png differ

diff --git a/edumed/static/img/menu/katalog_active.png b/edumed/static/img/menu/katalog_active.png
index 5768b3c..c4de4a7 100644 (file)
Binary files a/edumed/static/img/menu/katalog_active.png and b/edumed/static/img/menu/katalog_active.png differ

diff --git a/edumed/static/img/menu/kontakt.png b/edumed/static/img/menu/kontakt.png
index 6e9fcef..193b815 100644 (file)
Binary files a/edumed/static/img/menu/kontakt.png and b/edumed/static/img/menu/kontakt.png differ

diff --git a/edumed/static/img/menu/kontakt_active.png b/edumed/static/img/menu/kontakt_active.png
index c4802e0..6e9fcef 100644 (file)
Binary files a/edumed/static/img/menu/kontakt_active.png and b/edumed/static/img/menu/kontakt_active.png differ

diff --git a/edumed/static/img/menu/lekcje.png b/edumed/static/img/menu/lekcje.png
index 3a8865a..f1aba2f 100644 (file)
Binary files a/edumed/static/img/menu/lekcje.png and b/edumed/static/img/menu/lekcje.png differ

diff --git a/edumed/static/img/menu/lekcje_active.png b/edumed/static/img/menu/lekcje_active.png
index c8ddd1d..3a8865a 100644 (file)
Binary files a/edumed/static/img/menu/lekcje_active.png and b/edumed/static/img/menu/lekcje_active.png differ

diff --git a/edumed/static/img/menu/o-nas.png b/edumed/static/img/menu/o-nas.png
index ae004c1..fdc7f4a 100644 (file)
Binary files a/edumed/static/img/menu/o-nas.png and b/edumed/static/img/menu/o-nas.png differ

diff --git a/edumed/static/img/menu/o-nas_active.png b/edumed/static/img/menu/o-nas_active.png
index 2d8d30f..ae004c1 100644 (file)
Binary files a/edumed/static/img/menu/o-nas_active.png and b/edumed/static/img/menu/o-nas_active.png differ

diff --git a/edumed/static/img/menu/szkolenia.png b/edumed/static/img/menu/szkolenia.png
index da0a1d5..cb0e744 100644 (file)
Binary files a/edumed/static/img/menu/szkolenia.png and b/edumed/static/img/menu/szkolenia.png differ

diff --git a/edumed/static/img/menu/szkolenia_active.png b/edumed/static/img/menu/szkolenia_active.png
index 8d79992..da0a1d5 100644 (file)
Binary files a/edumed/static/img/menu/szkolenia_active.png and b/edumed/static/img/menu/szkolenia_active.png differ

diff --git a/edumed/static/img/menu/wesprzyj.png b/edumed/static/img/menu/wesprzyj.png
index 1c3b4c8..28e2037 100644 (file)
Binary files a/edumed/static/img/menu/wesprzyj.png and b/edumed/static/img/menu/wesprzyj.png differ

diff --git a/edumed/static/img/menu/wesprzyj_active.png b/edumed/static/img/menu/wesprzyj_active.png
index b4f2706..1c3b4c8 100644 (file)
Binary files a/edumed/static/img/menu/wesprzyj_active.png and b/edumed/static/img/menu/wesprzyj_active.png differ

diff --git a/edumed/static/img/menu/wspolpraca.png b/edumed/static/img/menu/wspolpraca.png
index 830bcc1..791544d 100644 (file)
Binary files a/edumed/static/img/menu/wspolpraca.png and b/edumed/static/img/menu/wspolpraca.png differ

diff --git a/edumed/static/img/menu/wspolpraca_active.png b/edumed/static/img/menu/wspolpraca_active.png
index e7b3740..830bcc1 100644 (file)
Binary files a/edumed/static/img/menu/wspolpraca_active.png and b/edumed/static/img/menu/wspolpraca_active.png differ