Przeglądaj źródła

bug fix agenda + salles

kevin tessier 5 lat temu
rodzic
commit
2571b59324

Plik diff jest za duży
+ 21 - 10
user/themes/lecampus/css-compiled/theme.css


Plik diff jest za duży
+ 0 - 0
user/themes/lecampus/css-compiled/theme.min.css


+ 75 - 0
user/themes/lecampus/images/arrow-gal-next.svg

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="30"
+   height="30"
+   viewBox="0 0 7.9374998 7.9375002"
+   version="1.1"
+   id="svg2346"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14"
+   sodipodi:docname="arrow-gal-next.svg">
+  <defs
+     id="defs2340" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="7.9559499"
+     inkscape:cy="15.740667"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1029"
+     inkscape:window-x="0"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata2343">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-289.06249)">
+    <circle
+       style="opacity:0.6;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.60444033;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path820"
+       cx="3.96875"
+       cy="293.03125"
+       r="3.96875" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.38952681;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 2.6027268,290.7069 2.6396778,2.25348 -2.6396778,2.25349"
+       id="path731-2"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/maud/Documents/LE CAMPUS BIOVALLEE/3_SITE_WEB/TAF/GABARITS/export4/0_accueil.png"
+       inkscape:export-xdpi="150"
+       inkscape:export-ydpi="150"
+       sodipodi:nodetypes="ccc"
+       inkscape:transform-center-x="-0.16642708"
+       inkscape:transform-center-y="-0.047242975" />
+  </g>
+</svg>

+ 75 - 0
user/themes/lecampus/images/arrow-gal.svg

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="30"
+   height="30"
+   viewBox="0 0 7.9374998 7.9375002"
+   version="1.1"
+   id="svg2346"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14"
+   sodipodi:docname="arrow-gal.svg">
+  <defs
+     id="defs2340" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="7.9559499"
+     inkscape:cy="15.740667"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1029"
+     inkscape:window-x="0"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata2343">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-289.06249)">
+    <circle
+       style="opacity:0.6;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.60444033;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path820"
+       cx="3.96875"
+       cy="293.03125"
+       r="3.96875" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.38952681;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 4.83868,295.28474 2.1990022,293.03126 4.83868,290.77777"
+       id="path731-2"
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/home/maud/Documents/LE CAMPUS BIOVALLEE/3_SITE_WEB/TAF/GABARITS/export4/0_accueil.png"
+       inkscape:export-xdpi="150"
+       inkscape:export-ydpi="150"
+       sodipodi:nodetypes="ccc"
+       inkscape:transform-center-x="0.21367406"
+       inkscape:transform-center-y="0.07087054" />
+  </g>
+</svg>

+ 2 - 2
user/themes/lecampus/js/site.js

@@ -79,7 +79,6 @@ function slide() {
     responsive: true,
     mode: 'fade',
     captions: true,
-    pagerSelector: '',
     });
 
 }
@@ -146,6 +145,7 @@ function mapsalles() {
 
   $salles.on('click', function() {
     var idsalle = this.id;
+
     arrayid.push(idsalle);
     $salles.css("fill", "white");
     $(this).css("fill", "#0093a3");
@@ -156,8 +156,8 @@ function mapsalles() {
 
   var $close = $('.content_salle .header-salles img');
   $close.on('click', function () {
-    console.log('close');
     $(this).parents('.content_salle').css("visibility", "hidden");
+    $salles.css("fill", "white");
   })
 };
 

Plik diff jest za duży
+ 0 - 0
user/themes/lecampus/js/site.min.js


+ 21 - 6
user/themes/lecampus/scss/theme/_blog.scss

@@ -860,17 +860,22 @@
   .body-wrapper{
     background-image: url('../images/Trame-gris.svg');
     background-repeat: no-repeat;
-
   }
   .content{
     @include inlineflex;
     width: 90%;
     flex-direction: row-reverse;
     justify-content: space-between;
-    & > p{
+    .txt{
+      width: 50%;
+      .content_txt{
+        width: 50%;
+      }
+      & > p{
         font-size: 1.2rem;
         font-family: $Bold;
       }
+    }
   }
   svg{
       pointer-events: none;
@@ -907,9 +912,7 @@
       }
     }
   }
-  .txt{
-    width: 30%;
-  }
+
   .content_salle{
     // display: none;
     visibility: hidden;
@@ -946,7 +949,19 @@
       bottom: 10px!important;
     }
     .bx-controls-direction{
-      display: none;
+      a{
+        background-size: cover;
+        background-repeat: no-repeat;
+      }
+      .bx-prev{
+        background-image: url('/user/themes/lecampus/images/arrow-gal.svg');
+      }
+      .bx-next{
+        background-image: url('/user/themes/lecampus/images/arrow-gal-next.svg');
+        &:hover, &:focus{
+          background-position: center!important;
+        }
+      }
     }
     .bx-pager-link {
       background: white!important;

+ 29 - 14
user/themes/lecampus/scss/theme/_mobile.scss

@@ -232,6 +232,16 @@
       width: 2%!important;
     }
   }
+  .bandeau{
+    .img{
+      width: 100%!important;
+    }
+    .title_gal{
+      top:25vw!important;
+      right: 5%!important;
+      max-width: 70%!important;
+    }
+  }
   .entete .entete_c{
     width: 95%!important;
     margin: 30px auto!important;
@@ -253,7 +263,7 @@
       border-radius: 0px!important;
       h4{
         font-size: 1.3rem!important;
-        margin: 15px auto!important;
+        margin: 15px auto 0 auto!important;
         -webkit-transform: translateY(0%)!important;
                 transform: translateY(0%)!important;
       }
@@ -287,16 +297,32 @@
   #sublog{
     .txt{
       width:100%!important;
+      .content_txt{
+        width: 100%!important;
+      }
       p{
         padding: 0!important;
       }
     }
     .content_salle{
+      width: 70%!important;
       z-index: 2;
-      left: 60%!important;
+      left: 50%!important;
+      transform: translateX(-50%);
+      .header-salles{
+        display: inline-flex;
+        justify-content: space-between;
+        img{
+          display: block!important;
+          margin: auto;
+          width: 20px;
+          height: 20px;
+          cursor: pointer;
+        }
+      }
     }
     .mapsalles{
-      width: 60%!important;
+      width: 100%!important;
     }
   }
   #item .demander-votre-devis, #sublog .demander-votre-devis{
@@ -502,18 +528,7 @@
     }
     .content_salle{
       width: 90%!important;
-      left: 5%!important;
       top: 200px!important;
-      .header-salles{
-        display: inline-flex;
-        justify-content: space-between;
-        img{
-          display: block!important;
-          margin: auto;
-          width: 20px;
-          height: 20px;
-        }
-      }
       p{
         padding: 0px 10px!important;
       }

+ 3 - 1
user/themes/lecampus/templates/sublog.html.twig

@@ -14,7 +14,9 @@
     <section class="body-wrapper">
       <div class="content">
         <div class="txt">
-          {{content}}
+          <div class="content_txt">
+            {{content}}
+          </div>
         </div>
         <div class="mapsalles">
           <div class="contour">

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików