From: Aleksander Łukasz Date: Tue, 14 Jan 2014 09:58:30 +0000 (+0100) Subject: Visual update of the mil site X-Git-Url: https://git.mdrn.pl/edumed.git/commitdiff_plain/4754794c939a1bf770d4464e45f0320acff6f230?ds=sidebyside Visual update of the mil site --- diff --git a/edumed/settings.d/50-static.py b/edumed/settings.d/50-static.py index 4d75c9a..43dbb7c 100644 --- a/edumed/settings.d/50-static.py +++ b/edumed/settings.d/50-static.py @@ -27,6 +27,7 @@ PIPELINE_CSS = { 'jquery/colorbox/colorbox.css', 'css/forum.scss', + 'css/mil.scss' ), 'output_filename': 'compressed/base.css', }, diff --git a/edumed/static/css/mil.css b/edumed/static/css/mil.css new file mode 100644 index 0000000..3d9bbbe --- /dev/null +++ b/edumed/static/css/mil.css @@ -0,0 +1,47 @@ +header.header-mil { + background-color: #f47b3b; } + header.header-mil #organizer { + color: white; + float: none; + position: absolute; + top: 10px; + right: 12px; } + header.header-mil nav ul { + margin-top: 0; } + header.header-mil nav ul li { + vertical-align: text-bottom; } + header.header-mil nav a, header.header-mil nav a:hover { + color: white; } + header.header-mil nav a:before { + content: " "; + display: block; + margin-bottom: .8em; + width: 5.5em; + height: 4.25em; + text-align: center; + margin: auto; + margin-bottom: .8em; } + header.header-mil nav .menu-consultations:before { + background: url(../img/menu/mil/consultations.png) no-repeat 0 0; + background-size: 100%; } + header.header-mil nav .menu-takepart:before { + background: url(../img/menu/mil/takepart.png) no-repeat 0 0; + background-size: 100%; } + header.header-mil nav .menu-knowledgebase:before { + background: url(../img/menu/mil/knowledgebase.png) no-repeat 0 0; + background-size: 100%; } + header.header-mil nav .menu-kompetencje:before, header.header-mil nav .menu-kontakt:before { + width: 3.625em; + height: 2.8125em; } + header.header-mil nav .menu-kompetencje:before, header.header-mil nav .menu-kompetencje:hover:before { + background: url(../img/menu/mil/catalog.png) no-repeat 0 0; + background-size: 100%; } + header.header-mil nav .menu-kontakt:before, header.header-mil nav .menu-kontakt:hover:before { + background: url(../img/menu/mil/contact.png) no-repeat 0 0; + background-size: 100%; } + header.header-mil nav .lang-switcher-en:before { + background: url(../img/menu/mil/lang_en.png) no-repeat 0 0; + background-size: 100%; } + header.header-mil nav .lang-switcher-pl:before { + background: url(../img/menu/mil/lang_pl.png) no-repeat 0 0; + background-size: 100%; } diff --git a/edumed/static/css/mil.scss b/edumed/static/css/mil.scss new file mode 100644 index 0000000..be3f0aa --- /dev/null +++ b/edumed/static/css/mil.scss @@ -0,0 +1,57 @@ +@import "vars"; + +header.header-mil { + + background-color: #f47b3b; + + #organizer { + color: white; + float: none; + position: absolute; + top: 10px; + right:12px; + } + + nav { + ul { + margin-top: 0; + li { + vertical-align: text-bottom; + } + } + + a,a:hover { + color: white; + } + + a:before { + content: " "; + display: block; + margin-bottom: .8em; + width: 88*$px; + height: 68*$px; + text-align:center; + margin: auto; + margin-bottom: .8em; + } + + .menu-consultations:before { background: url(../img/menu/mil/consultations.png) no-repeat 0 0; background-size: 100%;} + .menu-takepart:before { background: url(../img/menu/mil/takepart.png) no-repeat 0 0; background-size: 100%;} + .menu-knowledgebase:before { background: url(../img/menu/mil/knowledgebase.png) no-repeat 0 0; background-size: 100%;} + + .menu-kompetencje:before, .menu-kontakt:before { + width: 58*$px; + height: 45*$px; + } + + .menu-kompetencje:before, .menu-kompetencje:hover:before { + background: url(../img/menu/mil/catalog.png) no-repeat 0 0; background-size: 100%; + } + .menu-kontakt:before, .menu-kontakt:hover:before { + background: url(../img/menu/mil/contact.png) no-repeat 0 0; background-size: 100%; + } + + .lang-switcher-en:before { background: url(../img/menu/mil/lang_en.png) no-repeat 0 0; background-size: 100%;} + .lang-switcher-pl:before { background: url(../img/menu/mil/lang_pl.png) no-repeat 0 0; background-size: 100%;} + } +} \ No newline at end of file diff --git a/edumed/static/img/logo-mil.png b/edumed/static/img/logo-mil.png new file mode 100644 index 0000000..1f1d780 Binary files /dev/null and b/edumed/static/img/logo-mil.png differ diff --git a/edumed/static/img/logo_fnp_white.png b/edumed/static/img/logo_fnp_white.png new file mode 100644 index 0000000..f189ca7 Binary files /dev/null and b/edumed/static/img/logo_fnp_white.png differ diff --git a/edumed/static/img/menu/mil/catalog.png b/edumed/static/img/menu/mil/catalog.png new file mode 100644 index 0000000..f0cc3c7 Binary files /dev/null and b/edumed/static/img/menu/mil/catalog.png differ diff --git a/edumed/static/img/menu/mil/consultations.png b/edumed/static/img/menu/mil/consultations.png new file mode 100644 index 0000000..e050b98 Binary files /dev/null and b/edumed/static/img/menu/mil/consultations.png differ diff --git a/edumed/static/img/menu/mil/contact.png b/edumed/static/img/menu/mil/contact.png new file mode 100644 index 0000000..7466951 Binary files /dev/null and b/edumed/static/img/menu/mil/contact.png differ diff --git a/edumed/static/img/menu/mil/knowledgebase.png b/edumed/static/img/menu/mil/knowledgebase.png new file mode 100644 index 0000000..6bd0372 Binary files /dev/null and b/edumed/static/img/menu/mil/knowledgebase.png differ diff --git a/edumed/static/img/menu/mil/lang_en.png b/edumed/static/img/menu/mil/lang_en.png new file mode 100644 index 0000000..ed9aa77 Binary files /dev/null and b/edumed/static/img/menu/mil/lang_en.png differ diff --git a/edumed/static/img/menu/mil/lang_pl.png b/edumed/static/img/menu/mil/lang_pl.png new file mode 100644 index 0000000..1c48db6 Binary files /dev/null and b/edumed/static/img/menu/mil/lang_pl.png differ diff --git a/edumed/static/img/menu/mil/takepart.png b/edumed/static/img/menu/mil/takepart.png new file mode 100644 index 0000000..28a6839 Binary files /dev/null and b/edumed/static/img/menu/mil/takepart.png differ diff --git a/edumed/static/img/nina-white.png b/edumed/static/img/nina-white.png new file mode 100644 index 0000000..3d2afe7 Binary files /dev/null and b/edumed/static/img/nina-white.png differ diff --git a/edumed/templates/base_mil.html b/edumed/templates/base_mil.html index d6fac36..45422e4 100644 --- a/edumed/templates/base_mil.html +++ b/edumed/templates/base_mil.html @@ -6,12 +6,18 @@ {% load i18n %} +{% block header_class %}header-mil{% endblock %} + +{% block logo %} +Edukacja medialna +{% endblock %} + {% block top_navigation %} -
  • {% trans 'Consultations' %}
    • +
  • {% trans 'Consultations' %}
  • {% trans 'Competencies' %}
    • -
  • {% trans 'Take Part' %}
    • +
  • {% trans 'Take Part' %}
    • {% if request.LANGUAGE_CODE == 'pl' %} -
  • Materiały edukacyjne
    • +
  • Baza wiedzy
    • {% endif %}
  • {% trans 'Contact' %}
  • {% lang_switcher %}
    • @@ -22,13 +28,11 @@ {% endblock %} {% block organizer %} - Projekt prowadzi:
    - Fundacja Nowoczesna Polska - + Fundacja Nowoczesna Polska +
    - Narodowy Instytut Audiowizualny + Narodowy Instytut Audiowizualny -     {% endblock %} \ No newline at end of file diff --git a/edumed/templates/base_super.html b/edumed/templates/base_super.html index 9ee9cec..f4a3c27 100644 --- a/edumed/templates/base_super.html +++ b/edumed/templates/base_super.html @@ -25,7 +25,7 @@
    -
    +