wip #6336 @0.25

diff --git a/style/100-global.sass b/style/100-global.sass
index d597543189cc461f1208396ddea4bd4315f4fd70..c4aa2fb97e64869d158e2967d4a5fc637796fbec 100644 (file)
--- a/style/100-global.sass
+++ b/style/100-global.sass
@@ -272,6 +272,22 @@ body
         .m &
             height: 20%
 
+    &[data-bg-type="draganddropArea1"], &[data-bg-type="draganddropArea2"]
+        width: 260px
+
+        .m &
+            height: 25%
+
+    &[data-bg-type="draganddropArea2"]
+        left: auto
+        right: 0
+
+        .m &
+            left: 0
+            right: auto
+            top: auto
+            bottom: 0
+
 
     img
         width: 100%

diff --git a/style/106-question-draganddrop.sass b/style/106-question-draganddrop.sass
index 584f9cf29db13c31f5daa018259d1bacbe9268b8..8c7f5f3e0a8a701f1b8bf625fd9ea74a0b25fce3 100644 (file)
--- a/style/106-question-draganddrop.sass
+++ b/style/106-question-draganddrop.sass
@@ -1,8 +1,7 @@
 [data-type="draganddrop"]
-
     .fill-area
         background-color: $standard-fill-area
-        width: 120px
+        width: 260px
         height: 100%
 
         &.area2

diff --git a/views/screens/question_draganddrop.blade.php b/views/screens/question_draganddrop.blade.php
index 8243185faaad7518016450a47a5dfd21e5154e34..33c8001f9079d9bdbc86a35622f35ebac30894fb 100644 (file)
--- a/views/screens/question_draganddrop.blade.php
+++ b/views/screens/question_draganddrop.blade.php
@@ -1,5 +1,7 @@
 <div class="container-screen none question-draganddrop" data-type="draganddrop" data-screen="q-{{$position}}">
     @include('screens.question_draganddrop_area',['area'=>1,'question'=>$question,'theme'=>$theme])
+    <div class="fill-area area1"></div>
+    <div class="fill-area area2"></div>
     @include('header_question', ['question' => $question, 'data' => $data, 'max' => $max, 'position' => $position])
     <div class="vertical-center-screen-relative">
         <div class="screen question-draganddrop">

diff --git a/views/screens/question_draganddrop_area.blade.php b/views/screens/question_draganddrop_area.blade.php
index 5271aa90c848b263ac1917687347f350b4926d06..4ac8dad51a1298d2ed5b41c8f57d733bddc29c76 100644 (file)
--- a/views/screens/question_draganddrop_area.blade.php
+++ b/views/screens/question_draganddrop_area.blade.php
@@ -1,12 +1,5 @@
-@php
-    $desktopImageKey='draganddropArea'.$area.'Image';
-    $mobileImageKey='draganddropArea'.$area.'ImageMobile';
-@endphp
 <div class="screen-image zone-{{$area}} notDrag" data-zone="zone-{{$area}}">
-    <div class="fill-area area1"></div>
-    <div class="fill-area area2"></div>
-    <img src="{{$theme->$desktopImageKey}}"/>
-    <img class="mobile" src="{{$theme->$mobileImageKey}}"/>
+    @include('components.background',['data'=>$data,'name'=>'draganddropArea'.$area,'fit'=>'fill'])
     <div class="zone-content">
         <div class="text">
             <h2>{{ $question['area_'.$area]['title'] }}</h2>