From e6c16af9ccece1cd17b2cf0d3e61b4485fb356fc Mon Sep 17 00:00:00 2001 From: Clayton Dewey Date: Fri, 7 Sep 2018 14:30:59 -0600 Subject: [PATCH 01/10] Make the whole top header fixed --- agaric/templates/layout/page.html.twig | 2 ++ .../layout/region--primary-menu.html.twig | 21 ------------------- 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 agaric/templates/layout/region--primary-menu.html.twig diff --git a/agaric/templates/layout/page.html.twig b/agaric/templates/layout/page.html.twig index 5e33349..4446b06 100644 --- a/agaric/templates/layout/page.html.twig +++ b/agaric/templates/layout/page.html.twig @@ -3,6 +3,7 @@ {% block navbar %} {% if page.navbar_branding or page.navbar_social or page.primary_menu %} {# Top navbar #} +
+
{% endif %} {% endblock navbar %} diff --git a/agaric/templates/layout/region--primary-menu.html.twig b/agaric/templates/layout/region--primary-menu.html.twig deleted file mode 100644 index 9cc776d..0000000 --- a/agaric/templates/layout/region--primary-menu.html.twig +++ /dev/null @@ -1,21 +0,0 @@ -{# -/** - * @file - * Default theme implementation to display a region. - * - * Available variables: - * - content: The content for this region, typically blocks. - * - attributes: HTML attributes for the region
. - * - region: The name of the region variable as defined in the theme's - * .info.yml file. - * - * @see template_preprocess_region() - * - * @ingroup themeable - */ -#} -{% if content %} -
- {{ content }} -
-{% endif %} From 4275c608ea5272d5e6e49a49c2f270b94a606735 Mon Sep 17 00:00:00 2001 From: Clayton Dewey Date: Fri, 7 Sep 2018 15:41:47 -0600 Subject: [PATCH 02/10] Add indentation to elements in div --- agaric/templates/layout/page.html.twig | 50 +++++++++++++------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/agaric/templates/layout/page.html.twig b/agaric/templates/layout/page.html.twig index 4446b06..c3c8a51 100644 --- a/agaric/templates/layout/page.html.twig +++ b/agaric/templates/layout/page.html.twig @@ -4,33 +4,33 @@ {% if page.navbar_branding or page.navbar_social or page.primary_menu %} {# Top navbar #}
- +
{% endif %} {% endblock navbar %} From dbdb3a9bce793a87e28b7048dc3956b1da4d1213 Mon Sep 17 00:00:00 2001 From: Clayton Dewey Date: Fri, 7 Sep 2018 15:43:58 -0600 Subject: [PATCH 03/10] Indentation, but properly --- agaric/templates/layout/page.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agaric/templates/layout/page.html.twig b/agaric/templates/layout/page.html.twig index c3c8a51..41141dd 100644 --- a/agaric/templates/layout/page.html.twig +++ b/agaric/templates/layout/page.html.twig @@ -30,7 +30,7 @@ {{ page.primary_menu }} {% endif %}
- + {% endif %} {% endblock navbar %} From 509dd6fe3ce6f0e79febb61a8e9de279b809457e Mon Sep 17 00:00:00 2001 From: Clayton Dewey Date: Fri, 7 Sep 2018 15:58:38 -0600 Subject: [PATCH 04/10] Add navbar classes specific to Agaric menu block --- .../block/block--system-menu-block--main.html.twig | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/agaric/templates/block/block--system-menu-block--main.html.twig b/agaric/templates/block/block--system-menu-block--main.html.twig index 14370a5..a71ce83 100644 --- a/agaric/templates/block/block--system-menu-block--main.html.twig +++ b/agaric/templates/block/block--system-menu-block--main.html.twig @@ -1,3 +1,10 @@ {% extends "@bulma/block/block--system-menu-block.html.twig" %} -{% set attributes = attributes.addClass('navbar-end') %} +{% + set classes = [ + 'navbar-end', + 'navbar', + ] +%} + +{% set attributes = attributes.addClass(classes) %} From af97d74f3a8ceebf3e62434005b14989428f3251 Mon Sep 17 00:00:00 2001 From: vagrant Date: Mon, 17 Sep 2018 03:16:28 +0000 Subject: [PATCH 05/10] Add transparent navbar class to header --- agaric/templates/layout/page.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agaric/templates/layout/page.html.twig b/agaric/templates/layout/page.html.twig index 41141dd..33323b3 100644 --- a/agaric/templates/layout/page.html.twig +++ b/agaric/templates/layout/page.html.twig @@ -4,7 +4,7 @@ {% if page.navbar_branding or page.navbar_social or page.primary_menu %} {# Top navbar #}
-
+ + + +{% endblock main %} +{% block bottom %} +{# Bottom second colored section #} +{% if page.bottom %} +
+
+ {{ page.bottom }} +
+
+{% endif %} +{% endblock bottom %} + +{% block footer %} +{% if page.footer %} +
+
+ {{ page.footer }} +
+
+{% endif %} +{% endblock footer %} + + + + + + From e9da2d89a520675a14cdceb2d701f66e0b490ff8 Mon Sep 17 00:00:00 2001 From: Clayton Dewey Date: Sun, 16 Sep 2018 22:07:16 -0600 Subject: [PATCH 07/10] Change to front page template --- .../layout/{page--node--15.html.twig => page--front.html.twig} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename agaric/templates/layout/{page--node--15.html.twig => page--front.html.twig} (100%) diff --git a/agaric/templates/layout/page--node--15.html.twig b/agaric/templates/layout/page--front.html.twig similarity index 100% rename from agaric/templates/layout/page--node--15.html.twig rename to agaric/templates/layout/page--front.html.twig From 9f673cf3f2f621fa24b18a62ae04c621fc314682 Mon Sep 17 00:00:00 2001 From: Clayton Dewey Date: Sun, 16 Sep 2018 22:12:05 -0600 Subject: [PATCH 08/10] Add is-2 class to site slogan --- agaric/templates/layout/page--front.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agaric/templates/layout/page--front.html.twig b/agaric/templates/layout/page--front.html.twig index 77611f1..aeae6b4 100644 --- a/agaric/templates/layout/page--front.html.twig +++ b/agaric/templates/layout/page--front.html.twig @@ -65,7 +65,7 @@
{{ page.header }} {% if is_front and site_slogan %} -

{{ site_slogan }}

+

{{ site_slogan }}

{% endif %}
From e8a620aba8dc1f4bb8f0432ea10a0b3a4556413e Mon Sep 17 00:00:00 2001 From: Clayton Dewey Date: Mon, 17 Sep 2018 14:09:11 -0600 Subject: [PATCH 09/10] Remove main section from homepage --- agaric/templates/layout/page--front.html.twig | 7 ------- 1 file changed, 7 deletions(-) diff --git a/agaric/templates/layout/page--front.html.twig b/agaric/templates/layout/page--front.html.twig index aeae6b4..e3b61da 100644 --- a/agaric/templates/layout/page--front.html.twig +++ b/agaric/templates/layout/page--front.html.twig @@ -151,10 +151,6 @@ {% endblock tiles %} {% block main %} {# Main section #} -
-
- {# link is in html.html.twig #} - {{ page.highlighted }} {{ page.help }} @@ -216,9 +212,6 @@ {% endif %} {% endblock sidebar_second %}
- - - {% endblock main %} {% block bottom %} {# Bottom second colored section #} From ef7488b3f4d87e04e538a0ce2f195c928c705f3c Mon Sep 17 00:00:00 2001 From: Clayton Dewey Date: Mon, 17 Sep 2018 15:05:45 -0600 Subject: [PATCH 10/10] Customize slide to match Agaric styles --- .../templates/paragraph/paragraph--slide.html.twig | 12 ++++++++++++ agaric/templates/paragraph/slide.html.twig | 12 ++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 agaric/templates/paragraph/paragraph--slide.html.twig create mode 100644 agaric/templates/paragraph/slide.html.twig diff --git a/agaric/templates/paragraph/paragraph--slide.html.twig b/agaric/templates/paragraph/paragraph--slide.html.twig new file mode 100644 index 0000000..63ebe4d --- /dev/null +++ b/agaric/templates/paragraph/paragraph--slide.html.twig @@ -0,0 +1,12 @@ +{% set item_attributes = create_attribute().addClass(item_classes) %} +{% import "@bulma/macros/renderables.html.twig" as renderables %} +{% set link = renderables.merge_attributes(item_attributes, content.field_link, 0) %} +{# Include slide component template. #} +{% + include '@agaric/paragraph/slide.html.twig' with { + classes: classes, + image_url: content.field_image[0]['#markup'], + text: content.field_text, + link: link, + } only +%} diff --git a/agaric/templates/paragraph/slide.html.twig b/agaric/templates/paragraph/slide.html.twig new file mode 100644 index 0000000..a4d16ea --- /dev/null +++ b/agaric/templates/paragraph/slide.html.twig @@ -0,0 +1,12 @@ +
+
+
+
+ {{ text }} +
+
+ {{ link }} +
+
+
+