]> _ Git - fluidbook-toolbox.git/commitdiff
projects / fluidbook-toolbox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 338ce13)
wip #6182 footer, css page intro
authorsoufiane <soufiane@cubedesigners.com>
Fri, 28 Jul 2023 15:19:36 +0000 (17:19 +0200)
committersoufiane <soufiane@cubedesigners.com>
Fri, 28 Jul 2023 15:19:36 +0000 (17:19 +0200)
resources/quizv2/style/100-global.sass patch | blob | history
resources/quizv2/style/101-header-footer.sass [new file with mode: 0644] patch | blob
resources/quizv2/style/101-header.sass [deleted file] patch | blob | history
resources/quizv2/style/style.sass patch | blob | history
resources/views/quizv2/footer.blade.php [new file with mode: 0644] patch | blob
resources/views/quizv2/index.blade.php patch | blob | history
resources/views/quizv2/screens/intro.blade.php patch | blob | history

diff --git a/resources/quizv2/style/100-global.sass b/resources/quizv2/style/100-global.sass
index 376432f9578e4e401e8ec36841a5ea37d8b63dda..4dcff0b1cf9fa5a93d23e32b23582706d1cb54cb 100644 (file)
--- a/resources/quizv2/style/100-global.sass
+++ b/resources/quizv2/style/100-global.sass
@@ -6,9 +6,16 @@ body
 [data-icon] svg
     height: 20px
 
+.container
+    +flex-config(center,false,false,center)
+    min-height: 100vh
+
 #quiz
+    width: 100%
     max-width: 1200px
+    min-height: 680px
     margin: 0 auto
+    padding: 0 24px 24px
 
 .radius
     border-radius: 16px
@@ -20,7 +27,10 @@ body
     border: none
     cursor: pointer
     display: inline-block
+    @extend .radius
     &.primary
         background: radial-gradient(at 16% 7px, rgba(255,102,186,1) 0%, rgba(208,22,124,1) 91%)
-    //&.secondary
+    &.secondary
 
+    .access
+        @extend .radius
diff --git a/resources/quizv2/style/101-header-footer.sass b/resources/quizv2/style/101-header-footer.sass
new file mode 100644 (file)
index 0000000..c423942
--- /dev/null
+++ b/resources/quizv2/style/101-header-footer.sass
@@ -0,0 +1,11 @@
+#title
+    height: 80px
+    +flex-config(space-between,false,row,center)
+#logo
+    height: 40px
+
+
+#footer
+    position: absolute
+    bottom: 24px
+    +flex-config(space-between,false,row,center)
diff --git a/resources/quizv2/style/101-header.sass b/resources/quizv2/style/101-header.sass
deleted file mode 100644 (file)
index ed22c30..0000000
--- a/resources/quizv2/style/101-header.sass
+++ /dev/null
@@ -1,5 +0,0 @@
-#title
-    height: 80px
-    +flex-config(space-between,false,row,center)
-#logo
-    height: 40px
diff --git a/resources/quizv2/style/style.sass b/resources/quizv2/style/style.sass
index b621654e9ddbe1a60c7cb7f98a116d328fc41974..b40d11bcca5455f170cc583f7f0a4253bd4fb983 100644 (file)
--- a/resources/quizv2/style/style.sass
+++ b/resources/quizv2/style/style.sass
@@ -4,5 +4,5 @@
 @import 004-mixins
 
 @import 100-global
-@import 101-header
+@import 101-header-footer
 @import 102-intro
diff --git a/resources/views/quizv2/footer.blade.php b/resources/views/quizv2/footer.blade.php
new file mode 100644 (file)
index 0000000..5729547
--- /dev/null
+++ b/resources/views/quizv2/footer.blade.php
@@ -0,0 +1,19 @@
+<footer id="footer">
+    @if($reset)
+        <a class="btn secondary">
+            Reset
+            <span class="access">R</span>
+        </a>
+    @endif
+    <a class="btn primary">
+        {{$data->intro_button}}
+        <span class="access">space</span>
+        <span data-icon="running-man"></span>
+    </a>
+    @if($info)
+        <a class="btn secondary">
+            More infos
+            <span class="access">F1</span>
+        </a>
+    @endif
+</footer>
diff --git a/resources/views/quizv2/index.blade.php b/resources/views/quizv2/index.blade.php
index 582ca3c5d1b3ffc6f4321194ce315a710e920e17..9d0847ea5756d6a290d03aa33c0c7d666c9adada 100644 (file)
--- a/resources/views/quizv2/index.blade.php
+++ b/resources/views/quizv2/index.blade.php
@@ -11,10 +11,12 @@
 </head>
 <body>
 @include("quizv2.sprite")
-<div id="quiz">
-    @if($data->intro_enable)
-        @include('quizv2.screens.intro', ['data'=> $data])
-    @endif
+<div class="container">
+    <div id="quiz">
+        @if($data->intro_enable)
+            @include('quizv2.screens.intro', ['data'=> $data])
+        @endif
+    </div>
 </div>
 <div id="anim"></div>
 <script src="js/quiz.js"></script>
diff --git a/resources/views/quizv2/screens/intro.blade.php b/resources/views/quizv2/screens/intro.blade.php
index 97e9086c301bfb2f5ba9a06c5d0e11a583463e62..37cbf94a0f3bbe2a6df37cab39b30b45d648685e 100644 (file)
--- a/resources/views/quizv2/screens/intro.blade.php
+++ b/resources/views/quizv2/screens/intro.blade.php
@@ -2,5 +2,5 @@
 <div class="screen" id="welcome">
     <h2>{{$data->intro_title}}</h2>
     <p>{{$data->intro_text}}</p>
-    <a class="btn primary radius">{{$data->intro_button}} <span data-icon="running-man"></span></a>
 </div>
+@include('quizv2.footer', ['data', $data])
Unnamed repository; edit this file 'description' to name the repository.