Parcourir la source

Merge branch 'master' into projectlocal

tremble il y a 2 ans
Parent
commit
6a1988c04d
2 fichiers modifiés avec 24 ajouts et 6 suppressions
  1. 16 5
      src/assets/base.css
  2. 8 1
      src/views/Home.vue

+ 16 - 5
src/assets/base.css

@@ -1,15 +1,26 @@
-.viewer-title{
+.viewer-title {
   display: none !important;
 }
-.viewer-prev{
+
+.viewer-prev {
   display: none !important;
 }
-.viewer-next{
+
+.viewer-next {
   display: none !important;
 }
-.viewer-navbar{
+
+.viewer-navbar {
   display: none !important;
 }
-.viewer-close{
+
+.viewer-close {
   display: none !important;
 }
+
+@media screen and (max-width: 800px) {
+  .viewer-footer {
+    bottom: auto;
+    top: 10px;
+  }
+}

+ 8 - 1
src/views/Home.vue

@@ -319,6 +319,13 @@ export default {
   }
 
   .iconarr {
+<<<<<<< HEAD
+=======
+    z-index: 1999;
+    position: absolute;
+    right: 30px;
+    bottom: calc(20vh - 20px);
+>>>>>>> master
     list-style: none;
     display: flex;
     justify-content: flex-end;
@@ -426,7 +433,7 @@ export default {
       position: fixed;
       bottom: 10px;
       right: 0px;
-      z-index: 10000;
+      z-index: 1999;
       li {
         width: 70px;
       }