From c52181f8ccd2d9a9d50fbe31bbab0e34b16a362e Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Fri, 8 Feb 2013 11:46:46 +0100 Subject: [PATCH 1/1] visual changes --- catalogue/static/catalogue/css/carousel.css | 23 ++++++++++++-- catalogue/static/catalogue/css/carousel.scss | 30 +++++++++++++++++-- .../templates/catalogue/lesson_detail.html | 16 +++++----- .../catalogue/snippets/carousel.html | 12 ++++---- .../catalogue/snippets/section_box.html | 2 +- edumed/static/css/base.css | 7 ++++- edumed/static/css/base.scss | 11 ++++++- edumed/static/css/main.css | 6 ++-- edumed/static/css/main.scss | 6 ++-- edumed/templates/base.html | 8 +++-- edumed/templates/home.html | 4 +-- 11 files changed, 93 insertions(+), 32 deletions(-) diff --git a/catalogue/static/catalogue/css/carousel.css b/catalogue/static/catalogue/css/carousel.css index abf7ce0..49fe461 100644 --- a/catalogue/static/catalogue/css/carousel.css +++ b/catalogue/static/catalogue/css/carousel.css @@ -25,10 +25,27 @@ overflow: hidden; width: 28.75em; height: 100%; - background-image: url(/static/catalogue/img/carousel-left.png); - background-position: 100% 0; - background-repeat: no-repeat; + background: url(/static/catalogue/img/carousel-left.png) 100% 0 no-repeat; background-size: 4.375em 100%; } + #catalogue-carousel #catalogue-carousel-links li a .catalogue-carousel-note { + height: 100%; + margin-left: 50%; + background-color: black; + color: white; + opacity: 0.6; + background-image: url(/static/catalogue/img/carousel-left.png); + background-position: 100% 0; + background-repeat: no-repeat; + background-size: 4.375em 100%; } + #catalogue-carousel #catalogue-carousel-links li a .catalogue-carousel-note p { + padding: 6em 2em 0 1.6em; + margin: 0; } + #catalogue-carousel #catalogue-carousel-links li a .catalogue-carousel-note p em { + display: block; + font-style: normal; + font-size: 1.5em; } + #catalogue-carousel #catalogue-carousel-links li a .catalogue-carousel-note p strong { + font-size: 2em; } #catalogue-carousel #catalogue-carousel-switcher { margin: 0; padding: 3.125em 0 0 3.625em; diff --git a/catalogue/static/catalogue/css/carousel.scss b/catalogue/static/catalogue/css/carousel.scss index 56e0591..aa69028 100755 --- a/catalogue/static/catalogue/css/carousel.scss +++ b/catalogue/static/catalogue/css/carousel.scss @@ -33,10 +33,34 @@ $ciemny: #363a3e; 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: url(/static/catalogue/img/carousel-left.png) 100% 0 no-repeat; background-size: 70*$px 100%; + + .catalogue-carousel-note { + height: 100%; + margin-left: 50%; + background-color: black; + color: white; + opacity: 0.6; + background-image: url(/static/catalogue/img/carousel-left.png); + background-position: 100% 0; + background-repeat: no-repeat; + background-size: 70*$px 100%; + + p { + padding: 6em 2em 0 1.6em; + margin: 0; + em { + display: block; + font-style: normal; + font-size: 1.5em; + } + strong { + font-size: 2em; + } + + } + } } } } diff --git a/catalogue/templates/catalogue/lesson_detail.html b/catalogue/templates/catalogue/lesson_detail.html index 629af17..c22a74c 100755 --- a/catalogue/templates/catalogue/lesson_detail.html +++ b/catalogue/templates/catalogue/lesson_detail.html @@ -13,17 +13,17 @@

Realizacja i czas lekcji

{% if object.type == 'synthetic' %} -

To lekcja jest syntezą działu +

To lekcja jest syntezą tematu {{ object.section }}{% if object.level.slug = "liceum" %} (na poziomie zaawansowanym) {% endif %}. Dostępny jest również - szczegółowy kurs - dla tego działu. + pełny kurs + tego tematu.

Czas trwania: 45 minut.

{% elif object.type == 'course' %} -

Ta lekcja jest częścią działu +

Ta lekcja jest częścią tematu {{ object.section }}{% if object.level.slug = "liceum" %} (na poziomie zaawansowanym) {% endif %}. @@ -31,7 +31,7 @@ {% if synth %} Dostępna jest również lekcja syntetyczna - dla tego działu. + dla tego tematu. {% endif %} {% endwith %}

