LIL-508 block expanded

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

@ -46,17 +46,10 @@
<div class="timing__more"> <div class="timing__more">
<div class="timing__head">Материалы</div> <div class="timing__head">Материалы</div>
<div class="timing__row"> <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"> <div class="timing__text">
{{ school_schedule.materials }} {{ school_schedule.materials }}
</div> </div>
</div> </div>
</div>
{% if school_schedule.schoolschedule_images.exists %} {% if school_schedule.schoolschedule_images.exists %}
<div class="timing__head">Результаты прошлых уроков</div> <div class="timing__head">Результаты прошлых уроков</div>
<div class="timing__works gallery"> <div class="timing__works gallery">

@ -42,17 +42,10 @@
<div class="timing__more"> <div class="timing__more">
<div class="timing__head">Материалы</div> <div class="timing__head">Материалы</div>
<div class="timing__row"> <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"> <div class="timing__text">
{{ school_schedule.materials }} {{ school_schedule.materials }}
</div> </div>
</div> </div>
</div>
{% if school_schedule.schoolschedule_images.exists %} {% if school_schedule.schoolschedule_images.exists %}
<div class="timing__head">Результаты прошлых уроков</div> <div class="timing__head">Результаты прошлых уроков</div>
<div class="timing__works gallery"> <div class="timing__works gallery">

@ -19,7 +19,7 @@
<div class="timing js-timing"> <div class="timing js-timing">
<div class="timing__week"> <div class="timing__week">
{% for school_schedule in school_schedules %} {% with current_live_lesson=school_schedule.current_live_lesson %} {% 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__cell">
<div class="timing__info"> <div class="timing__info">
<div class="timing__day{% if school_schedule.is_online %} active{% endif %}"> <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 %} {% comment %} <meta property="fb:admins" content="Facebook numeric ID"> {% endcomment %}
<meta name="csrf-token" content="{{ csrf_token }}"> <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' %}"/> <link rel="shortcut icon" type="image/png" href="{% static 'img/favicon.png' %}"/>
<script> <script>
var viewportmeta = document.querySelector('meta[name="viewport"]'); var viewportmeta = document.querySelector('meta[name="viewport"]');

@ -3839,7 +3839,7 @@ a.grey-link
+fb +fb
&__row &__row
display: flex display: flex
margin: 0 -15px 20px margin: 0 0 20px
+t +t
display: block display: block
&__col &__col

Loading…
Cancel
Save