LIL-601 Поменял местами картинку урока и блок с контентом в курсе, поправил стили

remotes/origin/hotfix/LIL-691
gzbender 7 years ago
parent db824d5961
commit 68f05cbf77
  1. 13
      apps/course/templates/course/course_only_lessons.html
  2. 14
      apps/course/templates/course/lesson.html
  3. 5
      web/src/sass/_common.sass

@ -25,6 +25,9 @@
</div>
<div class="go__title">Вернуться</div>
</a>
{% if has_full_access %}
<a class="go__btn btn" href="{% url 'course_edit' course.id %}">Редактировать</a>
{% endif %}
{% if not paid and course.price and not has_full_access %}
<a
class="go__btn btn{% if pending %} btn_gray{% endif %} btn_md"
@ -176,17 +179,17 @@
{% for lesson in lessons %}
<div class="lessons__item">
<div class="lessons__row">
<div class="lessons__content-wrapper">
<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 class="lessons__preview">
<div class="lessons__pic-wrapper">
<img class="lessons__pic"
src="{% if lesson.cover %}{{ lesson.cover.image_thumbnail.url }}{% else %}{% static 'img/no_cover.png' %}{% endif %}">
</div>
</div>
<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>
{% endfor %}

@ -28,15 +28,9 @@
</div>
<div class="lesson">
<div class="lesson__row">
<div class="lesson__preview">
<div class="lesson__pic-wrapper">
<img class="lesson__pic"
src="{% if lesson.cover %}{{ lesson.cover.image_thumbnail.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 | linebreaks }}</div>
<div class="lesson__content">{{ lesson.short_description | safe | linebreaks }}</div>
<a href="{% url 'user' lesson.author.id %}">
<div class="lesson__user user">
{% if lesson.author.photo %}
@ -57,6 +51,12 @@
</div>
</a>
</div>
<div class="lesson__preview">
<div class="lesson__pic-wrapper">
<img class="lesson__pic"
src="{% if lesson.cover %}{{ lesson.cover.image_thumbnail.url }}{% else %}{% static 'img/no_cover.png' %}{% endif %}">
</div>
</div>
</div>
</div>
</div>

@ -2657,6 +2657,7 @@ a.grey-link
&__subtitle
margin-bottom: 20px
text-transform: none
letter-spacing: normal
&__row
display: flex
+m
@ -2675,6 +2676,8 @@ a.grey-link
object-fit: cover
width: 100%
height: 100%
&__content-wrapper
flex: 1
&__content
flex: 0 0 calc(100% - 165px)
&__actions
@ -2714,6 +2717,8 @@ a.grey-link
.lesson
&__subtitle
letter-spacing: normal
text-transform: none
margin-bottom: 10px
color: #191919
&__content

Loading…
Cancel
Save