Merge remote-tracking branch 'origin/dev' into dev

remotes/origin/hasaccess
Vitaly Baev 8 years ago
commit 67d9ea6872
  1. 71
      apps/course/templates/course/course.html
  2. 2
      web/src/js/modules/courses.js
  3. 2
      web/src/sass/_common.sass

@ -158,16 +158,35 @@
</svg> </svg>
{% endif %} {% endif %}
</a> </a>
<div class="course__share share share_sm">
<div class="share">
<div class="share__title">Поделиться курсом</div> <div class="share__title">Поделиться курсом</div>
<div class="share__list"> <div class="share__list likely">
<div class="likely"> <!--<a class="share__item vkontakte" href="#">-->
<div class="facebook">Facebook</div> <!--<svg class="icon icon-share-facebook">-->
<div class="twitter">Twitter</div> <!--<use xlink:href="{% static 'img/sprite.svg' %}#icon-share-vkontakte"></use>-->
<div class="gplus">Google+</div> <!--</svg>-->
<div class="vkontakte">VK</div> <!--</a>-->
<div class="pinterest">Pinterest</div> <a class="share__item facebook" href="#">
</div> <svg class="icon icon-share-facebook">
<use xlink:href="{% static 'img/sprite.svg' %}#icon-share-facebook"></use>
</svg>
</a>
<a class="share__item twitter" href="#">
<svg class="icon icon-share-twitter">
<use xlink:href="{% static 'img/sprite.svg' %}#icon-share-twitter"></use>
</svg>
</a>
<a class="share__item gplus" href="#">
<svg class="icon icon-share-google">
<use xlink:href="{% static 'img/sprite.svg' %}#icon-share-google"></use>
</svg>
</a>
<a class="share__item pinterest" href="#">
<svg class="icon icon-share-pinterest">
<use xlink:href="{% static 'img/sprite.svg' %}#icon-share-pinterest"></use>
</svg>
</a>
</div> </div>
</div> </div>
</div> </div>
@ -392,14 +411,32 @@
<div class="section__center center center_sm"> <div class="section__center center center_sm">
<div class="share"> <div class="share">
<div class="share__title">Поделиться курсом</div> <div class="share__title">Поделиться курсом</div>
<div class="share__list"> <div class="share__list likely">
<div class="likely"> <!--<a class="share__item vkontakte" href="#">-->
<div class="facebook">Facebook</div> <!--<svg class="icon icon-share-facebook">-->
<div class="twitter">Twitter</div> <!--<use xlink:href="{% static 'img/sprite.svg' %}#icon-share-vkontakte"></use>-->
<div class="gplus">Google+</div> <!--</svg>-->
<div class="vkontakte">VK</div> <!--</a>-->
<div class="pinterest">Pinterest</div> <a class="share__item facebook" href="#">
</div> <svg class="icon icon-share-facebook">
<use xlink:href="{% static 'img/sprite.svg' %}#icon-share-facebook"></use>
</svg>
</a>
<a class="share__item twitter" href="#">
<svg class="icon icon-share-twitter">
<use xlink:href="{% static 'img/sprite.svg' %}#icon-share-twitter"></use>
</svg>
</a>
<a class="share__item gplus" href="#">
<svg class="icon icon-share-google">
<use xlink:href="{% static 'img/sprite.svg' %}#icon-share-google"></use>
</svg>
</a>
<a class="share__item pinterest" href="#">
<svg class="icon icon-share-pinterest">
<use xlink:href="{% static 'img/sprite.svg' %}#icon-share-pinterest"></use>
</svg>
</a>
</div> </div>
</div> </div>
</div> </div>

@ -3,7 +3,7 @@ import moment from 'moment';
import createHistory from 'history/createBrowserHistory'; import createHistory from 'history/createBrowserHistory';
// Likely // Likely
import 'ilyabirman-likely/release/likely.css'; // import 'ilyabirman-likely/release/likely.css';
import 'ilyabirman-likely/release/likely.js'; import 'ilyabirman-likely/release/likely.js';
moment.locale('ru'); moment.locale('ru');

@ -2575,6 +2575,8 @@ a.grey-link
margin-right: 20px margin-right: 20px
.icon .icon
font-size: 40px font-size: 40px
span:first-child
display: none;
&_sm &__title &_sm &__title
margin-bottom: 15px margin-bottom: 15px
&_sm &__item &_sm &__item

Loading…
Cancel
Save