From: Jan Szejko Date: Mon, 20 Jun 2016 12:43:04 +0000 (+0200) Subject: Merge branch 'api' into filmowa X-Git-Url: https://git.mdrn.pl/edumed.git/commitdiff_plain/47336ec077dcbae1fc40a01a1054cd28224a1649?hp=db3d82c09c614b072f5f6006a6c195a9f7874e08 Merge branch 'api' into filmowa --- diff --git a/edumed/static/css/base.css b/edumed/static/css/base.css index 2d17d6e..99182a2 100644 --- a/edumed/static/css/base.css +++ b/edumed/static/css/base.css @@ -116,6 +116,42 @@ header.main { 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%; } + 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; float: left; diff --git a/edumed/static/css/base.scss b/edumed/static/css/base.scss index b422a2d..88d2033 100644 --- a/edumed/static/css/base.scss +++ b/edumed/static/css/base.scss @@ -117,6 +117,24 @@ header.main { .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%;} + .menu-oc-regulamin:before { background: url(../img/menu/olimpiada/regulamin.png) no-repeat 0 0; background-size: 100%;} + .menu-oc-literatura:before { background: url(../img/menu/olimpiada/literatura.png) no-repeat 0 0; background-size: 100%;} + .menu-oc-komitet:before { background: url(../img/menu/olimpiada/komitet.png) no-repeat 0 0; background-size: 100%;} + .menu-oc-kontakt:before { background: url(../img/menu/olimpiada/kontakt.png) no-repeat 0 0; background-size: 100%;} + .menu-oc-program:hover:before { + background: url(../img/menu/olimpiada/program_active.png) no-repeat 0 0; background-size: 100%;} + .menu-oc-harmonogram:hover:before { + background: url(../img/menu/olimpiada/harmonogram_active.png) no-repeat 0 0; background-size: 100%;} + .menu-oc-regulamin:hover:before { + background: url(../img/menu/olimpiada/regulamin_active.png) no-repeat 0 0; background-size: 100%;} + .menu-oc-literatura:hover:before { + background: url(../img/menu/olimpiada/literatura_active.png) no-repeat 0 0; background-size: 100%;} + .menu-oc-komitet:hover:before { + background: url(../img/menu/olimpiada/komitet_active.png) no-repeat 0 0; background-size: 100%;} + .menu-oc-kontakt:hover:before { + background: url(../img/menu/olimpiada/kontakt_active.png) no-repeat 0 0; background-size: 100%;} } #tagline { diff --git a/edumed/static/img/menu/olimpiada/harmonogram.png b/edumed/static/img/menu/olimpiada/harmonogram.png new file mode 100644 index 0000000..06e9c92 Binary files /dev/null and b/edumed/static/img/menu/olimpiada/harmonogram.png differ diff --git a/edumed/static/img/menu/olimpiada/harmonogram_active.png b/edumed/static/img/menu/olimpiada/harmonogram_active.png new file mode 100644 index 0000000..68c9721 Binary files /dev/null and b/edumed/static/img/menu/olimpiada/harmonogram_active.png differ diff --git a/edumed/static/img/menu/olimpiada/komitet.png b/edumed/static/img/menu/olimpiada/komitet.png new file mode 100644 index 0000000..2837890 Binary files /dev/null and b/edumed/static/img/menu/olimpiada/komitet.png differ diff --git a/edumed/static/img/menu/olimpiada/komitet_active.png b/edumed/static/img/menu/olimpiada/komitet_active.png new file mode 100644 index 0000000..b70ad4c Binary files /dev/null and b/edumed/static/img/menu/olimpiada/komitet_active.png differ diff --git a/edumed/static/img/menu/olimpiada/kontakt.png b/edumed/static/img/menu/olimpiada/kontakt.png new file mode 100644 index 0000000..e94d178 Binary files /dev/null and b/edumed/static/img/menu/olimpiada/kontakt.png differ diff --git a/edumed/static/img/menu/olimpiada/kontakt_active.png b/edumed/static/img/menu/olimpiada/kontakt_active.png new file mode 100644 index 0000000..58e597a Binary files /dev/null and b/edumed/static/img/menu/olimpiada/kontakt_active.png differ diff --git a/edumed/static/img/menu/olimpiada/literatura.png b/edumed/static/img/menu/olimpiada/literatura.png new file mode 100644 index 0000000..f252351 Binary files /dev/null and b/edumed/static/img/menu/olimpiada/literatura.png differ diff --git a/edumed/static/img/menu/olimpiada/literatura_active.png b/edumed/static/img/menu/olimpiada/literatura_active.png new file mode 100644 index 0000000..98719ac Binary files /dev/null and b/edumed/static/img/menu/olimpiada/literatura_active.png differ diff --git a/edumed/static/img/menu/olimpiada/program.png b/edumed/static/img/menu/olimpiada/program.png new file mode 100644 index 0000000..56760e1 Binary files /dev/null and b/edumed/static/img/menu/olimpiada/program.png differ diff --git a/edumed/static/img/menu/olimpiada/program_active.png b/edumed/static/img/menu/olimpiada/program_active.png new file mode 100644 index 0000000..9b6ec98 Binary files /dev/null and b/edumed/static/img/menu/olimpiada/program_active.png differ diff --git a/edumed/static/img/menu/olimpiada/regulamin.png b/edumed/static/img/menu/olimpiada/regulamin.png new file mode 100644 index 0000000..449ac1c Binary files /dev/null and b/edumed/static/img/menu/olimpiada/regulamin.png differ diff --git a/edumed/static/img/menu/olimpiada/regulamin_active.png b/edumed/static/img/menu/olimpiada/regulamin_active.png new file mode 100644 index 0000000..1a1516b Binary files /dev/null and b/edumed/static/img/menu/olimpiada/regulamin_active.png differ diff --git a/edumed/static/img/menu/olimpiada/svg/harmonogram.svg b/edumed/static/img/menu/olimpiada/svg/harmonogram.svg new file mode 100644 index 0000000..64a3a3e --- /dev/null +++ b/edumed/static/img/menu/olimpiada/svg/harmonogram.svg @@ -0,0 +1,145 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/olimpiada/svg/harmonogram_active.svg b/edumed/static/img/menu/olimpiada/svg/harmonogram_active.svg new file mode 100644 index 0000000..f690251 --- /dev/null +++ b/edumed/static/img/menu/olimpiada/svg/harmonogram_active.svg @@ -0,0 +1,146 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/olimpiada/svg/komitet.svg b/edumed/static/img/menu/olimpiada/svg/komitet.svg new file mode 100644 index 0000000..d04c979 --- /dev/null +++ b/edumed/static/img/menu/olimpiada/svg/komitet.svg @@ -0,0 +1,63 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/olimpiada/svg/komitet_active.svg b/edumed/static/img/menu/olimpiada/svg/komitet_active.svg new file mode 100644 index 0000000..9202ac9 --- /dev/null +++ b/edumed/static/img/menu/olimpiada/svg/komitet_active.svg @@ -0,0 +1,63 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/olimpiada/svg/kontakt.svg b/edumed/static/img/menu/olimpiada/svg/kontakt.svg new file mode 100644 index 0000000..1e9339f --- /dev/null +++ b/edumed/static/img/menu/olimpiada/svg/kontakt.svg @@ -0,0 +1,74 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/olimpiada/svg/kontakt_active.svg b/edumed/static/img/menu/olimpiada/svg/kontakt_active.svg new file mode 100644 index 0000000..940e21e --- /dev/null +++ b/edumed/static/img/menu/olimpiada/svg/kontakt_active.svg @@ -0,0 +1,74 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/olimpiada/svg/literatura.svg b/edumed/static/img/menu/olimpiada/svg/literatura.svg new file mode 100644 index 0000000..a004d7e --- /dev/null +++ b/edumed/static/img/menu/olimpiada/svg/literatura.svg @@ -0,0 +1,63 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/olimpiada/svg/literatura_active.svg b/edumed/static/img/menu/olimpiada/svg/literatura_active.svg new file mode 100644 index 0000000..20395e7 --- /dev/null +++ b/edumed/static/img/menu/olimpiada/svg/literatura_active.svg @@ -0,0 +1,63 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/olimpiada/svg/program.svg b/edumed/static/img/menu/olimpiada/svg/program.svg new file mode 100644 index 0000000..2418f09 --- /dev/null +++ b/edumed/static/img/menu/olimpiada/svg/program.svg @@ -0,0 +1,104 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/olimpiada/svg/program_active.svg b/edumed/static/img/menu/olimpiada/svg/program_active.svg new file mode 100644 index 0000000..cf39f15 --- /dev/null +++ b/edumed/static/img/menu/olimpiada/svg/program_active.svg @@ -0,0 +1,104 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/olimpiada/svg/regulamin.svg b/edumed/static/img/menu/olimpiada/svg/regulamin.svg new file mode 100644 index 0000000..61c274e --- /dev/null +++ b/edumed/static/img/menu/olimpiada/svg/regulamin.svg @@ -0,0 +1,98 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/static/img/menu/olimpiada/svg/regulamin_active.svg b/edumed/static/img/menu/olimpiada/svg/regulamin_active.svg new file mode 100644 index 0000000..50f8f6d --- /dev/null +++ b/edumed/static/img/menu/olimpiada/svg/regulamin_active.svg @@ -0,0 +1,98 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/edumed/templates/base.html b/edumed/templates/base.html index d336201..96641ad 100644 --- a/edumed/templates/base.html +++ b/edumed/templates/base.html @@ -9,7 +9,7 @@
  • Lekcje
  • {% comment %}
  • Współpraca
  • {% endcomment %}
  • Kompetencje
  • -
  • Olimpiada
  • +
  • Olimpiada
  • Dla trenera
  • Wesprzyj nas
  • O projekcie
  • diff --git a/edumed/templates/base_super.html b/edumed/templates/base_super.html index 73080d4..f0e51cb 100644 --- a/edumed/templates/base_super.html +++ b/edumed/templates/base_super.html @@ -15,9 +15,9 @@ {% compressed_css 'base' %} - + - + @@ -60,11 +60,13 @@
    {% block tagline %}{% endblock %}
    - + {% block searchbox %} + + {% endblock %}
    @@ -73,6 +75,7 @@