diff --git a/src/styles/_config.sass b/src/styles/_config.sass index 7ed8b57e..d0c720bc 100644 --- a/src/styles/_config.sass +++ b/src/styles/_config.sass @@ -13,7 +13,7 @@ $font-body: 'Roboto' !default $font-headings: 'Lato' !default $font-size: 14px !default $font-size-xs: .75rem -$font-size-xxs: .65rem +$font-size-xxs: .6rem $color-text: #4d4e53 !default $color-text-dark: $color-text !default diff --git a/src/styles/components/_card.sass b/src/styles/components/_card.sass index 01635626..10153dea 100644 --- a/src/styles/components/_card.sass +++ b/src/styles/components/_card.sass @@ -87,7 +87,7 @@ .card-img-top opacity: .9 - +$card-progress-height: 5px .card.asset color: $color-text @@ -114,12 +114,13 @@ background-size: cover object-fit: cover - $card-progress-height: 5px + .progress height: $card-progress-height position: absolute - top: -$card-progress-height + bottom: 0 width: 100% + z-index: 1 .card-img-top &.card-icon @@ -139,7 +140,7 @@ display: block font-size: $font-size-xxs left: 5px - top: -27px // enough to be above the progress-bar + bottom: $card-progress-height + 3px // enough to be above the progress-bar position: absolute padding: 1px 5px z-index: 1 diff --git a/src/templates/_macros/_asset_list_item.pug b/src/templates/_macros/_asset_list_item.pug index fc8c07b0..d8f09fc8 100644 --- a/src/templates/_macros/_asset_list_item.pug +++ b/src/templates/_macros/_asset_list_item.pug @@ -15,16 +15,6 @@ a.card.asset.card-image-fade.pr-0.mx-0.mb-2( i(class="pi-{{ node_type }}") | {% endif %} - .card-body.py-2.d-flex.flex-column.text-truncate - .card-title.mb-1.font-weight-bold.text-truncate - | {{ asset.name | hide_none }} - - ul.card-text.list-unstyled.d-flex.text-black-50.mt-auto.mb-0.text-truncate - li.pr-2.font-weight-bold {{ node_type | undertitle | hide_none }} - li.pr-2.text-truncate {{ asset.project.name | hide_none }} - li.pr-2.text-truncate {{ asset.user.full_name | hide_none }} - li.text-truncate {{ asset._created | pretty_date | hide_none }} - | {% if asset.properties.content_type == 'video' %} | {% set view_progress = current_user.nodes.view_progress %} @@ -49,4 +39,15 @@ a.card.asset.card-image-fade.pr-0.mx-0.mb-2( | {% endif %} {# endif progress #} | {% endif %} {# endif video #} + + .card-body.py-2.d-flex.flex-column.text-truncate + .card-title.mb-1.font-weight-bold.text-truncate + | {{ asset.name | hide_none }} + + ul.card-text.list-unstyled.d-flex.text-black-50.mt-auto.mb-0.text-truncate + li.pr-2.font-weight-bold {{ node_type | undertitle | hide_none }} + li.pr-2.text-truncate {{ asset.project.name | hide_none }} + li.pr-2.text-truncate {{ asset.user.full_name | hide_none }} + li.text-truncate {{ asset._created | pretty_date | hide_none }} + | {% endmacro %}