Merge branch 'dev' into 'master'

Dev

See merge request lilcity/backend!39

api/v1/serializers/user.py

@@ -30,6 +30,7 @@ class UserSerializer(serializers.ModelSerializer):
             'city',
             'about',
             'instagram',
+            'instagram_hashtag',
             'facebook',
             'twitter',
             'pinterest',

apps/user/migrations/0022_user_instagram_hashtag.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.0.5 on 2018-06-06 21:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0021_auto_20180429_1308'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='instagram_hashtag',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='Инстаграм хештег'),
+        ),
+    ]

apps/user/models.py

@@ -62,6 +62,7 @@ class User(AbstractUser):
     city = models.CharField('Город', max_length=85, null=True, blank=True)
     about = models.CharField('О себе', max_length=1000, null=True, blank=True)
     instagram = models.URLField(default='', null=True, blank=True)
+    instagram_hashtag = models.CharField('Инстаграм хештег', max_length=100, null=True, blank=True)
     facebook = models.URLField(default='', null=True, blank=True)
     twitter = models.URLField(default='', null=True, blank=True)
     pinterest = models.URLField(default='', null=True, blank=True)

project/templates/lilcity/index.html

@@ -30,7 +30,7 @@
     {% comment %} <meta property="fb:admins" content="Facebook numeric ID"> {% endcomment %}
 
     <meta name="csrf-token" content="{{ csrf_token }}">
-    <link rel="stylesheet" media="all" href={% static "app.css" %}?4>
+    <link rel="stylesheet" media="all" href={% static "app.css" %}?5>
     <link rel="shortcut icon" type="image/png" href="{% static 'img/favicon.png' %}"/>
     <script>
         var viewportmeta = document.querySelector('meta[name="viewport"]');

web/src/sass/_common.sass

@@ -716,6 +716,7 @@ a.btn
     display: block
     padding: 10px
     font-size: 0
+    text-align: center
     +nl
       margin-bottom: 10px
     .icon
@@ -934,6 +935,7 @@ a[name]
       padding: 45px 0
   &_arts
     padding: 70px 0 70px
+    overflow: hidden
     +t
       padding: 80px 0 70px
     +m
@@ -1335,6 +1337,7 @@ a[name]
     &_lg
       width: 300px
       height: 300px
+      overflow: hidden
       +m
         width: calc(66.66% - 10px)
         height: calc(66.66% - 10px)