From: Jérémy Fabre Date: Wed, 21 Sep 2016 14:57:58 +0000 (+0200) Subject: Add person list circle and square X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fc071544a6a8f79f8317072e70e0acd5d2d87e0c;p=mezzo.git Add person list circle and square --- diff --git a/app/static/src/sass/modules/_all.scss b/app/static/src/sass/modules/_all.scss index 626043b4..ba59dbaa 100755 --- a/app/static/src/sass/modules/_all.scss +++ b/app/static/src/sass/modules/_all.scss @@ -12,6 +12,7 @@ @import 'boxes/article-box'; @import 'boxes/page-box'; @import 'boxes/brief-box'; +@import 'boxes/person-list-box'; // Sliders @import 'sliders/slider-page'; diff --git a/app/static/src/sass/modules/boxes/_article-box.scss b/app/static/src/sass/modules/boxes/_article-box.scss index 9208b02a..ad217b8c 100644 --- a/app/static/src/sass/modules/boxes/_article-box.scss +++ b/app/static/src/sass/modules/boxes/_article-box.scss @@ -144,4 +144,67 @@ $module: ".article-box"; } } + &--person { + + @include margin-top(2); + position: relative; + + &:after { + + content: ""; + display: block; + height: 1px; + width: 100%; + background: #979797; + position: absolute; + bottom: -24px; + left: 0; + right: 0; + + } + + #{$module}__title { + + @include font-size(xl); + @include line-height(1.25); + @include typeface(sans-serif); + @include margin(.25 0 .25 0); + font-weight: weight(heavy); + + } + + #{$module}__desc { + @include line-height(1); + } + + #{$module}__content { + + height: 350px; + + @include mq($until: xs) { + height: auto; + } + + &:after { + + @include mq($until: xs) { + display: none; + } + + content: ""; + display: block; + position: absolute; + bottom: 0; + left: 0; + right: 0; + height: 100px; + background-color: rgba(255,255,255,0); + @include filter-gradient(#ffffff, #ffffff, vertical); + @include background-image(linear-gradient(top, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 50%)); + } + + } + + } + } diff --git a/app/static/src/sass/modules/boxes/_person-list-box.scss b/app/static/src/sass/modules/boxes/_person-list-box.scss new file mode 100644 index 00000000..bb8f602c --- /dev/null +++ b/app/static/src/sass/modules/boxes/_person-list-box.scss @@ -0,0 +1,29 @@ +$module: ".person-list-box"; + +#{$module} { + + position: relative; + @include margin-top(2); + @include margin-bottom(1); + + &__image { + + @include mq($until: xs) { + + margin: 0; + @include margin-bottom(1); + + } + + margin: 0 auto; + width: 135px; + height: 135px; + border-radius: 135px; + + img { + border-radius: 135px; + } + + } + +} diff --git a/app/templates/network/inc/person/list_circle_style.html b/app/templates/network/inc/person/list_circle_style.html index 12c50940..5a4e7ee7 100644 --- a/app/templates/network/inc/person/list_circle_style.html +++ b/app/templates/network/inc/person/list_circle_style.html @@ -1,27 +1,84 @@ -{% load organization_tags mezzanine_tags %} -

{{ person_list_block.title }}

-{% if person_list_block.description %} -

{{ person_list_block.description }}

+{% load organization_tags mezzanine_tags i18n %} +{% if person_list_block.title %} + +
+ +
+
+ +
+ +
+ +

{{ person_list_block.title }}

+ {% if person_list_block.description %} +

{{ person_list_block.description }}

+ {% endif %} + +
+ +
+ +
+ +
+ +
+ +
+ + {% for person_list_block_inline in person_list_block.person_list_block_inlines.all %} + {% with person_list_block_inline.person as person %} + +
+ +
+ + + +
+ +

{{ person }}

+ + {% if person.description %} +

{{ person.description|slice:":255" }}

+ {% endif %} + {% trans "resume" %} + {% for link in person.links.all %} + {% if link %} + {{ link.link_type.name }} + {% endif %} + {% endfor %} + +
+ +
+ +
+ + {% endwith %} + {% endfor %} + +
+ +
+ +
+ +
+ {% endif %} - {% for person_list_block_inline in person_list_block.person_list_block_inlines.all %} - {% with person_list_block_inline.person as person %} - - {% with person.images.all|get_type:'card' as card_images %} - {% if card_images %} - person - {% endif %} - {% endwith %} - - -

{{ person }}

-
- {% if person.description %} -

{{ person.description|slice:":255" }}

- {% endif %} - {% with person.links.first as link %} - {% if link %} - {{ link.link_type.name }} - {% endif %} - {% endwith %} - {% endwith %} - {% endfor %} diff --git a/app/templates/network/inc/person/list_square_style.html b/app/templates/network/inc/person/list_square_style.html index 4c3df857..8b191687 100644 --- a/app/templates/network/inc/person/list_square_style.html +++ b/app/templates/network/inc/person/list_square_style.html @@ -1,22 +1,68 @@ {% load organization_tags mezzanine_tags %} -

{{ person_list_block.title }}

-{% if person_list_block.description %} -

{{ person_list_block.description }}

+{% if person_list_block.title %} + +
+ +
+
+ +
+ +
+ +

{{ person_list_block.title }}

+ {% if person_list_block.description %} +

{{ person_list_block.description }}

+ {% endif %} + +
+ +
+ +
+ + + +
+ {% endif %} - {% for person_list_block_inline in person_list_block.person_list_block_inlines.all %} - {% with person_list_block_inline.person as person %} - - {% with person.images.all|get_type:'card' as card_images %} - {% if card_images %} - person - {% endif %} - {% endwith %} - - -

{{ person }}

-
- {% if person.description %} -

{{ person.description|slice:":255" }}

- {% endif %} - {% endwith %} - {% endfor %}