LIL-576 Поправить верстку

remotes/origin/hotfix/LIL-661
gzbender 8 years ago
parent a0a4b0b059
commit 1cbb6fd39d
  1. 15
      apps/course/templates/course/course_only_lessons.html
  2. 24
      apps/course/templates/course/lesson.html
  3. 27
      web/src/sass/_common.sass

@ -180,19 +180,18 @@
<a href="#"> <a href="#">
{% endif %} {% endif %}
<div class="lessons__item"> <div class="lessons__item">
<div class="lessons__subtitle subtitle">{{ forloop.counter }}. {{ lesson.title }}</div>
<div class="lessons__row"> <div class="lessons__row">
{% if lesson.cover %}
<div class="lessons__preview"> <div class="lessons__preview">
<div class="lessons__pic-wrapper"> <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>
</div> </div>
{% endif %} <div>
<div class="lessons__content">{{ lesson.short_description | truncatechars_html:800 | safe }}</div> <div class="lessons__subtitle subtitle">{{ forloop.counter }}. {{ lesson.title }}</div>
</div> <div class="lessons__content">{{ lesson.short_description | truncatechars_html:800 | safe }}</div>
<div class="lessons__row"> <a href="{% url 'lesson' pk=lesson.id %}" class="btn btn_stroke">Перейти к уроку</a>
<a href="{% url 'lesson' pk=lesson.id %}" class="btn btn_stroke">Перейти к уроку</a> </div>
</div> </div>
</div> </div>
</a> </a>

@ -27,18 +27,18 @@
{% endif %} {% endif %}
</div> </div>
<div class="lesson"> <div class="lesson">
<div class="lesson__subtitle subtitle">{{ lesson.title }}</div> <div class="lesson__row">
<div class="lesson__content">{{ lesson.short_description }}</div> <div class="lesson__preview">
{% comment %} <a class="lesson__video video" href="#"> <div class="lesson__pic-wrapper">
{% if lesson.cover %} <img class="lesson__pic"
<img class="video__pic" src="{{ lesson.cover.image.url }}"/> src="{% if lesson.cover %}{{ lesson.cover.image.url }}{% else %}{% static 'img/no_cover.png' %}{% endif %}">
{% else %} </div>
</div>
{% endif %} <div>
<svg class="icon icon-play"> <div class="lesson__subtitle subtitle">{{ lesson.title }}</div>
<use xlink:href="{% static 'img/sprite.svg' %}#icon-play"></use> <div class="lesson__content">{{ lesson.short_description }}</div>
</svg> </div>
</a> {% endcomment %} </div>
</div> </div>
</div> </div>
</div> </div>

@ -175,7 +175,7 @@ button
top: 1px top: 1px
left: 1px left: 1px
right: 1px right: 1px
bottom: 1px bottom: 2px
background: white background: white
border-radius: 2px border-radius: 2px
transition: opacity .2s transition: opacity .2s
@ -2654,10 +2654,9 @@ a.grey-link
border-radius: 50%; border-radius: 50%;
overflow: hidden; overflow: hidden;
&__pic &__pic
top: 50%; object-fit: cover
position: relative;
transform: translateY(-50%);
width: 100% width: 100%
height: 100%
&__content &__content
flex: 0 0 calc(100% - 165px) flex: 0 0 calc(100% - 165px)
&__actions &__actions
@ -2700,7 +2699,7 @@ a.grey-link
margin-bottom: 10px margin-bottom: 10px
color: #191919 color: #191919
&__content &__content
margin-bottom: 30px margin-bottom: 15px
color: #191919 color: #191919
&__video_frame &__video_frame
width: 100% width: 100%
@ -2708,6 +2707,24 @@ a.grey-link
&__chat_frame &__chat_frame
width: 100% width: 100%
height: 600px 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 .lessons

Loading…
Cancel
Save