From 5e2d1c6f1531b4a78a1d6997d1402542781e4ee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 1 Aug 2019 22:59:30 -0400 Subject: [PATCH 1/6] Document change made in migration plan --- 7to8fieldmapping.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7to8fieldmapping.md b/7to8fieldmapping.md index bcbf311..0132347 100644 --- a/7to8fieldmapping.md +++ b/7to8fieldmapping.md @@ -14,6 +14,6 @@ Almost all the migration has already been done. These are some leftovers, which As documented, *Review* should become a term in the `article_type` vocabulary. -In addition, *Article* should also become a term in the `article_type` vocabulary (ideally with a name change to *GEO Original*). +In addition, *Article* should also become a term in the `article_type` vocabulary (ideally with a name change to *GEO Original*). We undid this because many of these items did *not* have citations and at least some were not GEO Originals, see https://gitlab.com/agaric/sites/geo/issues/10#note_199134134 This is tricky, but ideally any story *without* a citation would get an `article_type` of *Repost* or similar. From d26a296f089c55e7b7147b1ec07e63ae22fab956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 1 Aug 2019 23:25:56 -0400 Subject: [PATCH 2/6] Commit compiled CSS: tweak exact location of slogan --- web/themes/custom/geofresco/dist/css/global.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web/themes/custom/geofresco/dist/css/global.css b/web/themes/custom/geofresco/dist/css/global.css index ff4a017..f74d70d 100644 --- a/web/themes/custom/geofresco/dist/css/global.css +++ b/web/themes/custom/geofresco/dist/css/global.css @@ -3092,6 +3092,8 @@ a.tag:hover { display: -ms-flexbox; display: flex; } .slogan .title { + position: relative; + top: 2px; color: #8FB489; font-size: 1.2rem; margin: auto; } From 2e15dd02ad56905b8f96319ea6531723493fb441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 1 Aug 2019 23:26:54 -0400 Subject: [PATCH 3/6] Put an end to relatively possitioned elements never getting flow back on track --- web/themes/custom/geofresco/src/global/_elements.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/themes/custom/geofresco/src/global/_elements.scss b/web/themes/custom/geofresco/src/global/_elements.scss index 077c8ea..00294a3 100644 --- a/web/themes/custom/geofresco/src/global/_elements.scss +++ b/web/themes/custom/geofresco/src/global/_elements.scss @@ -52,8 +52,7 @@ } .slogan { - position: relative; - top: -36px; + margin-top: -36px; height: 36px; z-index: 30; display: flex; From a22bed986f267b81b31dc0abef22bba1eed9d3e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 1 Aug 2019 23:27:36 -0400 Subject: [PATCH 4/6] Make featured image full-browser width, no matter what --- .../custom/geofresco/src/global/_components.scss | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/web/themes/custom/geofresco/src/global/_components.scss b/web/themes/custom/geofresco/src/global/_components.scss index 28028d7..fd4b9f2 100644 --- a/web/themes/custom/geofresco/src/global/_components.scss +++ b/web/themes/custom/geofresco/src/global/_components.scss @@ -13,3 +13,16 @@ padding-right: 1rem; } } + +.featured-image figure.image { + width: 100vw; + position: relative; + left: 50%; + right: 50%; + margin-left: -50vw; + margin-right: -50vw; + img { + width: 100%; + } +} + From caf80a58a5b6ce8bf0e0d1efad00c72db86204be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 1 Aug 2019 23:27:58 -0400 Subject: [PATCH 5/6] Override field for node images to set necessary classes --- .../field--node--field-image.html.twig | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 web/themes/custom/geofresco/src/templates/elements/field--node--field-image.html.twig diff --git a/web/themes/custom/geofresco/src/templates/elements/field--node--field-image.html.twig b/web/themes/custom/geofresco/src/templates/elements/field--node--field-image.html.twig new file mode 100644 index 0000000..0a0efb1 --- /dev/null +++ b/web/themes/custom/geofresco/src/templates/elements/field--node--field-image.html.twig @@ -0,0 +1,50 @@ +{# +/** + * @file + * Theme override for a image fields on nodes, always a featured image. + * + * Available variables: + * - attributes: HTML attributes for the containing element. + * - title_attributes, label, label_display: Not used; we force label_hidden. + * - multiple: TRUE if a field can contain multiple items. + * - items: List of all the field items. Each item contains: + * - attributes: List of HTML attributes for each item. + * - content: The field item's content. + * - entity_type: The entity type to which the field belongs. + * - field_name: The name of the field. + * - field_type: The type of the field. + * + * @see template_preprocess_field() + */ +#} +{# Child templates can specify classes to be added to items. #} +{% set item_classes = item_classes ?? ['nadahuh'] %} +{# Child templates can specify whether items should be wrapped. #} +{% set use_item_wrapper = use_item_wrapper is defined ? use_item_wrapper : false %} + +{% macro render_item(item, item_classes, use_item_wrapper) %} + {% + set item = item|merge({ + 'attributes': item.attributes.addClass(item_classes) + }) + %} + {% if use_item_wrapper %} + {{ item.content }} + {% else %} + {% import "@bulma/macros/renderables.html.twig" as renderables %} + {{ renderables.merge_attributes(item.attributes, item, 'content') }} + {% endif %} +{% endmacro render_item %} +{% import _self as helpers %} + +{% if multiple %} + + {% for item in items %} + {{ helpers.render_item(item, item_classes, use_item_wrapper) }} + {% endfor %} + +{% else %} + {% for item in items %} + {{ helpers.render_item(item, item_classes, use_item_wrapper) }} + {% endfor %} +{% endif %} From 3fadc1453e964bad6b4c7a969ac53bd852ffb520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Thu, 1 Aug 2019 23:28:08 -0400 Subject: [PATCH 6/6] Commit compiled CSS --- web/themes/custom/geofresco/dist/css/global.css | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/web/themes/custom/geofresco/dist/css/global.css b/web/themes/custom/geofresco/dist/css/global.css index f74d70d..312d2c7 100644 --- a/web/themes/custom/geofresco/dist/css/global.css +++ b/web/themes/custom/geofresco/dist/css/global.css @@ -6012,6 +6012,16 @@ label.panel-block { padding-left: 1rem; padding-right: 1rem; } } +.featured-image figure.image { + width: 100vw; + position: relative; + left: 50%; + right: 50%; + margin-left: -50vw; + margin-right: -50vw; } + .featured-image figure.image img { + width: 100%; } + .column { display: block; -ms-flex-preferred-size: 0;