Browse Source

Merge branch 'prod' of gogs-figureslibres.io:ouidade/dev-epau.archi.fr into prod

bach 3 years ago
parent
commit
06d957c018

File diff suppressed because it is too large
+ 10 - 12
user/themes/epau-antimatter/css-compiled/template.css


+ 19 - 17
user/themes/epau-antimatter/scss/template/_custom.scss

@@ -38,9 +38,8 @@
   padding-left: 2rem;
   padding-right: 2rem;
   img {
-    @include transform(scale(0.85));
-    @extend .default-animation;
-
+    @include transform(scale(0.75));
+	  @extend .default-animation;
   }
 
 }
@@ -83,7 +82,7 @@
   position: relative;
   display: flex;
   flex-direction: row;
-  @include transform(scale(0.75));
+  // @include transform(scale(0.75));
   // &.active {
   //   a:after {
   //     top: 0;
@@ -129,7 +128,10 @@
     position: absolute;
     left: -2rem;
   }
-
+  #logo img {
+    height: 3rem;
+    margin-left: 1rem;
+  }
 }
 
 @media (max-width: 1024px) {
@@ -719,15 +721,15 @@
 
 
 #new-footer {
-  // position:absolute;
+  position:absolute;
   display: flex;
   flex-direction: column;
 
   .tothetop {
-    position: absolute;
+    position: relative;
     // align-self: center;
     height: 1rem;
-    bottom: $footer-height + 10rem;
+    bottom: 3rem;
 		text-align: center;
 		left: 0;
 		right: 0;
@@ -817,14 +819,14 @@
         }
       }
     }
-    .tothetop {
-      bottom: $footer-height + 31rem;
-    }
+    // .tothetop {
+    //   bottom: $footer-height + 28rem;
+    // }
   }
   @media (max-width: 768px) {
-    .tothetop {
-      bottom: $footer-height + 10rem !important;
-    }
+    // .tothetop {
+    //   bottom: $footer-height + 10rem;
+    // }
   }
 
   @media (max-width: 1024px) {
@@ -844,9 +846,9 @@
         }
       }
     }
-    .tothetop {
-      bottom: $footer-height + 8rem;
-    }
+    // .tothetop {
+    //   bottom: $footer-height + 11rem;
+    // }
 
   }
 

Some files were not shown because too many files changed in this diff