Merge remote-tracking branch 'origin/mobile-master'

# Conflicts:
#	style/103-question-multiple.sass
#	views/screens/question_match.blade.php

diff --cc js/quiz.match.js
Simple merge

diff --cc style/103-question-multiple.sass
index 4d45151e6b54e8ddddd74e57a7e00145462c6401,8701f7c7260071de94a845d2d56e0741f5577ae9..a0df395a3defa72b6da17f41086792ac3789085e
--- 1/style/103-question-multiple.sass
--- 2/style/103-question-multiple.sass
+++ b/style/103-question-multiple.sass
@@@ -1,66 -1,49 +1,55 @@@
-     .screen.question-multiple
-         top: 45px
- 
-         +above(992px)
-             top: 93px
- 
-         .list
-             display: grid
-             grid-gap: 16px
-             grid-template-columns: repeat(2, 1fr)
- 
-             &-item
-                 opacity: 0
- 
-                 label
 +[data-type="multiple"]
 +
 +    .fill-area
 +        height: 160px
 +        background-color: $standard-fill-area
 +
+ .screen.question-multiple
+     top: 93px
+     .list
+         display: grid
+         grid-gap: 16px
+         grid-template-columns: repeat(2, 1fr)
+ 
+         &-item
+             opacity: 0
+             label
+                 width: 100%
+                 height: 58px
+                 @extend .radius
+                 +opacity(.80,background-color,$neutral-color)
+                 padding: 0 16px
+                 cursor: pointer
+                 border: 2px solid rgba($texts-color, .24)
+                 position: relative
+                 overflow: hidden
+                 display: flex
+                 &:after
+                     content: ""
                      width: 100%
-                     height: 58px
-                     @extend .radius
-                     +opacity(.80, background-color, $neutral-color)
-                     padding: 0 16px
-                     cursor: pointer
-                     border: 2px solid rgba($texts-color, .24)
-                     position: relative
-                     overflow: hidden
-                     display: flex
- 
-                     &:after
-                         content: ""
-                         width: 100%
-                         height: 100%
-                         position: absolute
-                         top: 0
-                         left: 0
-                         transition: background-color .1s ease-out
- 
-                     &.ok:after,
-                     &.missed:after
-                         //
-                         +opacity(.24, background-color, $ok-color)
- 
-                     *
-                         z-index: 1
- 
-                     .content
-                         opacity: 0
-                         width: 100%
-                         +flex-config(space-between, false, false, center)
- 
-                 input:checked + label
-                     border-color: $texts-color
-                     transition: border-color .1s ease-out
- 
-                     &:after
-                         +opacity(.16)
+                     height: 100%
+                     position: absolute
+                     top: 0
+                     left: 0
+                     transition: background-color .1s ease-out
+                 &.ok:after,
+                 &.missed:after
+                     //
+                     +opacity(.24,background-color,$ok-color)
+                 *
+                     z-index: 1
+                 .content
+                     opacity: 0
+                     width: 100%
+                     +flex-config(space-between,false,false,center)
  
-                     &.nok:after
-                         background: transparent
+             input:checked+label
+                 border-color: $texts-color
+                 transition: border-color .1s ease-out
+                 &:after
+                     +opacity(.16)
+                 &.nok:after
+                     background: transparent
  
  .m
      .screen.question-multiple

diff --cc style/107-question-match.sass
Simple merge

diff --cc views/screens/question_match.blade.php
index f2c5e4c4c61e154eacf86e3128f1d67576f7c492,52a52dd9b422d1fbf7f235353703f6a1cee3f859..c90f07498a4b9514b8d023834ff7e56e7f26e17d
--- 1/views/screens/question_match.blade.php
--- 2/views/screens/question_match.blade.php
+++ b/views/screens/question_match.blade.php
@@@ -33,8 -27,8 +33,8 @@@
          <div class="swiper-container bottom-slider">
              <div class="swiper-wrapper">
                  @foreach($propositions as $prop)
-                     <div class="swiper-slide" data-prop="{{$prop['n']}}">
 -                    <div class="swiper-slide not-visible">
 -                        {{ $prop }}
++                    <div class="swiper-slide not-visible" data-prop="{{$prop['n']}}">
 +                        {{ $prop['p'] }}
                      </div>
                  @endforeach
              </div>