LIL-560 Кнопку «Смотреть урок» поднять выше

remotes/origin/feature/effective_amount
gzbender 8 years ago
parent d1d8d4bccd
commit fae11c2d4f
  1. 90
      apps/school/templates/summer/_schedule_purchased_item.html
  2. 2
      apps/school/templates/summer/open_lesson.html
  3. 29
      web/src/sass/_common.sass

@ -1,6 +1,6 @@
{% load static %} {% load thumbnail %} {% load static %} {% load thumbnail %}
<div class="timing__item{% if school_schedule.weekday > 5 %} timing__item_bg{% endif %} js-timing-item js-timing-toggle{% if not school_schedule.weekday in school_schedules_purchased %} disable{% endif %}"> <div class="timing__item{% if school_schedule.weekday > 5 %} timing__item_bg{% endif %} js-timing-item js-timing-toggle{% if not school_schedule.weekday in school_schedules_purchased %} disable{% endif %}">
<div class="timing__cell"> <div class="timing__cell timing__cell--info">
<div class="timing__info"> <div class="timing__info">
<div class="timing__day{% if school_schedule.is_online %} active{% endif %}"> <div class="timing__day{% if school_schedule.is_online %} active{% endif %}">
{{ school_schedule }} {{ school_schedule }}
@ -26,53 +26,55 @@
<span style="display: none;" data-purchased="{{ school_schedule.weekday }}"></span> <span style="display: none;" data-purchased="{{ school_schedule.weekday }}"></span>
{% endif %} {% endif %}
</div> </div>
<div class="timing__cell"> <div style="display: flex;">
<div class="timing__preview"> <div class="timing__cell timing__cell--preview">
{% thumbnail live_lesson.cover.image "70x70" crop="center" as im %} <div class="timing__preview">
<img class="timing__pic" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" /> {% thumbnail live_lesson.cover.image "70x70" crop="center" as im %}
{% empty %} <img class="timing__pic" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" />
<img class="timing__pic" src="{% static 'img/no_cover.png' %}" width="70px" height="70px" /> {% empty %}
{% endthumbnail %} <img class="timing__pic" src="{% static 'img/no_cover.png' %}" style="width: 70px; height: 70px;" />
{% endthumbnail %}
</div>
</div> </div>
</div> <div class="timing__cell timing__cell--content">
<div class="timing__cell"> <div class="timing__title">{{ school_schedule.title }}{% if live_lesson and live_lesson.title %},
<div class="timing__title">{{ school_schedule.title }}{% if live_lesson and live_lesson.title %}, <span class="bold">{{ live_lesson.title }}</span>
<span class="bold">{{ live_lesson.title }}</span> {% endif %}
</div>
<div class="timing__content">
{% if live_lesson and live_lesson.short_description %}
{{ live_lesson.short_description }}
{% else %}
{{ school_schedule.description }}
{% endif %} {% endif %}
</div>
<div class="timing__content">
{% if live_lesson and live_lesson.short_description %}
{{ live_lesson.short_description }}
{% else %}
{{ school_schedule.description }}
{% endif %}
</div>
<div class="timing__more">
<div class="timing__head">Материалы</div>
<div class="timing__row">
<div class="timing__text">
{{ school_schedule.materials }}
</div>
</div> </div>
{% if school_schedule.schoolschedule_images.exists %} <div class="timing__more">
<div class="timing__head">Результаты прошлых уроков</div> <div class="timing__head">Материалы</div>
<div class="timing__works gallery"> <div class="timing__row">
{% for image in school_schedule.schoolschedule_images.all %} <div class="timing__text">
{% thumbnail image.img.image "48x48" crop="center" as im %} {{ school_schedule.materials }}
<a class="timing__work" href="{{ image.img.image.url }}"> </div>
<img class="timing__pic" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}"/> </div>
</a> {% if school_schedule.schoolschedule_images.exists %}
{% endthumbnail %} <div class="timing__head">Результаты прошлых уроков</div>
{% endfor %} <div class="timing__works gallery">
{% for image in school_schedule.schoolschedule_images.all %}
{% thumbnail image.img.image "48x48" crop="center" as im %}
<a class="timing__work" href="{{ image.img.image.url }}">
<img class="timing__pic" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}"/>
</a>
{% endthumbnail %}
{% endfor %}
</div>
{% endif %}
</div> </div>
{% endif %}
</div> </div>
</div> <div class="timing__cell timing__cell--toggle">
<div class="timing__cell"> <button class="timing__toggle">
<button class="timing__toggle"> <svg class="icon icon-arrow-down">
<svg class="icon icon-arrow-down"> <use xlink:href="{% static 'img/sprite.svg' %}#icon-arrow-down"></use>
<use xlink:href="{% static 'img/sprite.svg' %}#icon-arrow-down"></use> </svg>
</svg> </button>
</button> </div>
</div> </div>
</div> </div>

@ -1,4 +1,4 @@
<a <a
class="timing__btn btn btn_light" class="timing__btn btn btn_light"
href="{% url 'school:lesson-detail' live_lesson.id %}" href="{% url 'school:lesson-detail' live_lesson.id %}"
>смотреть урок</a> >подробнее</a>

@ -3731,6 +3731,8 @@ a.grey-link
box-shadow: -40px 0 0 0 $pink-light, 40px 0 0 0 $pink-light box-shadow: -40px 0 0 0 $pink-light, 40px 0 0 0 $pink-light
+nf +nf
border-color: transparent border-color: transparent
+m
display: block
&__item.open &__item.open
padding-bottom: 40px padding-bottom: 40px
&__item.open &__toggle &__item.open &__toggle
@ -3750,14 +3752,8 @@ a.grey-link
&__item.disable &__title, &__item.disable &__title,
&__item.disable &__content &__item.disable &__content
opacity: .4 opacity: .4
&__item.disable &__cell
&:nth-child(1)
justify-content: center
&:nth-child(3)
+m
padding: 0 0 50px
&__cell &__cell
&:nth-child(1) &--info
display: flex display: flex
padding-right: 20px padding-right: 20px
flex-direction: column flex-direction: column
@ -3766,15 +3762,15 @@ a.grey-link
+m +m
padding: 0 padding: 0
flex: 0 0 0 flex: 0 0 0
&:nth-child(2) margin-bottom: 15px
&--preview
padding-right: 20px padding-right: 20px
flex: 0 0 90px flex: 0 0 90px
&:nth-child(3) &--content
flex: 0 0 calc(100% - 254px) flex: 0 0 calc(100% - 254px)
+m +m
padding-top: 20px
flex: 0 0 calc(100% - 114px) flex: 0 0 calc(100% - 114px)
&:nth-child(4) &--toggle
flex: 0 0 34px flex: 0 0 34px
&__unlock &__unlock
+m +m
@ -3785,11 +3781,6 @@ a.grey-link
margin-bottom: auto margin-bottom: auto
+m +m
display: flex display: flex
position: absolute
top: 20px
left: 90px
right: 0
padding: 0
flex-direction: row flex-direction: row
&__day &__day
position: relative position: relative
@ -3816,10 +3807,8 @@ a.grey-link
margin: -3px 0 0 auto margin: -3px 0 0 auto
&__buy &__buy
+m +m
position: absolute display: flex
left: 0 margin-left: 20px
bottom: 40px
align-items: center
&__time &__time
margin: 15px 0 margin: 15px 0
opacity: .5 opacity: .5

Loading…
Cancel
Save