From 04e72b34c3ecf1ee581c2f9eef9758e3e82411d1 Mon Sep 17 00:00:00 2001 From: gzbender Date: Fri, 19 Jul 2019 11:59:34 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B2=D0=BA=D0=BB=D0=B0=D0=B4=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=B1=D0=B5=D1=81=D0=BF=D0=BB=D0=B0=D1=82=D0=BD=D1=8B=D1=85=20?= =?UTF-8?q?=D1=83=D1=80=D0=BE=D0=BA=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/v1/serializers/config.py | 2 +- .../school/templates/school/free_lessons.html | 25 ++----------------- web/src/js/pages/free-lessons.js | 3 --- web/src/sass/_common.sass | 10 ++++++++ 4 files changed, 13 insertions(+), 27 deletions(-) diff --git a/api/v1/serializers/config.py b/api/v1/serializers/config.py index 9f193bbf..744880ce 100644 --- a/api/v1/serializers/config.py +++ b/api/v1/serializers/config.py @@ -31,7 +31,7 @@ class ConfigSerializer(serializers.ModelSerializer): NUMBER_OF_COUNTRIES = serializers.IntegerField() NUMBER_OF_CITIES = serializers.IntegerField() FREE_LESSONS_VIDEO_URL = serializers.CharField(required=False) - FREE_LESSONS_VIDEO_PREVIEW_IMG = serializers.SerializerMethodField() + FREE_LESSONS_VIDEO_PREVIEW_IMG = serializers.SerializerMethodField(required=False) class Meta: model = Config diff --git a/apps/school/templates/school/free_lessons.html b/apps/school/templates/school/free_lessons.html index 44c0859d..bfd3754a 100644 --- a/apps/school/templates/school/free_lessons.html +++ b/apps/school/templates/school/free_lessons.html @@ -4,7 +4,7 @@ {% block ogsite-name %}Первая образовательная онлайн-платформа креативного мышления для детей{% endblock ogsite-name %} {% block content %} -
+
Месяц открытых дверей! @@ -64,26 +64,5 @@ {% block foot %} {% include "templates/blocks/popup_ref_link.html" %} - - - - + {% endblock foot %} diff --git a/web/src/js/pages/free-lessons.js b/web/src/js/pages/free-lessons.js index 70be5af4..ee1f0ab8 100644 --- a/web/src/js/pages/free-lessons.js +++ b/web/src/js/pages/free-lessons.js @@ -3,9 +3,6 @@ import ClipboardJS from 'clipboard'; import {showNotification} from '../modules/notification'; $(document).ready(function () { - $(document).on('popup-opened', (e, popup) => { - $('#referrer-url').select(); - }); const clipboard = new ClipboardJS('#copy-referrer-url-btn'); clipboard.on('success', e => { showNotification('success', 'Ссылка скопирована'); diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass index f5433351..81e3b169 100755 --- a/web/src/sass/_common.sass +++ b/web/src/sass/_common.sass @@ -4782,3 +4782,13 @@ a &_like &__like-btn display: block + +.free-lessons-title + padding-top: 140px + min-height: 300px + padding-bottom: 120px + + +m + padding-top: 80px + min-height: 200px + padding-bottom: 60px