From: Jan Szejko Date: Mon, 15 Jan 2018 10:59:05 +0000 (+0100) Subject: new icons in main menu + link to course X-Git-Url: https://git.mdrn.pl/edumed.git/commitdiff_plain/aa087499e05095b4928df2accd463cf949eb259d?ds=sidebyside new icons in main menu + link to course --- diff --git a/edumed/static/css/base.css b/edumed/static/css/base.css index 99182a2..5ab583d 100644 --- a/edumed/static/css/base.css +++ b/edumed/static/css/base.css @@ -78,44 +78,38 @@ 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; - background-size: 100%; } header.main nav .menu-oc-program:before { background: url(../img/menu/olimpiada/program.png) no-repeat 0 0; background-size: 100%; } @@ -250,5 +244,7 @@ footer.main { margin: 1em 0; } .flatpage img { - border: 0.3125em solid #eeeeee; + border: 0.3125em solid #eee; margin: 1.3em; } + +/*# sourceMappingURL=base.css.map */ diff --git a/edumed/static/css/base.scss b/edumed/static/css/base.scss index 88d2033..b87a3e8 100644 --- a/edumed/static/css/base.scss +++ b/edumed/static/css/base.scss @@ -103,19 +103,18 @@ 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%;} diff --git a/edumed/static/img/menu/dla-trenera.png b/edumed/static/img/menu/dla-trenera.png new file mode 100644 index 0000000..f8923c7 Binary files /dev/null and b/edumed/static/img/menu/dla-trenera.png differ diff --git a/edumed/static/img/menu/dla-trenera_active.png b/edumed/static/img/menu/dla-trenera_active.png new file mode 100644 index 0000000..69647a6 Binary files /dev/null and b/edumed/static/img/menu/dla-trenera_active.png differ diff --git a/edumed/static/img/menu/dla-ucznia.png b/edumed/static/img/menu/dla-ucznia.png new file mode 100644 index 0000000..f0f2bcc Binary files /dev/null and b/edumed/static/img/menu/dla-ucznia.png differ diff --git a/edumed/static/img/menu/dla-ucznia_active.png b/edumed/static/img/menu/dla-ucznia_active.png new file mode 100644 index 0000000..07c2101 Binary files /dev/null and b/edumed/static/img/menu/dla-ucznia_active.png differ diff --git a/edumed/static/img/menu/katalog.png b/edumed/static/img/menu/katalog.png deleted file mode 100644 index 106bdae..0000000 Binary files a/edumed/static/img/menu/katalog.png and /dev/null differ diff --git a/edumed/static/img/menu/katalog_active.png b/edumed/static/img/menu/katalog_active.png deleted file mode 100644 index 5485b5e..0000000 Binary files a/edumed/static/img/menu/katalog_active.png and /dev/null differ diff --git a/edumed/static/img/menu/kompetencje.png b/edumed/static/img/menu/kompetencje.png new file mode 100644 index 0000000..ffc375e Binary files /dev/null and b/edumed/static/img/menu/kompetencje.png differ diff --git a/edumed/static/img/menu/kompetencje_active.png b/edumed/static/img/menu/kompetencje_active.png new file mode 100644 index 0000000..95385d8 Binary files /dev/null and b/edumed/static/img/menu/kompetencje_active.png differ diff --git a/edumed/static/img/menu/kontakt.png b/edumed/static/img/menu/kontakt.png deleted file mode 100644 index 291865d..0000000 Binary files a/edumed/static/img/menu/kontakt.png and /dev/null differ diff --git a/edumed/static/img/menu/kontakt_active.png b/edumed/static/img/menu/kontakt_active.png deleted file mode 100644 index 892da3c..0000000 Binary files a/edumed/static/img/menu/kontakt_active.png and /dev/null differ diff --git a/edumed/static/img/menu/lekcje.png b/edumed/static/img/menu/lekcje.png index 9989280..8635757 100644 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 47ed591..e5f9983 100644 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 00dab37..6815fca 100644 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 1fc61e9..4e8151b 100644 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/old/katalog.png b/edumed/static/img/menu/old/katalog.png new file mode 100644 index 0000000..106bdae Binary files /dev/null and b/edumed/static/img/menu/old/katalog.png differ diff --git a/edumed/static/img/menu/old/katalog_active.png b/edumed/static/img/menu/old/katalog_active.png new file mode 100644 index 0000000..5485b5e Binary files /dev/null and b/edumed/static/img/menu/old/katalog_active.png differ diff --git a/edumed/static/img/menu/old/kontakt.png b/edumed/static/img/menu/old/kontakt.png new file mode 100644 index 0000000..291865d Binary files /dev/null and b/edumed/static/img/menu/old/kontakt.png differ diff --git a/edumed/static/img/menu/old/kontakt_active.png b/edumed/static/img/menu/old/kontakt_active.png new file mode 100644 index 0000000..892da3c Binary files /dev/null and b/edumed/static/img/menu/old/kontakt_active.png differ diff --git a/edumed/static/img/menu/old/lekcje.png b/edumed/static/img/menu/old/lekcje.png new file mode 100644 index 0000000..9989280 Binary files /dev/null and b/edumed/static/img/menu/old/lekcje.png differ diff --git a/edumed/static/img/menu/old/lekcje_active.png b/edumed/static/img/menu/old/lekcje_active.png new file mode 100644 index 0000000..47ed591 Binary files /dev/null and b/edumed/static/img/menu/old/lekcje_active.png differ diff --git a/edumed/static/img/menu/old/o-nas.png b/edumed/static/img/menu/old/o-nas.png new file mode 100644 index 0000000..00dab37 Binary files /dev/null and b/edumed/static/img/menu/old/o-nas.png differ diff --git a/edumed/static/img/menu/old/o-nas_active.png b/edumed/static/img/menu/old/o-nas_active.png new file mode 100644 index 0000000..1fc61e9 Binary files /dev/null and b/edumed/static/img/menu/old/o-nas_active.png differ diff --git a/edumed/static/img/menu/old/szkolenia.png b/edumed/static/img/menu/old/szkolenia.png new file mode 100644 index 0000000..97f8362 Binary files /dev/null and b/edumed/static/img/menu/old/szkolenia.png differ diff --git a/edumed/static/img/menu/old/szkolenia_active.png b/edumed/static/img/menu/old/szkolenia_active.png new file mode 100644 index 0000000..271eb8a Binary files /dev/null and b/edumed/static/img/menu/old/szkolenia_active.png differ diff --git a/edumed/static/img/menu/old/wesprzyj.png b/edumed/static/img/menu/old/wesprzyj.png new file mode 100644 index 0000000..5182a12 Binary files /dev/null and b/edumed/static/img/menu/old/wesprzyj.png differ diff --git a/edumed/static/img/menu/old/wesprzyj_active.png b/edumed/static/img/menu/old/wesprzyj_active.png new file mode 100644 index 0000000..0402b9f Binary files /dev/null and b/edumed/static/img/menu/old/wesprzyj_active.png differ diff --git a/edumed/static/img/menu/old/wspolpraca.png b/edumed/static/img/menu/old/wspolpraca.png new file mode 100644 index 0000000..af1aa43 Binary files /dev/null and b/edumed/static/img/menu/old/wspolpraca.png differ diff --git a/edumed/static/img/menu/old/wspolpraca_active.png b/edumed/static/img/menu/old/wspolpraca_active.png new file mode 100644 index 0000000..e849d30 Binary files /dev/null and b/edumed/static/img/menu/old/wspolpraca_active.png differ diff --git a/edumed/static/img/menu/olimpiada.png b/edumed/static/img/menu/olimpiada.png new file mode 100644 index 0000000..5194407 Binary files /dev/null and b/edumed/static/img/menu/olimpiada.png differ diff --git a/edumed/static/img/menu/olimpiada_active.png b/edumed/static/img/menu/olimpiada_active.png new file mode 100644 index 0000000..8dce21b Binary files /dev/null and b/edumed/static/img/menu/olimpiada_active.png differ diff --git a/edumed/static/img/menu/svg/convert.txt b/edumed/static/img/menu/svg/convert.txt new file mode 100644 index 0000000..ecf1788 --- /dev/null +++ b/edumed/static/img/menu/svg/convert.txt @@ -0,0 +1 @@ +for f in *.svg; do convert -background none "$f" -resize 44x34 -gravity center -extent 44x34 png/"`basename \"$f\" .svg`.png"; done diff --git a/edumed/static/img/menu/svg/dla-trenera.svg b/edumed/static/img/menu/svg/dla-trenera.svg new file mode 100644 index 0000000..0f8622b --- /dev/null +++ b/edumed/static/img/menu/svg/dla-trenera.svg @@ -0,0 +1,69 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/svg/dla-trenera_active.svg b/edumed/static/img/menu/svg/dla-trenera_active.svg new file mode 100644 index 0000000..1dd32dc --- /dev/null +++ b/edumed/static/img/menu/svg/dla-trenera_active.svg @@ -0,0 +1,69 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/svg/dla-ucznia.svg b/edumed/static/img/menu/svg/dla-ucznia.svg new file mode 100644 index 0000000..22162b8 --- /dev/null +++ b/edumed/static/img/menu/svg/dla-ucznia.svg @@ -0,0 +1,72 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/svg/dla-ucznia_active.svg b/edumed/static/img/menu/svg/dla-ucznia_active.svg new file mode 100644 index 0000000..5a46fe0 --- /dev/null +++ b/edumed/static/img/menu/svg/dla-ucznia_active.svg @@ -0,0 +1,72 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/svg/kompetencje.svg b/edumed/static/img/menu/svg/kompetencje.svg new file mode 100644 index 0000000..754b6f4 --- /dev/null +++ b/edumed/static/img/menu/svg/kompetencje.svg @@ -0,0 +1,76 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/svg/kompetencje_active.svg b/edumed/static/img/menu/svg/kompetencje_active.svg new file mode 100644 index 0000000..fa61ac2 --- /dev/null +++ b/edumed/static/img/menu/svg/kompetencje_active.svg @@ -0,0 +1,76 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/svg/lekcje.svg b/edumed/static/img/menu/svg/lekcje.svg new file mode 100644 index 0000000..2bd7384 --- /dev/null +++ b/edumed/static/img/menu/svg/lekcje.svg @@ -0,0 +1,102 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/svg/lekcje_active.svg b/edumed/static/img/menu/svg/lekcje_active.svg new file mode 100644 index 0000000..bc8b24a --- /dev/null +++ b/edumed/static/img/menu/svg/lekcje_active.svg @@ -0,0 +1,102 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/svg/o-nas.svg b/edumed/static/img/menu/svg/o-nas.svg new file mode 100644 index 0000000..540d2c5 --- /dev/null +++ b/edumed/static/img/menu/svg/o-nas.svg @@ -0,0 +1,53 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/edumed/static/img/menu/svg/o-nas_active.svg b/edumed/static/img/menu/svg/o-nas_active.svg new file mode 100644 index 0000000..9878327 --- /dev/null +++ b/edumed/static/img/menu/svg/o-nas_active.svg @@ -0,0 +1,53 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/edumed/static/img/menu/svg/olimpiada.svg b/edumed/static/img/menu/svg/olimpiada.svg new file mode 100644 index 0000000..5d0b8eb --- /dev/null +++ b/edumed/static/img/menu/svg/olimpiada.svg @@ -0,0 +1,109 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/edumed/static/img/menu/svg/olimpiada_active.svg b/edumed/static/img/menu/svg/olimpiada_active.svg new file mode 100644 index 0000000..c5b390f --- /dev/null +++ b/edumed/static/img/menu/svg/olimpiada_active.svg @@ -0,0 +1,109 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/edumed/static/img/menu/szkolenia.png b/edumed/static/img/menu/szkolenia.png deleted file mode 100644 index 97f8362..0000000 Binary files a/edumed/static/img/menu/szkolenia.png and /dev/null differ diff --git a/edumed/static/img/menu/szkolenia_active.png b/edumed/static/img/menu/szkolenia_active.png deleted file mode 100644 index 271eb8a..0000000 Binary files a/edumed/static/img/menu/szkolenia_active.png and /dev/null differ diff --git a/edumed/static/img/menu/wesprzyj.png b/edumed/static/img/menu/wesprzyj.png deleted file mode 100644 index 5182a12..0000000 Binary files a/edumed/static/img/menu/wesprzyj.png and /dev/null differ diff --git a/edumed/static/img/menu/wesprzyj_active.png b/edumed/static/img/menu/wesprzyj_active.png deleted file mode 100644 index 0402b9f..0000000 Binary files a/edumed/static/img/menu/wesprzyj_active.png and /dev/null differ diff --git a/edumed/static/img/menu/wspolpraca.png b/edumed/static/img/menu/wspolpraca.png deleted file mode 100644 index af1aa43..0000000 Binary files a/edumed/static/img/menu/wspolpraca.png and /dev/null differ diff --git a/edumed/static/img/menu/wspolpraca_active.png b/edumed/static/img/menu/wspolpraca_active.png deleted file mode 100644 index e849d30..0000000 Binary files a/edumed/static/img/menu/wspolpraca_active.png and /dev/null differ diff --git a/edumed/templates/base.html b/edumed/templates/base.html index 96641ad..6f1341d 100644 --- a/edumed/templates/base.html +++ b/edumed/templates/base.html @@ -7,12 +7,11 @@ {% block top_navigation %}
  • Lekcje
  • - {% comment %}
  • Współpraca
  • {% endcomment %}
  • Kompetencje
  • -
  • Olimpiada
  • -
  • Dla trenera
  • -
  • Wesprzyj nas
  • -
  • O projekcie
  • +
  • Olimpiada
  • +
  • Dla trenera
  • +
  • Dla ucznia
  • +
  • O projekcie
  • {% endblock %} {% block sponsors %} @@ -22,3 +21,7 @@ {% block extra_script %} {% compressed_js 'base' %} {% endblock %} + +{% block copyrights %} +

    Ikonki w menu: Designed by Freepik and distributed by Flaticon

    +{% endblock %} \ No newline at end of file