Merge branch 'master' of gitlab.com:lilcity/backend into hotfix/LIL-691

apps/user/views.py

@@ -305,7 +305,7 @@ class BonusHistoryView(TemplateView):
             payment__isnull=False,
             payment__status__in=Payment.PW_PAID_STATUSES,
         )
-        context['referrer_url'] = 'http://%s%s?referrer=%s' % (
+        context['referrer_url'] = 'https://%s%s?referrer=%s' % (
             settings.MAIN_HOST, reverse('index'), short_url.encode_url(request.user.id)
         )
         context['share_text'] = '%s приглашает вас и ваших детей в первую онлайн школу креативного мышления Lil School. ' \

project/templates/lilcity/index.html

@@ -14,18 +14,13 @@
     <meta name="theme-color" content="#fff">
     <meta name="format-detection" content="telephone=no">
     <meta name="description" content="{% block description %}Онлайн-курсы LilCity{% endblock description%}">
-    <!--Twitter Card data-->
-    <meta name="twitter:card" content="summary">
-    <meta name="twitter:site" content="{% block twurl %}{{ request.build_absolute_uri }}{% endblock twurl %}">
-    {% comment %} <meta name="twitter:title" content="{% block twtitle %}Онлайн-курсы LilCity{% endblock twtitle %}"> {% endcomment %}
-    {% comment %} <meta name="twitter:description" content="{% block twdescription %}Онлайн-курсы LilCity{% endblock twdescription %}"> {% endcomment %}
-    {% comment %} <meta name="twitter:creator" content="@author_handle"> {% endcomment %}
-    {% comment %} <meta name="twitter:image" content="{% block twimage %}{{ request.get_host }}{% static 'img/video-1.jpg' %}{% endblock twimage %}"> {% endcomment %}
     <!--Open Graph data-->
     <meta property="og:title" content="{% block ogtitle %}Онлайн-курсы LilCity{% endblock ogtitle %}">
     {% comment %} <meta property="og:type" content="article"> {% endcomment %}
     <meta property="og:url" content="{% block ogurl %}{{ request.build_absolute_uri }}{% endblock ogurl %}">
-    <meta property="og:image" content="{% block ogimage %}{{ request.get_host }}{% static 'img/video-1.jpg' %}{% endblock ogimage %}">
+    <meta property="og:image" content="http://lil.school/static/img/video-1.jpg">
+    <meta property="og:image:width" content="597" />
+    <meta property="og:image:height" content="318" />
     <meta property="og:description" content="{% block ogdescription %}Онлайн-курсы LilCity{% endblock ogdescription %}">
     <meta property="og:site_name" content="Онлайн-курсы LilCity">
     <meta property="og:locale" content="ru_RU">

web/src/sass/_common.sass

@@ -624,7 +624,8 @@ a.btn
   &_bg &__container
     border-color: transparent
   &__bonuses
-    padding: 5px 15px
+    padding: 5px 12px
+    white-space: nowrap
     border: 1px solid rgba(25, 25, 25, 0.1)
     position: relative
     margin-left: 20px