From 6bdb68719ab4d8bc068a2f7c4e3facc72dff336e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Je=CC=81re=CC=81my=20Fabre?= Date: Tue, 19 Jul 2016 15:15:56 +0200 Subject: [PATCH] Update logo, language switcher and breadcrumb --- app/static/src/assets/img/logo-ircam.png | Bin 0 -> 6778 bytes app/static/src/assets/img/logo-manifest.png | Bin 0 -> 5626 bytes app/static/src/js/index.js | 2 + app/static/src/js/modules/lang-selector.js | 51 +++++++++++ app/static/src/sass/config/_colors.scss | 1 + app/static/src/sass/config/_variables.scss | 1 + app/static/src/sass/global/_helpers.scss | 27 ++++++ app/static/src/sass/layout/_header.scss | 6 ++ app/static/src/sass/modules/_all.scss | 2 + app/static/src/sass/modules/_breadcrumb.scss | 3 + .../src/sass/modules/_lang-switcher.scss | 61 +++++++++++++ .../src/sass/modules/navs/_nav-header.scss | 76 ++++++++++++++++ app/templates/base.html | 84 ++++++++++-------- app/templates/pages/menus/breadcrumb.html | 10 +-- app/templates/pages/menus/header.html | 53 +++++------ 15 files changed, 307 insertions(+), 70 deletions(-) create mode 100644 app/static/src/assets/img/logo-ircam.png create mode 100644 app/static/src/assets/img/logo-manifest.png create mode 100644 app/static/src/js/modules/lang-selector.js create mode 100644 app/static/src/sass/modules/navs/_nav-header.scss diff --git a/app/static/src/assets/img/logo-ircam.png b/app/static/src/assets/img/logo-ircam.png new file mode 100644 index 0000000000000000000000000000000000000000..7110541b322b0ead9d5ea5aca23a85876bd9fcec GIT binary patch literal 6778 zcmaKR2|Scv`!~s+ee7cFWSJTJnv5lbv6h_-rtE{UjAY5aD}=0NP4XxzBYcnVDQ?pyQze&QZqHYIU>hQ9iPWKQyu!AHQ=n8JUI_#t-4@g$x9`An$niY6@+1;Dmr4Zkj^Yif}O8PY3Dl zVQ@D9X?fS=hU;A~S5-G5t*bx{jM_N^A7mf`i1G3EMXO;nh5q8JcHaLp4H5$WMH1+x zDfADeY~W@<9aI1ks3@x>;|hU5fXb?}5JeSvIYnup92lYq0;_@`U>Pt(4FXn^0|Wp0 z2%Sp{aJ#K$p{xH-S?427A@{&QKQ$02BqT&OL|zsZa0diYRaFIn)vEpKdyL7zl _fL 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 { + color: white; + } + + &.active { + display: block; + } + + } + + &.open { + + #{$module}__item { + + display: block; + background: $color-black; + + } + + &:after { + + @include transform(rotate(180deg)); + + } + + } + + &:after { + display: block; + content: '\f107'; + color: white; + position: absolute; + top: 0; + right: 0; + + font-family: FontAwesome; + font-size: 0.8em; + + @include line-height($header-pre-height); + @include margin-right(.5); + @include transition(all 0.2s ease-in-out); + } } diff --git a/app/static/src/sass/modules/navs/_nav-header.scss b/app/static/src/sass/modules/navs/_nav-header.scss new file mode 100644 index 00000000..825d7f17 --- /dev/null +++ b/app/static/src/sass/modules/navs/_nav-header.scss @@ -0,0 +1,76 @@ +$module: ".nav-header"; + +#{$module} { + + list-style-type: none; + margin: 0; + padding: 0; + text-align: center; + + @include margin(.5 0); + + &__item { + + display: inline-block; + color: black; + text-transform: lowercase; + vertical-align: top; + position: relative; + + @include padding-right(.5); + + &:after { + content: ""; + display: block; + height: $header-height; + width: 1px; + background: black; + position: absolute; + top: 0; + right: 0; + + @include margin-left(.5); + } + + &:last-child { + &:after { + display: none; + } + } + + &--image { + vertical-align: top; + @include margin(0 0 0 .5); + } + + &--special { + vertical-align: top; + @include margin(0 0 0 .5); + } + + &--centered { + line-height: $header-height; + } + + } + + &__item-link { + + color: inherit; + text-decoration: none; + + vertical-align: top; + + @include font-size(xl); + @include line-height($header-pre-height); + @include typeface(sans-serif); + + &:before { + display: inline; + content: '.'; + vertical-align: top; + } + + } + +} diff --git a/app/templates/base.html b/app/templates/base.html index 39d6deb8..eac5ed0a 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -32,12 +32,25 @@ {% compress css %} + {% endcompress %} {% block extra_head %}{% endblock %} + + {% nevercache %} + {% if messages %} + {% for message in messages %} +
+ + {{ message }} +
+ {% endfor %} + {% endif %} + {% endnevercache %} + - - {% if on_home %} - {% include "includes/slider.html" %} - {% endif %} - - {% nevercache %} - {% if messages %} - {% for message in messages %} -
- - {{ message }} -
- {% endfor %} + {% include "includes/slider.html" %} {% endif %} - {% endnevercache %} - - {% comment %} -
    - {% spaceless %} - {% block breadcrumb_menu %}{% page_menu "pages/menus/breadcrumb.html" %}{% endblock %} - {% endspaceless %} -
- {% endcomment %} {% featured as featured_list %} diff --git a/app/templates/pages/menus/breadcrumb.html b/app/templates/pages/menus/breadcrumb.html index 5bd1a7f8..f7c3c2fb 100644 --- a/app/templates/pages/menus/breadcrumb.html +++ b/app/templates/pages/menus/breadcrumb.html @@ -6,18 +6,18 @@ {% for page in page_branch %} {% if not has_home and page.is_primary and forloop.first %} -
  • + {% trans "Home" %}
    • {% endif %} {% if page.is_current_or_ascendant %} {% if page.is_current %} -
  • {{ page.title }}
    • {% else %} -
  • + {{ page.title }}
    • {% endif %} {% if page.has_children %}{% page_menu page %}{% endif %} diff --git a/app/templates/pages/menus/header.html b/app/templates/pages/menus/header.html index 8a5b1a09..6b8e6535 100644 --- a/app/templates/pages/menus/header.html +++ b/app/templates/pages/menus/header.html @@ -1,35 +1,36 @@ -{% load i18n pages_tags %} +{% load i18n pages_tags staticfiles %} {% get_language_info_list for LANGUAGES as languages %} {% spaceless %} {% if page_branch_in_menu %} - {% if branch_level == 0 %} -
      - {% for page in page_branch %} - {% if not has_home and page.is_primary and forloop.first %} -
    • - {% trans "Home" %} -
      • - {% endif %} - {% if page.in_menu %} -
    • - {{ page.title }}{% if page.has_children_in_menu %}{% endif %} - {% if page.has_children_in_menu %}{% page_menu page %}{% endif %} -
      • + {% for page in page_branch %} + {% if page.is_primary %} + {% if forloop.first %} + - {% else %} -
        - {% for page in page_branch %} - {% if page.in_menu %} -
      • - {{ page.title }} - {% if page.has_children_in_menu %}{% page_menu page %}{% endif %} + {% endif %} + {% if page.in_menu %} +
      • + {{ page.title }}
        • + {% endif %} + {% if page.is_primary %} + {% if forloop.last %} +
      • + rendez-vous
        15.16         +
        • +
      • + +
        • +
      • + +
        • +
      {% endif %} - {% endfor %} -
    - {% endif %} + {% endif %} + {% endfor %} {% endif %} {% endspaceless %} -- 2.39.5