@@ -74,13 +74,13 @@

Informacje:

{% if object.dc.authors_textbook %} - Autor podręcznika: {{ object.dc.authors_textbook|person_list }}
+ Tekst: {{ object.dc.authors_textbook|person_list }}
{% endif %} {% if object.dc.authors_scenario %} - Autor scenariusza: {{ object.dc.authors_scenario|person_list }}
+ Scenariusz: {{ object.dc.authors_scenario|person_list }}
{% endif %} {% if object.dc.authors_expert %} - Ekspert: {{ object.dc.authors_expert|person_list }}
+ Konsultacja merytoryczna: {{ object.dc.authors_expert|person_list }}
{% endif %} Licencja: {{ object.dc.license_description }}.

diff --git a/catalogue/templates/catalogue/snippets/carousel.html b/catalogue/templates/catalogue/snippets/carousel.html index 0850c13..2095186 100755 --- a/catalogue/templates/catalogue/snippets/carousel.html +++ b/catalogue/templates/catalogue/snippets/carousel.html @@ -1,18 +1,20 @@ {% load url from future %} +{% url "info" "jak-korzystac/" as jak %} diff --git a/catalogue/templates/catalogue/snippets/section_box.html b/catalogue/templates/catalogue/snippets/section_box.html index 8e8a581..f7ad6e5 100755 --- a/catalogue/templates/catalogue/snippets/section_box.html +++ b/catalogue/templates/catalogue/snippets/section_box.html @@ -18,7 +18,7 @@ {% for lesson in lesson_list %}
  • {{ lesson }}{% if lesson_type == 'synthetic' %} -
    (przegląd całego działu w 45 minut) +
    (przegląd całego tematu w 45 minut) {% endif %}
    • {% endfor %} diff --git a/edumed/static/css/base.css b/edumed/static/css/base.css index 27f9ccf..c971f39 100644 --- a/edumed/static/css/base.css +++ b/edumed/static/css/base.css @@ -32,7 +32,10 @@ header.main { vertical-align: middle; } header.main #organizer { float: right; - margin-top: 1.3em; } + font-size: .75em; + color: #777; } + header.main #organizer img { + margin-top: .5em; } header.main nav ul { padding: 0; position: absolute; @@ -157,6 +160,8 @@ footer.main { .link-list { list-style: none; padding: 0; } + .link-list li { + margin-bottom: .5em; } .link-list a:before { content: "→"; margin-right: .5em; } diff --git a/edumed/static/css/base.scss b/edumed/static/css/base.scss index 4153ca2..e2be168 100644 --- a/edumed/static/css/base.scss +++ b/edumed/static/css/base.scss @@ -46,7 +46,12 @@ header.main { } #organizer { float: right; - margin-top: 1.3em; + font-size: .75em; + color: #777; + + img { + margin-top: .5em; + } } @@ -199,6 +204,10 @@ footer.main { list-style: none; padding: 0; + li { + margin-bottom: .5em; + } + a:before { content: "→"; margin-right: .5em; diff --git a/edumed/static/css/main.css b/edumed/static/css/main.css index 98fb208..974aa37 100644 --- a/edumed/static/css/main.css +++ b/edumed/static/css/main.css @@ -50,10 +50,10 @@ color: white; text-transform: uppercase; display: block; - height: 4.375em; - width: 8.75em; + height: 5em; + width: 9.375em; display: table; - padding: 0.625em; } + padding: 0.313em; } #main-sections ul li a span { font-size: .9em; height: 100%; diff --git a/edumed/static/css/main.scss b/edumed/static/css/main.scss index 59422de..a37de9e 100755 --- a/edumed/static/css/main.scss +++ b/edumed/static/css/main.scss @@ -66,10 +66,10 @@ $px: .0625em; color: white; text-transform: uppercase; display: block; - height: 70*$px; - width: 140*$px; + height: 80*$px; + width: 150*$px; display: table; - padding: 10*$px; + padding: 5*$px; span { font-size: .9em; diff --git a/edumed/templates/base.html b/edumed/templates/base.html index dd92cb4..e744135 100644 --- a/edumed/templates/base.html +++ b/edumed/templates/base.html @@ -33,8 +33,12 @@ -->
    - - Fundacja Nowoczesna Polska +
    + Projekt prowadzi:
    + + Fundacja Nowoczesna Polska + +