From e86466c97dfd23580f59fb649acf0a789d7ce13b Mon Sep 17 00:00:00 2001 From: chloe Date: Fri, 29 May 2020 16:14:53 +0200 Subject: [PATCH 1/3] =?UTF-8?q?d=C3=A9but=20bootstrap=20pour=20le=20footer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/app/themes/la_mine/asset/dist/style.css | 11 ++++++ web/app/themes/la_mine/templates/accueil.twig | 2 - web/app/themes/la_mine/templates/base.twig | 10 ++--- web/app/themes/la_mine/templates/footer.twig | 39 +++++++++++++------ .../themes/la_mine/templates/html-header.twig | 2 + 5 files changed, 45 insertions(+), 19 deletions(-) create mode 100644 web/app/themes/la_mine/asset/dist/style.css diff --git a/web/app/themes/la_mine/asset/dist/style.css b/web/app/themes/la_mine/asset/dist/style.css new file mode 100644 index 00000000..695e6197 --- /dev/null +++ b/web/app/themes/la_mine/asset/dist/style.css @@ -0,0 +1,11 @@ +img{ + width: 100%; + height: auto; +} +footer img{ + width: 50px; + height: auto; +} +footer li { + list-style-type:none; +} diff --git a/web/app/themes/la_mine/templates/accueil.twig b/web/app/themes/la_mine/templates/accueil.twig index da10471b..ef884da5 100644 --- a/web/app/themes/la_mine/templates/accueil.twig +++ b/web/app/themes/la_mine/templates/accueil.twig @@ -98,6 +98,4 @@ -{% include 'footer.twig' %} - {% endblock %} diff --git a/web/app/themes/la_mine/templates/base.twig b/web/app/themes/la_mine/templates/base.twig index 7aa967ac..704dca3a 100644 --- a/web/app/themes/la_mine/templates/base.twig +++ b/web/app/themes/la_mine/templates/base.twig @@ -6,20 +6,20 @@ {% endblock %} - + -
+
{% block header %}

{#{{site.name}}#} {{site.name}}

-
+ {% endblock %}
diff --git a/web/app/themes/la_mine/templates/footer.twig b/web/app/themes/la_mine/templates/footer.twig index 89e58f5c..4558e9d4 100644 --- a/web/app/themes/la_mine/templates/footer.twig +++ b/web/app/themes/la_mine/templates/footer.twig @@ -1,30 +1,45 @@
-
- +
+
+
-
+ +

{{options.texte_adresse }}

+

{{options.texte_collecte }}

+ +
+

{{options.instagram.texte_instagram}}

+
-
+
+

{{options.texte_horaire }}

-
-
-

{{options.titre}}

-
- {% for partner in options.partenaire %} - - {% endfor %} + +
+
{{options.titre}}
+
+
+
+ {% for partner in options.partenaire %} +
+ {% endfor %} +
+
+
+ +
diff --git a/web/app/themes/la_mine/templates/html-header.twig b/web/app/themes/la_mine/templates/html-header.twig index 8489be60..22c06e16 100644 --- a/web/app/themes/la_mine/templates/html-header.twig +++ b/web/app/themes/la_mine/templates/html-header.twig @@ -15,4 +15,6 @@ {# BOOTSTRAP #} + + {{function('wp_head')}} From e33f873e85947a26610d462a6fd4ffc9abc07022 Mon Sep 17 00:00:00 2001 From: chloe Date: Wed, 3 Jun 2020 18:01:53 +0200 Subject: [PATCH 2/3] =?UTF-8?q?g=C3=A9rer=20les=20blocs=20bootstrap=20dans?= =?UTF-8?q?=20privatiser,=20collecte,=20b=C3=A9n=C3=A9vole?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/app/themes/la_mine/asset/dist/style.css | 24 +++++++++++++++++++ .../themes/la_mine/templates/association.twig | 10 ++++---- .../templates/components/sider_left.twig | 2 +- web/app/themes/la_mine/templates/footer.twig | 17 ++++++------- .../la_mine/templates/la_benevole_zone.twig | 6 ++--- .../themes/la_mine/templates/la_collecte.twig | 6 ++--- .../la_mine/templates/privatiser_lespace.twig | 20 +++++++--------- 7 files changed, 54 insertions(+), 31 deletions(-) diff --git a/web/app/themes/la_mine/asset/dist/style.css b/web/app/themes/la_mine/asset/dist/style.css index 695e6197..e25b26c8 100644 --- a/web/app/themes/la_mine/asset/dist/style.css +++ b/web/app/themes/la_mine/asset/dist/style.css @@ -2,6 +2,12 @@ img{ width: 100%; height: auto; } + +iframe{ + width: 100%; + height: auto; +} + footer img{ width: 50px; height: auto; @@ -9,3 +15,21 @@ footer img{ footer li { list-style-type:none; } + +.sidebar_left { + background-color: pink; +} +.tableau_engagements { + background-color: green; +} +.tableau_engagements div{ + background-color: red; +} + +/* .tableau_engagements > div{ + display: inline-block; +} */ +.legendes{ + background-color: pink; + position : absolute; +} diff --git a/web/app/themes/la_mine/templates/association.twig b/web/app/themes/la_mine/templates/association.twig index 8df0286f..77220c5d 100644 --- a/web/app/themes/la_mine/templates/association.twig +++ b/web/app/themes/la_mine/templates/association.twig @@ -3,12 +3,12 @@ {% block content %} {% include 'components/title_page.twig' %} -
-