Merge branch 'hotfix/LIL-695' into 'master'

LIL-695

See merge request lilcity/backend!207
remotes/origin/feature/LIL-711
cfwme 7 years ago
commit 95495b3064
  1. 6
      project/templates/blocks/baner.html
  2. 9
      web/src/sass/_common.sass

@ -1,11 +1,13 @@
{% if baner %}
<div class="banner" style="/* background-image: url(); */ display: none;" data-banner="{{baner.id}}">
{% if request.user_agent.is_mobile %}
<a href="{{ baner.url }}">
<a href="{{ baner.url }}" class="banner__image-wrap">
<img class="banner__image" src="{{ baner.image.url }}" />
</a>
{% else %}
<img class="banner__image" src="{{ baner.image.url }}" />
<div class="banner__image-wrap">
<img class="banner__image" src="{{ baner.image.url }}" />
</div>
<div class="banner__content">
<span class="banner__text">{{ baner.text }}</span>
<a href="{{ baner.url }}" class="banner__link">{{ baner.button_text }}</a>

@ -4003,7 +4003,7 @@ a.grey-link
padding-right: 20px
flex: 0 0 90px
&--content
flex: 0 0 calc(100% - 254px)
flex: 1
+m
flex: 0 0 calc(100% - 114px)
&--toggle
@ -4322,6 +4322,13 @@ a
background: white
+m
height: auto
&__image-wrap
background: -moz-linear-gradient(top, rgba(0,0,0,0) 0%, rgba(159,159,159,0) 72%, rgba(221,221,221,0.65) 100%)
background: -webkit-linear-gradient(top, rgba(0,0,0,0) 0%,rgba(159,159,159,0) 72%,rgba(221,221,221,0.65) 100%)
background: linear-gradient(to bottom, rgba(0,0,0,0) 0%,rgba(159,159,159,0) 72%,rgba(221,221,221,0.65) 100%)
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#00000000', endColorstr='#a6dddddd',GradientType=0 )
width: 100%
height: 100%
&__image
height: 100%
+m

Loading…
Cancel
Save