From 1cbb6fd39dcaed345f03d905b6ebb25b1e6d3f04 Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Thu, 19 Jul 2018 23:38:54 +0500
Subject: [PATCH] =?UTF-8?q?LIL-576=20=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D1=82=D1=8C=20=D0=B2=D0=B5=D1=80=D1=81=D1=82=D0=BA=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/course/course_only_lessons.html | 15 +++++------
 apps/course/templates/course/lesson.html      | 24 ++++++++---------
 web/src/sass/_common.sass                     | 27 +++++++++++++++----
 3 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/apps/course/templates/course/course_only_lessons.html b/apps/course/templates/course/course_only_lessons.html
index f0217bcf..0f8c0483 100644
--- a/apps/course/templates/course/course_only_lessons.html
+++ b/apps/course/templates/course/course_only_lessons.html
@@ -180,19 +180,18 @@
         <a href="#">
         {% endif %}
           <div class="lessons__item">
-            <div class="lessons__subtitle subtitle">{{ forloop.counter }}. {{ lesson.title }}</div>
             <div class="lessons__row">
-              {% if lesson.cover %}
               <div class="lessons__preview">
                 <div class="lessons__pic-wrapper">
-                  <img class="lessons__pic" src="{{ lesson.cover.image.url }}">
+                  <img class="lessons__pic"
+                       src="{% if lesson.cover %}{{ lesson.cover.image.url }}{% else %}{% static 'img/no_cover.png' %}{% endif %}">
                 </div>
               </div>
-              {% endif %}
-              <div class="lessons__content">{{ lesson.short_description | truncatechars_html:800 | safe }}</div>
-            </div>
-            <div class="lessons__row">
-              <a href="{% url 'lesson' pk=lesson.id %}" class="btn btn_stroke">Перейти к уроку</a>
+              <div>
+                <div class="lessons__subtitle subtitle">{{ forloop.counter }}. {{ lesson.title }}</div>
+                <div class="lessons__content">{{ lesson.short_description | truncatechars_html:800 | safe }}</div>
+                <a href="{% url 'lesson' pk=lesson.id %}" class="btn btn_stroke">Перейти к уроку</a>
+              </div>
             </div>
           </div>
         </a>
diff --git a/apps/course/templates/course/lesson.html b/apps/course/templates/course/lesson.html
index 662a4dd5..48d64ef8 100644
--- a/apps/course/templates/course/lesson.html
+++ b/apps/course/templates/course/lesson.html
@@ -27,18 +27,18 @@
       {% endif %}
     </div>
     <div class="lesson">
-      <div class="lesson__subtitle subtitle">{{ lesson.title }}</div>
-      <div class="lesson__content">{{ lesson.short_description }}</div>
-      {% comment %} <a class="lesson__video video" href="#">
-        {% if lesson.cover %}
-        <img class="video__pic" src="{{ lesson.cover.image.url }}"/>
-        {% else %}
-
-        {% endif %}
-        <svg class="icon icon-play">
-          <use xlink:href="{% static 'img/sprite.svg' %}#icon-play"></use>
-        </svg>
-      </a> {% endcomment %}
+      <div class="lesson__row">
+        <div class="lesson__preview">
+          <div class="lesson__pic-wrapper">
+            <img class="lesson__pic"
+                 src="{% if lesson.cover %}{{ lesson.cover.image.url }}{% else %}{% static 'img/no_cover.png' %}{% endif %}">
+          </div>
+        </div>
+        <div>
+          <div class="lesson__subtitle subtitle">{{ lesson.title }}</div>
+          <div class="lesson__content">{{ lesson.short_description }}</div>
+        </div>
+      </div>
     </div>
   </div>
 </div>
diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass
index 8386a037..fe137963 100755
--- a/web/src/sass/_common.sass
+++ b/web/src/sass/_common.sass
@@ -175,7 +175,7 @@ button
       top: 1px
       left: 1px
       right: 1px
-      bottom: 1px
+      bottom: 2px
       background: white
       border-radius: 2px
       transition: opacity .2s
@@ -2654,10 +2654,9 @@ a.grey-link
     border-radius: 50%;
     overflow: hidden;
   &__pic
-    top: 50%;
-    position: relative;
-    transform: translateY(-50%);
+    object-fit: cover
     width: 100%
+    height: 100%
   &__content
     flex: 0 0 calc(100% - 165px)
   &__actions
@@ -2700,7 +2699,7 @@ a.grey-link
     margin-bottom: 10px
     color: #191919
   &__content
-    margin-bottom: 30px
+    margin-bottom: 15px
     color: #191919
   &__video_frame
     width: 100%
@@ -2708,6 +2707,24 @@ a.grey-link
   &__chat_frame
     width: 100%
     height: 600px
+  &__row
+    display: flex
+    +m
+      display: block
+  &__preview
+    margin-right: 25px
+    flex: 0 0 140px
+    +m
+      display: none
+  &__pic-wrapper
+    width: 130px;
+    height: 130px;
+    border-radius: 50%;
+    overflow: hidden;
+  &__pic
+    object-fit: cover
+    width: 100%
+    height: 100%
 
 
 .lessons