mitri4
/
LilSchool
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
remotes/origin/feature/effective_amount
gzbender 8 years ago
parent d1d8d4bccd
commit fae11c2d4f
3 changed files with 56 additions and 65 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  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

90
apps/school/templates/summer/_schedule_purchased_item.html
Unescape View File

@ -1,6 +1,6 @@
{% 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__cell">
<div class="timing__cell timing__cell--info">
<div class="timing__info">
<div class="timing__day{% if school_schedule.is_online %} active{% endif %}">
{{ school_schedule }}
@ -26,53 +26,55 @@
<span style="display: none;" data-purchased="{{ school_schedule.weekday }}"></span>
{% endif %}
</div>
<div class="timing__cell">
<div class="timing__preview">
{% thumbnail live_lesson.cover.image "70x70" crop="center" as im %}
<img class="timing__pic" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" />
{% empty %}
<img class="timing__pic" src="{% static 'img/no_cover.png' %}" width="70px" height="70px" />
{% endthumbnail %}
<div style="display: flex;">
<div class="timing__cell timing__cell--preview">
<div class="timing__preview">
{% thumbnail live_lesson.cover.image "70x70" crop="center" as im %}
<img class="timing__pic" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" />
{% empty %}
<img class="timing__pic" src="{% static 'img/no_cover.png' %}" style="width: 70px; height: 70px;" />
{% endthumbnail %}
</div>
</div>
</div>
<div class="timing__cell">
<div class="timing__title">{{ school_schedule.title }}{% if live_lesson and live_lesson.title %},
<span class="bold">{{ live_lesson.title }}</span>
<div class="timing__cell timing__cell--content">
<div class="timing__title">{{ school_schedule.title }}{% if live_lesson and live_lesson.title %},
<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 %}
</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>
{% if school_schedule.schoolschedule_images.exists %}
<div class="timing__head">Результаты прошлых уроков</div>
<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 class="timing__more">
<div class="timing__head">Материалы</div>
<div class="timing__row">
<div class="timing__text">
{{ school_schedule.materials }}
</div>
</div>
{% if school_schedule.schoolschedule_images.exists %}
<div class="timing__head">Результаты прошлых уроков</div>
<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>
{% endif %}
</div>
</div>
<div class="timing__cell">
<button class="timing__toggle">
<svg class="icon icon-arrow-down">
<use xlink:href="{% static 'img/sprite.svg' %}#icon-arrow-down"></use>
</svg>
</button>
<div class="timing__cell timing__cell--toggle">
<button class="timing__toggle">
<svg class="icon icon-arrow-down">
<use xlink:href="{% static 'img/sprite.svg' %}#icon-arrow-down"></use>
</svg>
</button>
</div>
</div>
</div>

2
apps/school/templates/summer/open_lesson.html
Unescape View File

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

29
web/src/sass/_common.sass
Unescape View File

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

Write Preview
Loading…
Cancel
Save