From 72bc8911bd6d6f723e6bd2d09c25f9b4f1676219 Mon Sep 17 00:00:00 2001 From: gzbender Date: Tue, 4 Sep 2018 16:49:39 +0500 Subject: [PATCH] =?UTF-8?q?LIL-652=20=D0=91=D0=B0=D0=B3=20=D0=BC=D0=BE?= =?UTF-8?q?=D0=B1=D0=B8=D0=BB=D1=8C=D0=BD=D0=BE=D0=B9=20=D0=B2=D0=B5=D1=80?= =?UTF-8?q?=D1=81=D1=82=D0=BA=D0=B8=20=D1=80=D0=B0=D1=81=D0=BF=D0=B8=D1=81?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/school/templates/blocks/schedule_item.html | 7 +++++-- web/src/sass/_common.sass | 14 +++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/apps/school/templates/blocks/schedule_item.html b/apps/school/templates/blocks/schedule_item.html index 63dde442..7e860a4e 100644 --- a/apps/school/templates/blocks/schedule_item.html +++ b/apps/school/templates/blocks/schedule_item.html @@ -4,9 +4,12 @@
{{ school_schedule }} + {% if request.user_agent.is_mobile and school_schedule.trial_lesson %} + Пробный урок + {% endif %}
{% if is_purchased and live_lesson %} -
{{ live_lesson.date|date:"j E" }}
+
{% if request.user_agent.is_mobile %}{{ live_lesson.date|date:"j b" }}{% else %}{{ live_lesson.date|date:"j E" }}{% endif %}
{% endif %}
{{ school_schedule.start_at }} (МСК)
@@ -17,7 +20,7 @@ {% else %} {% include './day_pay_btn.html' %} {% endif %} - {% if school_schedule.trial_lesson %} + {% if not request.user_agent.is_mobile and school_schedule.trial_lesson %} Пробный урок {% endif %}
diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass index adb623a6..c959b913 100755 --- a/web/src/sass/_common.sass +++ b/web/src/sass/_common.sass @@ -1836,6 +1836,8 @@ a.grey-link transition: opacity .2s &__cell padding-right: 10px + +m + margin-bottom: 5px &:first-child padding-top: 3px +fb @@ -3799,9 +3801,6 @@ a.grey-link &__item.open &__buy, &__item.open &__more display: block - &__item.open &__buy - +m - display: flex &__item.open &__cell &:nth-child(3) +m @@ -3863,7 +3862,7 @@ a.grey-link &__date opacity: .5 +m - margin: -3px 0 0 auto + margin: -3px 0 0 10px &__buy +m flex: 1 0 0 @@ -3872,13 +3871,14 @@ a.grey-link display: inline-block margin-top: 10px +m - display: block - margin-bottom: -31px + position: absolute; + width: 120px; + margin-top: 6px; &__time margin: 15px 0 opacity: .5 +m - margin: -1px 15px + margin: -1px 15px 0 5px font-size: 12px; &__btn margin-right: -60px