mitri4
/
LilSchool
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev' into 'master'

Browse Source 
Dev

See merge request lilcity/backend!38
remotes/origin/hasaccess
cfwme 8 years ago
parent 32e73370a3 cb9c45ea67
commit 1692e5c48d
5 changed files with 38 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      apps/school/templates/blocks/_schedule_purchased_item.html
  2. 26
      apps/school/templates/blocks/schedule.html
  3. 17
      apps/school/templates/school/schedules_print.html
  4. 2
      project/templates/lilcity/index.html
  5. 20
      web/src/sass/_common.sass

17
apps/school/templates/blocks/_schedule_purchased_item.html
Unescape View File

@ -40,21 +40,18 @@
<span class="bold">{{ live_lesson.title }}</span>
{% endif %}
</div>
<div class="timing__content">
{% if live_lesson %}
<div class="timing__content">{{ live_lesson.short_description }}</div>
{{ live_lesson.short_description }}
{% else %}
{{ school_schedule.description }}
{% endif %}
</div>
<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 %}

26
apps/school/templates/blocks/schedule.html
Unescape View File

@ -32,25 +32,23 @@
</div>
</div>
<div class="timing__cell">
<div class="timing__title">{{ school_schedule.title }}{% if current_live_lesson %},
<span class="bold">{{ current_live_lesson.title }}</span>
<div class="timing__title">{{ school_schedule.title }}
{% if current_live_lesson and current_live_lesson.title %}
, <span class="bold">{{ current_live_lesson.title }}</span>
{% endif %}
</div>
<div class="timing__content">
{% if live_lesson %}
{{ live_lesson.short_description }}
{% else %}
{{ school_schedule.description }}
{% endif %}
</div>
{% if current_live_lesson %}
<div class="timing__content">{{ current_live_lesson.short_description }}</div>
{% endif %}
<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 %}

17
apps/school/templates/school/schedules_print.html
Unescape View File

@ -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 %}">
@ -45,17 +45,16 @@
<span class="bold">{{ current_live_lesson.title }}</span>
{% endif %}
</div>
{% if current_live_lesson %}
<div class="timing__content">{{ current_live_lesson.short_description }}</div>
{% endif %}
<div class="timing__content">
{% if live_lesson %}
{{ live_lesson.short_description }}
{% else %}
{{ school_schedule.description }}
{% endif %}
</div>
<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" style="flex: 0 0 100%;">
<div class="timing__text">
{{ school_schedule.materials }}

2
project/templates/lilcity/index.html
Unescape View File

@ -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"]');

20
web/src/sass/_common.sass
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save