LIL-508 block expanded

remotes/origin/hasaccess
nikita 8 years ago
parent 1b1353a257
commit 046367834f
  1. 11
      apps/school/templates/blocks/_schedule_purchased_item.html
  2. 11
      apps/school/templates/blocks/schedule.html
  3. 2
      apps/school/templates/school/schedules_print.html
  4. 2
      project/templates/lilcity/index.html
  5. 20
      web/src/sass/_common.sass

@ -46,15 +46,8 @@
<div class="timing__more">
<div class="timing__head">Материалы</div>
<div class="timing__row">
<div class="timing__col">
<div class="timing__text">
<p>{{ school_schedule.description }}</p>
</div>
</div>
<div class="timing__col">
<div class="timing__text">
{{ school_schedule.materials }}
</div>
<div class="timing__text">
{{ school_schedule.materials }}
</div>
</div>
{% if school_schedule.schoolschedule_images.exists %}

@ -42,15 +42,8 @@
<div class="timing__more">
<div class="timing__head">Материалы</div>
<div class="timing__row">
<div class="timing__col">
<div class="timing__text">
<p>{{ school_schedule.description }}</p>
</div>
</div>
<div class="timing__col">
<div class="timing__text">
{{ school_schedule.materials }}
</div>
<div class="timing__text">
{{ school_schedule.materials }}
</div>
</div>
{% if school_schedule.schoolschedule_images.exists %}

@ -19,7 +19,7 @@
<div class="timing js-timing">
<div class="timing__week">
{% for school_schedule in school_schedules %} {% with current_live_lesson=school_schedule.current_live_lesson %}
<div class="timing__item {% if not current_live_lesson %} timing__item_bg{% endif %} js-timing-item open">
<div class="timing__item {% if school_schedule.weekday > 5 %} timing__item_bg{% endif %} js-timing-item open">
<div class="timing__cell">
<div class="timing__info">
<div class="timing__day{% if school_schedule.is_online %} active{% endif %}">

@ -30,7 +30,7 @@
{% comment %} <meta property="fb:admins" content="Facebook numeric ID"> {% endcomment %}
<meta name="csrf-token" content="{{ csrf_token }}">
<link rel="stylesheet" media="all" href={% static "app.css" %}?3>
<link rel="stylesheet" media="all" href={% static "app.css" %}?4>
<link rel="shortcut icon" type="image/png" href="{% static 'img/favicon.png' %}"/>
<script>
var viewportmeta = document.querySelector('meta[name="viewport"]');

@ -461,7 +461,7 @@ a.btn
margin-top: -5px
background: #EE4630
border-radius: 50%
animation: blinker 2s linear infinite
animation: blinker 2s linear infinite
+t
width: 6px
height: 6px
@ -1322,8 +1322,8 @@ a[name]
+t
display: none
&__item
background-position: center center
background-size: cover
background-position: center center
background-size: cover
float: left
width: 140px
height: 140px
@ -2157,7 +2157,7 @@ a.grey-link
height: 50px
padding: 0 20px
&__appended
flex: 1
flex: 1
&__textarea
display: block
height: 36px
@ -2741,10 +2741,10 @@ a.grey-link
.questions
&__anchor
display: block
position: relative
top: -110px
visibility: hidden
display: block
position: relative
top: -110px
visibility: hidden
&__form,
&__item
display: flex
@ -2842,7 +2842,7 @@ a.grey-link
.icon
font-size: 40px
span:first-child
display: none
display: none
&_sm &__title
margin-bottom: 15px
&_sm &__item
@ -3839,7 +3839,7 @@ a.grey-link
+fb
&__row
display: flex
margin: 0 -15px 20px
margin: 0 0 20px
+t
display: block
&__col

Loading…
Cancel
Save