Merge branch 'dev' into 'master'

LIL-512 teacher block styling

See merge request lilcity/backend!43

project/templates/blocks/teachers.html

@@ -16,8 +16,8 @@
           <img class="ava__pic" src="{% static 'img/user_default.jpg' %}"> {% endif %}
         </div>
         <div class="teachers__wrap">
-          <div class="teachers__title">{{ teacher.get_full_name }}
+          <div class="teachers__title">{{ teacher.get_full_name }}{% if teacher.instagram_hashtag %},
-            {% if teacher.instagram_hashtag %}, <a href='https://www.instagram.com/explore/tags/{{ teacher.instagram_hashtag }}/' target="_blank">
+              <a href='https://www.instagram.com/explore/tags/{{ teacher.instagram_hashtag }}/' target="_blank">
                 #{{ teacher.instagram_hashtag }}
               </a>
             {% endif %}
@@ -29,13 +29,13 @@
                 <use xlink:href="{% static 'img/sprite.svg' %}#icon-share-facebook"></use>
               </svg>
             </a>
-            {% endif %} {% if teacher.instagram or True %}
+            {% endif %} {% if teacher.instagram %}
             <a class="social__item" href="{{ teacher.instagram }}" target="_blank">
               <svg class="icon icon-share-instagram">
                 <use xlink:href="{% static 'img/sprite.svg' %}#icon-share-instagram"></use>
               </svg>
             </a>
-            {% endif %} {% if teacher.twitter or True %}
+            {% endif %} {% if teacher.twitter %}
             <a class="social__item" href="{{ teacher.twitter }}" target="_blank">
               <svg class="icon icon-share-twitter">
                 <use xlink:href="{% static 'img/sprite.svg' %}#icon-share-twitter"></use>