LIL-652 Баг мобильной верстки расписания

remotes/origin/hotfix/LIL-661
gzbender 8 years ago
parent dd39e63e79
commit 72bc8911bd
  1. 7
      apps/school/templates/blocks/schedule_item.html
  2. 14
      web/src/sass/_common.sass

@ -4,9 +4,12 @@
<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 }}
{% if request.user_agent.is_mobile and school_schedule.trial_lesson %}
<a class="timing__trial-lesson js-video-modal" href="#" data-video-url="{{ school_schedule.trial_lesson }}">Пробный урок</a>
{% endif %}
</div> </div>
{% if is_purchased and live_lesson %} {% if is_purchased and live_lesson %}
<div class="timing__date">{{ live_lesson.date|date:"j E" }}</div> <div class="timing__date">{% if request.user_agent.is_mobile %}{{ live_lesson.date|date:"j b" }}{% else %}{{ live_lesson.date|date:"j E" }}{% endif %}</div>
{% endif %} {% endif %}
<div class="timing__time">{{ school_schedule.start_at }} (МСК)</div> <div class="timing__time">{{ school_schedule.start_at }} (МСК)</div>
<div class="timing__buy"> <div class="timing__buy">
@ -17,7 +20,7 @@
{% else %} {% else %}
{% include './day_pay_btn.html' %} {% include './day_pay_btn.html' %}
{% endif %} {% endif %}
{% if school_schedule.trial_lesson %} {% if not request.user_agent.is_mobile and school_schedule.trial_lesson %}
<a class="timing__trial-lesson js-video-modal" href="#" data-video-url="{{ school_schedule.trial_lesson }}">Пробный урок</a> <a class="timing__trial-lesson js-video-modal" href="#" data-video-url="{{ school_schedule.trial_lesson }}">Пробный урок</a>
{% endif %} {% endif %}
</div> </div>

@ -1836,6 +1836,8 @@ a.grey-link
transition: opacity .2s transition: opacity .2s
&__cell &__cell
padding-right: 10px padding-right: 10px
+m
margin-bottom: 5px
&:first-child &:first-child
padding-top: 3px padding-top: 3px
+fb +fb
@ -3799,9 +3801,6 @@ a.grey-link
&__item.open &__buy, &__item.open &__buy,
&__item.open &__more &__item.open &__more
display: block display: block
&__item.open &__buy
+m
display: flex
&__item.open &__cell &__item.open &__cell
&:nth-child(3) &:nth-child(3)
+m +m
@ -3863,7 +3862,7 @@ a.grey-link
&__date &__date
opacity: .5 opacity: .5
+m +m
margin: -3px 0 0 auto margin: -3px 0 0 10px
&__buy &__buy
+m +m
flex: 1 0 0 flex: 1 0 0
@ -3872,13 +3871,14 @@ a.grey-link
display: inline-block display: inline-block
margin-top: 10px margin-top: 10px
+m +m
display: block position: absolute;
margin-bottom: -31px width: 120px;
margin-top: 6px;
&__time &__time
margin: 15px 0 margin: 15px 0
opacity: .5 opacity: .5
+m +m
margin: -1px 15px margin: -1px 15px 0 5px
font-size: 12px; font-size: 12px;
&__btn &__btn
margin-right: -60px margin-right: -60px

Loading…
Cancel
Save