diff --git a/web/themes/custom/hoeringsportal/assets/css/layout/_aside.scss b/web/themes/custom/hoeringsportal/assets/css/layout/_aside.scss index 15ae2cee..afd21b76 100755 --- a/web/themes/custom/hoeringsportal/assets/css/layout/_aside.scss +++ b/web/themes/custom/hoeringsportal/assets/css/layout/_aside.scss @@ -1,14 +1,8 @@ -.group-right { +.aside-contact-info-text { + background-color: $color-petroleum-100; + padding: $spacer; + @include media-breakpoint-up(md) { padding: $spacer * 2.5 0 $spacer * 2.5 $spacer * 2.5; } - - padding-top: $spacer * 2; - padding-bottom: $spacer * 2; -} - -.aside-block { - background-color: $color-petroleum-100; - - } diff --git a/web/themes/custom/hoeringsportal/assets/css/layout/_page-project.scss b/web/themes/custom/hoeringsportal/assets/css/layout/_page-project.scss index 062c13d9..9357d774 100644 --- a/web/themes/custom/hoeringsportal/assets/css/layout/_page-project.scss +++ b/web/themes/custom/hoeringsportal/assets/css/layout/_page-project.scss @@ -6,7 +6,7 @@ font-size: clamp(1.25rem, calc(1.25vw + $font-size-base), 1.6rem); } - h2 + p strong { + .abstract { font-size: clamp(1.1rem, 0.8vw + 1rem, 1.3rem); font-weight: normal; line-height: 1.6; diff --git a/web/themes/custom/hoeringsportal/templates/block/block-content--aside-contact-info.html.twig b/web/themes/custom/hoeringsportal/templates/block/block-content--aside-contact-info.html.twig index d8f3b1bd..50289f4a 100644 --- a/web/themes/custom/hoeringsportal/templates/block/block-content--aside-contact-info.html.twig +++ b/web/themes/custom/hoeringsportal/templates/block/block-content--aside-contact-info.html.twig @@ -28,32 +28,36 @@ * @ingroup themeable */ #} - -
- {% if block_content.field_department.value %} -
- {{ block_content.field_department.value }} -
- {% endif %} - {% if block_content.field_title.value %} -
- {{ block_content.field_title.value }} -
- {% endif %} - {% if block_content.field_address.value %} -
- {# @TODO Which is better; `nl2br` or `style="white-space: pre-line"` #} - {{ block_content.field_address.value|nl2br }} -
- {% endif %} - {% if block_content.field_phone_number.value %} -
- {{ 'Phone'|trans }}: {{ block_content.field_phone_number.value }} -
- {% endif %} - {% if block_content.field_email.value %} -
- {{ 'Email'|trans }}: {{ block_content.field_email.value }} -
+
+ {% if block_content.field_image %} + {% endif %} +
+ {% if block_content.field_department.value %} +
+ {{ block_content.field_department.value }} +
+ {% endif %} + {% if block_content.field_title.value %} +
+ {{ block_content.field_title.value }} +
+ {% endif %} + {% if block_content.field_address.value %} +

+ {# @TODO Which is better; `nl2br` or `style="white-space: pre-line"` #} + {{ block_content.field_address.value|nl2br }} +

+ {% endif %} + {% if block_content.field_phone_number.value %} +
+ {{ 'Phone'|trans }}: {{ block_content.field_phone_number.value }} +
+ {% endif %} + {% if block_content.field_email.value %} +
+ {{ 'Email'|trans }}: {{ block_content.field_email.value }} +
+ {% endif %} +
diff --git a/web/themes/custom/hoeringsportal/templates/field/field--block-content--aside-contact-info.html.twig b/web/themes/custom/hoeringsportal/templates/field/field--block-content--aside-contact-info.html.twig deleted file mode 100755 index 560e13ec..00000000 --- a/web/themes/custom/hoeringsportal/templates/field/field--block-content--aside-contact-info.html.twig +++ /dev/null @@ -1,49 +0,0 @@ -{# -/** - * @file - * Theme override for a field. - * - * To override output, copy the "field.html.twig" from the templates directory - * to your theme's directory and customize it, just like customizing other - * Drupal templates such as page.html.twig or node.html.twig. - * - * Instead of overriding the theming for all fields, you can also just override - * theming for a subset of fields using - * @link themeable Theme hook suggestions. @endlink For example, - * here are some theme hook suggestions that can be used for a field_foo field - * on an article node type: - * - field--node--field-foo--article.html.twig - * - field--node--field-foo.html.twig - * - field--node--article.html.twig - * - field--field-foo.html.twig - * - field--text-with-summary.html.twig - * - field.html.twig - * - * Available variables: - * - attributes: HTML attributes for the containing element. - * - label_hidden: Whether to show the field label or not. - * - title_attributes: HTML attributes for the title. - * - label: The label for the field. - * - 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. - * - label_display: The display settings for the label. - * - * @see template_preprocess_field() - */ -#} - -
{{ label }}
-{% if multiple %} -
-{% endif %} -{% for item in items %} - {{ item.content }} -{% endfor %} -{% if multiple %} -
-{% endif %} diff --git a/web/themes/custom/hoeringsportal/templates/node/node--project-main-page.html.twig b/web/themes/custom/hoeringsportal/templates/node/node--project-main-page.html.twig index 26b0e460..7495972f 100755 --- a/web/themes/custom/hoeringsportal/templates/node/node--project-main-page.html.twig +++ b/web/themes/custom/hoeringsportal/templates/node/node--project-main-page.html.twig @@ -10,14 +10,14 @@
- {{ content|without('field_project_image', 'field_short_description', 'field_aside_block', 'field_content_sections', 'published_at') }} + {{ content|without('field_project_image', 'field_short_description', 'field_aside_block', 'field_content_sections', 'field_area', 'published_at') }}
{{ content.field_aside_block }}
-
+
{{ content.field_content_sections }}
diff --git a/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--text-aside-blocks-2-column.html.twig b/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--text-aside-blocks-2-column.html.twig new file mode 100644 index 00000000..50ddc0c1 --- /dev/null +++ b/web/themes/custom/hoeringsportal/templates/paragraph/paragraph--text-aside-blocks-2-column.html.twig @@ -0,0 +1,18 @@ +
+
+
+ {% if paragraph.field_title.value %} +

{{ paragraph.field_title.value }}

+ {% endif %} + {% if paragraph.field_abstract.value %} +

{{ paragraph.field_abstract.value }}

+ {% endif %} + {{ content.field_body }} +
+ {% if paragraph.field_aside_block.value %} +
+ {{ content.field_aside_block }} +
+ {% endif %} +
+