wait #6375 @0.25

diff --git a/style/100-global.sass b/style/100-global.sass
index d43ebe07f95fa4ec640993a767a42dfe03d541c0..e27198980cbd2fc7b6bf2e4539b5a8f206bfa6fc 100644 (file)
--- a/style/100-global.sass
+++ b/style/100-global.sass
@@ -266,28 +266,6 @@ body
     height: 100%
     pointer-events: none
 
-    &[data-bg-type="standard"]
-        height: 160px
-
-        .m &
-            height: 20%
-
-    &[data-bg-type="draganddropArea1"], &[data-bg-type="draganddropArea2"]
-        width: 260px
-        .m &
-            width: 100%
-            left: 0
-            right: auto
-
-    &[data-bg-type="draganddropArea2"]
-        left: auto
-        right: 0
-
-        .m &
-            top: auto
-            bottom: 0
-
-
     img
         width: 100%
         height: 100%

diff --git a/views/screens/question_draganddrop.blade.php b/views/screens/question_draganddrop.blade.php
index dd857a7b0e48395874ddb9b5b2e458a0d55ee61c..90d07f4bf5dc5adbb8297e4d30b6addbb45c0e6d 100644 (file)
--- a/views/screens/question_draganddrop.blade.php
+++ b/views/screens/question_draganddrop.blade.php
@@ -1,4 +1,5 @@
 <div class="container-screen none question-draganddrop" data-type="draganddrop" data-screen="q-{{$position}}">
+    @include('components.background',['data'=>$data,'name'=>'draganddrop','fit'=>'fill'])
     @include('screens.question_draganddrop_area',['data'=>$data,'area'=>1,'question'=>$question,'theme'=>$theme])
     <div class="fill-area area1"></div>
     <div class="fill-area area2"></div>

diff --git a/views/screens/question_draganddrop_area.blade.php b/views/screens/question_draganddrop_area.blade.php
index 4ac8dad51a1298d2ed5b41c8f57d733bddc29c76..a1e332e68c500f3d53e3a59404837c6ce7f23fc5 100644 (file)
--- a/views/screens/question_draganddrop_area.blade.php
+++ b/views/screens/question_draganddrop_area.blade.php
@@ -1,5 +1,4 @@
 <div class="screen-image zone-{{$area}} notDrag" data-zone="zone-{{$area}}">
-    @include('components.background',['data'=>$data,'name'=>'draganddropArea'.$area,'fit'=>'fill'])
     <div class="zone-content">
         <div class="text">
             <h2>{{ $question['area_'.$area]['title'] }}</h2>