diff --git a/web/app/themes/la_mine/asset/dist/index.js b/web/app/themes/la_mine/asset/dist/index.js index f6eeb000..70bf8c66 100644 --- a/web/app/themes/la_mine/asset/dist/index.js +++ b/web/app/themes/la_mine/asset/dist/index.js @@ -17,11 +17,6 @@ if (prive != null) { }) } -//ajout chloe drag -$( function() { - $( "#draggable" ).draggable(); -} ); - var slide_tpsF = document.querySelectorAll('.tpsF .slide'); if (slide_tpsF != null) { for (var i = 0; i < slide_tpsF.length; i++) { @@ -82,7 +77,15 @@ function isotope() { }); } +function drag(){ + $( '.group_drag' ).draggable({ + containment: "html", + scroll: false + }); +} + $( document ).ready(function() { paralax(); isotope(); + drag(); }); diff --git a/web/app/themes/la_mine/asset/dist/style.css b/web/app/themes/la_mine/asset/dist/style.css index e364cc27..4f6e8c29 100644 --- a/web/app/themes/la_mine/asset/dist/style.css +++ b/web/app/themes/la_mine/asset/dist/style.css @@ -196,28 +196,61 @@ header > .nav-wrapper{ background-position: center; /* Center the image */ background-repeat: no-repeat; /* Do not repeat the image */ background-size: contain; + transform: rotate(0deg); + } + .fond_burger:hover{ + transform: rotate(10deg); } .nav-main{ display: none; position: fixed; right: 0; top: 120px; + width: 280px; + height: 300px; background: white; + border: 4px solid black; + transition: all 0.2s ease; } .nav-main.is-active{ display: block; pointer-events: auto; } + #fl_menu{ + position:absolute; + z-index: 9999; + width: 30px; + height: auto; + right: 0; + } .menu-item { font-family: Millimetre, sans-serif; text-transform: uppercase; - text-align: right; + text-align: left; pointer-events: auto; + border-bottom: 4px solid black; + } + .menu-item a { + background-color: pink; + width: 100%; + display: block; } - #nav-main > ul > li > ul {display: none;} - #nav-main > ul > li:first-child:hover > ul {display: block; background-color: grey;} + #nav-main > ul > li > ul {display: none;text-transform: lowercase; border-bottom: none;} + #nav-main > ul > li:first-child > a::after{ + content: ""; + background-image: url('../images/fleche_menu.svg'); + background-repeat: no-repeat; + background-position: center; + + display: inline-block; + width: 20px; + height: 15px; + margin-left: 10px; + } + #nav-main > ul > li:first-child:hover > ul {display: block; background-color: #BDBDBD;transition: all 0.2s ease;} + #nav-main > ul > li:first-child:hover{background-color: #424242; color:white;border-bottom: none;} .menu-item a:hover { display: block; @@ -225,6 +258,7 @@ header > .nav-wrapper{ height: 100%; background-color: black; color: white; + transition: all 0.2s ease; } /* END BURGER */ /* END HEADER */ @@ -263,17 +297,21 @@ body > .content-wrapper{ background-color: white; border: 4px solid black; } - -.Btn, #Btn_asso { - margin-top: 10px; - color: black; - text-decoration: underline; - border: none; +.add_asso{ + display: block; + cursor: default!important; + margin: 30px auto 30px auto;; } -.Btn a:hover, #Btn_asso a:hover { - background-color: grey; +.add_asso a { + padding: 7px 10px; + background-color: white; + border: 4px solid black; + font-weight: bold; +} +.add_asso a:hover { + color: white; + background-color: black; } - .flickity-button { background: transparent; } @@ -281,6 +319,7 @@ body > .content-wrapper{ width: 100px; height: 100px; } + .flickity-button-icon { fill: white; } @@ -290,7 +329,8 @@ body > .content-wrapper{ .flickity-prev-next-button:hover { background: transparent; } -.flickity-button:disabled { + +footer .flickity-prev-next-button:disabled { display: none; } footer .flickity-prev-next-button{ @@ -299,7 +339,9 @@ footer .flickity-prev-next-button{ } footer .flickity-button-icon { fill: grey; + left: 158%!important; } + /* END BUTTON */ @@ -332,12 +374,58 @@ footer .flickity-button-icon { height: calc(100% - 80px); } /*ajout chloe drag*/ - #draggable { - width: 150px; - height: 150px; - background-color: red; - padding: 0.5em; + .group_drag { + z-index: 9999; + width: 200px; + height: auto; + } + + #drag_1 { + position:absolute; + top:175px; + left: 645px; } + #drag_2 { + position:absolute; + top: 265px; + left: 318px; + } + #drag_3 { + position:absolute; + top:630px; + left: 790px; + } + #drag_4 { + position:absolute; + top:385px; + left: 616px; + } + #drag_5 { + position:absolute; + top:255px; + left: 981px; + } + #drag_6 { + position:absolute; + top:280px; + left: -69px; + } + #drag_7 { + position:absolute; + top:555px; + left: 340px; + } + #drag_8 { + position:absolute; + top:420px; + left: 945px; + } + #drag_9 { + position:absolute; + top:515px; + left: 40px; + } + /*fin ajout chloe drag*/ .section_accueil#section_tpsF .titre, @@ -1050,6 +1138,18 @@ body.les-temps-forts .titre_page { margin-top: 30px; } } + @media only screen and (max-width : 320px) { + /* Smartphone */ + /*footer*/ + .accueil .collecte, .accueil .adresse, .accueil .horaires { + display: block; + } + .collecte, .horaires { + display:none; + } + + /*fin footer*/ +} @media screen and (max-width : 768px){ article .__img_event{ @@ -1090,9 +1190,9 @@ footer > section{ margin-bottom: 20px; } footer .logo_lamine { - width: 100px; + max-width: 150px; height: auto; - /* margin: 10px; */ + margin: 10px; } footer .logo_lamine a{ @@ -1114,24 +1214,41 @@ footer .reseaux_sociaux img { object-fit: contain; } /* START Mailchimp */ - footer #mc_embed_signup label{ - margin: 0; - padding: 0; - } - footer #mc_embed_signup_scroll label{ - margin-right: 10px; - white-space: nowrap; + footer #mc_embed_signup label, footer #mc-embedded-subscribe{ + padding: 7px 10px; + background-color: white; + border: 4px solid black; + } + + footer .email{ + width: 100%; + padding: 7px 10px; + background-color: #D8D8D8; + border-bottom: 4px solid black; + border-top: 4px solid black; + border-left: none; + border-right: none; + } + + footer #mc_embed_signup_scroll label{ + white-space: nowrap; + font-weight: bold; } footer #mc_embed_signup_scroll input{ width: 100%; } + footer #mc-embedded-subscribe:hover{ + color: white; + background-color: black; + } /* END MAILCHIMP */ /* START SLIDE */ footer .partenaires ._titre{ white-space: nowrap; - margin-right: 10px; + font-weight: bold; + margin: auto 50px auto 0px; } footer .partenaires{ diff --git a/web/app/themes/la_mine/asset/images/fleche_menu.svg b/web/app/themes/la_mine/asset/images/fleche_menu.svg new file mode 100644 index 00000000..c8ed3041 --- /dev/null +++ b/web/app/themes/la_mine/asset/images/fleche_menu.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/web/app/themes/la_mine/asset/images/objet_drag_1.svg b/web/app/themes/la_mine/asset/images/objet_drag_1.svg index e290809d..b4ae8b2f 100644 --- a/web/app/themes/la_mine/asset/images/objet_drag_1.svg +++ b/web/app/themes/la_mine/asset/images/objet_drag_1.svg @@ -40,325 +40,48 @@ inkscape:window-height="869" id="namedview8" showgrid="false" - inkscape:zoom="0.23393158" - inkscape:cx="996.1648" - inkscape:cy="504.42099" + inkscape:zoom="0.33082922" + inkscape:cx="555.41738" + inkscape:cy="492.29994" inkscape:window-x="2786" inkscape:window-y="45" inkscape:window-maximized="0" inkscape:current-layer="svg6" /> - - - - - - - - - - - - - - - E - - - s - - - p - - - a - - - c - - - e - - - C - - - o - - - - - - - w - - - o - - - r - - - k - - - i - - - n - - - g - - - W - - - i - - - f - - - i - - - g - - - r - - - a - - - t - - - u - - - i - - - t - - - - - - + + ESPACECO-WORKINGWIFI GRATUIT diff --git a/web/app/themes/la_mine/asset/images/objet_drag_2.svg b/web/app/themes/la_mine/asset/images/objet_drag_2.svg index 7c4d321e..7cacbed9 100644 --- a/web/app/themes/la_mine/asset/images/objet_drag_2.svg +++ b/web/app/themes/la_mine/asset/images/objet_drag_2.svg @@ -41,33 +41,30 @@ id="namedview8" showgrid="false" inkscape:zoom="0.33082922" - inkscape:cx="851.82494" - inkscape:cy="80.904051" + inkscape:cx="552.94284" + inkscape:cy="742.06278" inkscape:window-x="2786" inkscape:window-y="45" inkscape:window-maximized="0" inkscape:current-layer="svg6" /> - - - Fab Lab - + + FAB LAB diff --git a/web/app/themes/la_mine/asset/images/objet_drag_3.svg b/web/app/themes/la_mine/asset/images/objet_drag_3.svg index 1b58cf8d..3ef42ed0 100644 --- a/web/app/themes/la_mine/asset/images/objet_drag_3.svg +++ b/web/app/themes/la_mine/asset/images/objet_drag_3.svg @@ -41,189 +41,180 @@ id="namedview8" showgrid="false" inkscape:zoom="0.33082922" - inkscape:cx="798.92756" - inkscape:cy="80.904051" + inkscape:cx="679.53061" + inkscape:cy="597.78705" inkscape:window-x="2786" inkscape:window-y="45" inkscape:window-maximized="0" inkscape:current-layer="svg6" /> + transform="matrix(3.4496658,2.2182117,2.2182117,-3.4496658,-2698.4239,3600.34)" + id="g1034" + style="fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-opacity:1"> + transform="matrix(0.97488,0.22274,-0.22274,0.97488,122.87875,1077.9731)" + id="g1036" + style="fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-opacity:1"> - - - - - - + + + + + + + id="g1048"> - - + + - - B - - - A - - - R - - - A - - - S - - - S - - - O - - - C - - - I - - - A - - - T - - - I - - - F - - - + id="tspan1052" + y="0" + x="0">B + + + A + + + R + + + A + + + S + + + S + + + O + + + C + + + I + + + A + + + T + + + I + + + F + diff --git a/web/app/themes/la_mine/asset/images/objet_drag_4.svg b/web/app/themes/la_mine/asset/images/objet_drag_4.svg index 3a0e503a..daa6680f 100644 --- a/web/app/themes/la_mine/asset/images/objet_drag_4.svg +++ b/web/app/themes/la_mine/asset/images/objet_drag_4.svg @@ -40,44 +40,40 @@ inkscape:window-height="869" id="namedview8" showgrid="false" - inkscape:zoom="0.46786317" - inkscape:cx="570.18795" - inkscape:cy="532.33754" + inkscape:zoom="0.33082922" + inkscape:cx="525.98762" + inkscape:cy="958.93147" inkscape:window-x="2786" inkscape:window-y="45" inkscape:window-maximized="0" - inkscape:current-layer="g5020" /> + inkscape:current-layer="svg6" /> + - + style="fill:#000002;fill-opacity:1" + transform="matrix(3.4496658,2.2182117,2.2182117,-3.4496658,-2698.4239,3600.34)" + id="g1044"> - - - ATELIERS + style="fill:#000002;fill-opacity:1" + transform="matrix(0.98133,0.19232,-0.19232,0.98133,148.06539,1066.1704)" + id="g1046" /> + ATELIERS diff --git a/web/app/themes/la_mine/asset/images/objet_drag_5.svg b/web/app/themes/la_mine/asset/images/objet_drag_5.svg index 643e36b1..2308a4c9 100644 --- a/web/app/themes/la_mine/asset/images/objet_drag_5.svg +++ b/web/app/themes/la_mine/asset/images/objet_drag_5.svg @@ -12,7 +12,8 @@ version="1.1" id="svg6" sodipodi:docname="objet_drag_5.svg" - inkscape:version="0.92.4 5da689c313, 2019-01-14"> + inkscape:version="0.92.4 5da689c313, 2019-01-14" + enable-background="new"> @@ -26,7 +27,18 @@ + id="defs10"> + + + + - - + + RESSOURCERIE + x="57.896194" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.1336813px;line-height:1.25;font-family:'Universalis ADF Std';-inkscape-font-specification:'Universalis ADF Std, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.43573296" + xml:space="preserve">RESSOURCERIE + diff --git a/web/app/themes/la_mine/asset/images/objet_drag_6.svg b/web/app/themes/la_mine/asset/images/objet_drag_6.svg index bf7784d8..d5ac3429 100644 --- a/web/app/themes/la_mine/asset/images/objet_drag_6.svg +++ b/web/app/themes/la_mine/asset/images/objet_drag_6.svg @@ -41,7 +41,7 @@ id="namedview8" showgrid="false" inkscape:zoom="0.33082922" - inkscape:cx="706.8714" + inkscape:cx="-3.4648877" inkscape:cy="299.91924" inkscape:window-x="2786" inkscape:window-y="45" @@ -52,7 +52,7 @@ id="g5020"> diff --git a/web/app/themes/la_mine/asset/images/objet_drag_8.svg b/web/app/themes/la_mine/asset/images/objet_drag_8.svg index a8572155..d2d359c0 100644 --- a/web/app/themes/la_mine/asset/images/objet_drag_8.svg +++ b/web/app/themes/la_mine/asset/images/objet_drag_8.svg @@ -41,7 +41,7 @@ id="namedview8" showgrid="false" inkscape:zoom="0.33082922" - inkscape:cx="728.03035" + inkscape:cx="17.694062" inkscape:cy="381.53235" inkscape:window-x="2786" inkscape:window-y="45" @@ -51,7 +51,7 @@ transform="matrix(18.091825,0,0,18.091825,-6978.8339,11151.482)" id="g5020"> {% include "menu.twig" with {'items': menu.get_items} %} +
{% endblock %} diff --git a/web/app/themes/la_mine/templates/footer.twig b/web/app/themes/la_mine/templates/footer.twig index 4fdd73e7..f2ada050 100644 --- a/web/app/themes/la_mine/templates/footer.twig +++ b/web/app/themes/la_mine/templates/footer.twig @@ -1,18 +1,18 @@
-
-
+
+
-
+
{{options.texte_horaire }}
-
+
{{options.texte_adresse }}
-
+
{{options.texte_collecte }}
@@ -44,7 +44,7 @@
- + diff --git a/web/app/themes/la_mine/templates/html-header.twig b/web/app/themes/la_mine/templates/html-header.twig index a82179c5..32615ae6 100644 --- a/web/app/themes/la_mine/templates/html-header.twig +++ b/web/app/themes/la_mine/templates/html-header.twig @@ -13,7 +13,7 @@ {#ajout chloe drag#} - + {# BOOTSTRAP #} diff --git a/web/app/themes/la_mine/templates/partial/section_projets.twig b/web/app/themes/la_mine/templates/partial/section_projets.twig index 63ec12f6..730c4347 100644 --- a/web/app/themes/la_mine/templates/partial/section_projets.twig +++ b/web/app/themes/la_mine/templates/partial/section_projets.twig @@ -4,7 +4,34 @@
-
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
{% for item in projet %}