Merge branch 'master' of gitlab.com:lilcity/backend into hotfix/LIL-691

remotes/origin/hotfix/LIL-691
gzbender 7 years ago
commit 211b29a621
  1. 2
      apps/course/templates/course/course.html
  2. 2
      project/templates/blocks/partners.html
  3. 8
      web/src/sass/_common.sass

@ -26,7 +26,7 @@
<div class="go__title">Вернуться</div>
</a>
{% if has_full_access %}
<a class="go__btn btn btn_stroke" href="{% url 'course_edit' course.id %}">Редактировать</a>
<a class="go__btn btn btn_light-gray" href="{% url 'course_edit' course.id %}">Редактировать</a>
{% endif %}
{% if course.author != request.user and not paid and course.price %}
<a href="#"

@ -17,7 +17,7 @@
<a target="_blank" class="partners__item" href="http://www.pinkbus.ru/">
<img class="partners__pic" src="{% static 'img/pinkbus.jpg' %}">
</a>
<a target="_blank" class="partners__item" href="http://joviland.ru/">
<a target="_blank" class="partners__item" href="http://joviland.ru/lil-school/">
<img class="partners__pic" src="{% static 'img/jovi.png' %}">
</a>
</div>

@ -193,6 +193,14 @@ button
fill: white
&_gray
background: $bg
&_light-gray
background: white
border: 1px solid $gray
color: $gray
&:hover,
&:active
color: $cl
&_white
background: white
&_pink

Loading…
Cancel
Save