From ef3870fc5f948daab8d6d1e538d83de13cefc29d Mon Sep 17 00:00:00 2001 From: Sine Date: Fri, 7 May 2021 14:38:33 +0200 Subject: [PATCH 01/11] LOOP-880: remove text-muted --- .../os2loop_lists/templates/os2loop-lists-expert.html.twig | 2 +- .../os2loop_lists/templates/os2loop-lists-profession.html.twig | 2 +- .../templates/content-entities/comment--list-display.html.twig | 2 +- .../content-entities/taxonomy-term--list-display.html.twig | 2 +- .../templates/content/node--list-display.html.twig | 2 +- .../themes/os2loop_theme/templates/field/user-info.html.twig | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/profiles/custom/os2loop/modules/os2loop_lists/templates/os2loop-lists-expert.html.twig b/web/profiles/custom/os2loop/modules/os2loop_lists/templates/os2loop-lists-expert.html.twig index ed40874b6..8d0987762 100644 --- a/web/profiles/custom/os2loop/modules/os2loop_lists/templates/os2loop-lists-expert.html.twig +++ b/web/profiles/custom/os2loop/modules/os2loop_lists/templates/os2loop-lists-expert.html.twig @@ -17,7 +17,7 @@ {% for node in data %}
diff --git a/web/profiles/custom/os2loop/modules/os2loop_lists/templates/os2loop-lists-profession.html.twig b/web/profiles/custom/os2loop/modules/os2loop_lists/templates/os2loop-lists-profession.html.twig index 670bdb419..887973dcf 100644 --- a/web/profiles/custom/os2loop/modules/os2loop_lists/templates/os2loop-lists-profession.html.twig +++ b/web/profiles/custom/os2loop/modules/os2loop_lists/templates/os2loop-lists-profession.html.twig @@ -17,7 +17,7 @@ {% for node in data %}
diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/comment--list-display.html.twig b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/comment--list-display.html.twig index 104bb2cca..05055a80c 100644 --- a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/comment--list-display.html.twig +++ b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/comment--list-display.html.twig @@ -68,7 +68,7 @@ #}
-
{{ commented_entity.os2loop_question_content.value }}
+
{{ commented_entity.os2loop_question_content.value }}

{{ content.os2loop_question_answer }}

diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/taxonomy-term--list-display.html.twig b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/taxonomy-term--list-display.html.twig index 198a5e79c..a14f55357 100644 --- a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/taxonomy-term--list-display.html.twig +++ b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/taxonomy-term--list-display.html.twig @@ -28,7 +28,7 @@
-
{{ term.vid.entity.label }}
+
{{ term.vid.entity.label }}

{{ name }}

{{ content.flag_os2loop_subscription_term }}
diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content/node--list-display.html.twig b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content/node--list-display.html.twig index 63c0cd825..43938a1a0 100644 --- a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content/node--list-display.html.twig +++ b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content/node--list-display.html.twig @@ -78,7 +78,7 @@
-
{{ node.type.entity.label }}
+
{{ node.type.entity.label }}

{{ label }}

{% if view_id == 'os2loop_subscriptions_node' %} diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/field/user-info.html.twig b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/field/user-info.html.twig index 22cdf3294..4fd46f939 100644 --- a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/field/user-info.html.twig +++ b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/field/user-info.html.twig @@ -19,7 +19,7 @@ {% set user_url = user['#user'].id is not empty ? url('entity.user.canonical', {'user': user['#user'].id}) : '#' %} {{ user['#user'].os2loop_user_given_name.value }} {{ user['#user'].os2loop_user_family_name.value }}
-
+
{{ user['#user'].os2loop_user_job_title.value }}
{{ user['#user'].os2loop_user_place.value }}
{{ date }}
From 03dc1bca11055711826ceaad9e6b61fd8981a69b Mon Sep 17 00:00:00 2001 From: Sine Date: Fri, 7 May 2021 14:38:54 +0200 Subject: [PATCH 02/11] LOOP-880: black text in highlighted content --- .../os2loop_theme/assets/paragraphs/highlighted-content.scss | 1 + .../paragraph--os2loop-documents-step.html.twig | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/assets/paragraphs/highlighted-content.scss b/web/profiles/custom/os2loop/themes/os2loop_theme/assets/paragraphs/highlighted-content.scss index 9d0e57285..0843788a2 100644 --- a/web/profiles/custom/os2loop/themes/os2loop_theme/assets/paragraphs/highlighted-content.scss +++ b/web/profiles/custom/os2loop/themes/os2loop_theme/assets/paragraphs/highlighted-content.scss @@ -1,5 +1,6 @@ .os2loop-highlighted-container { background-color: $primary-color; + color: $black; padding: 1em; margin: 1em 0; display: flex; diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/paragraph--os2loop-documents-step.html.twig b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/paragraph--os2loop-documents-step.html.twig index 29777761c..0bea2af32 100644 --- a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/paragraph--os2loop-documents-step.html.twig +++ b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/paragraph--os2loop-documents-step.html.twig @@ -57,7 +57,9 @@ {{ content.os2loop_documents_step_text }} {{ content.os2loop_documents_step_image }}
-
    {{ content.os2loop_documents_steps }}
+ {% if content.os2loop_documents_steps['#title'] is not null %} +
    {{ content.os2loop_documents_steps }}
+ {% endif %} {% endblock %} {% endblock paragraph %} From 7fb536cccbb08b1d7578c8d4d477700a48ede2e3 Mon Sep 17 00:00:00 2001 From: Sine Date: Fri, 7 May 2021 14:39:14 +0200 Subject: [PATCH 03/11] LOOP-880: black logo --- web/profiles/custom/os2loop/themes/os2loop_theme/logo-loop.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/logo-loop.svg b/web/profiles/custom/os2loop/themes/os2loop_theme/logo-loop.svg index 97c327879..5302a185d 100644 --- a/web/profiles/custom/os2loop/themes/os2loop_theme/logo-loop.svg +++ b/web/profiles/custom/os2loop/themes/os2loop_theme/logo-loop.svg @@ -1 +1 @@ - \ No newline at end of file + From 4bfac5ff3b8ad5388aeb1cd05809d43d2305aa92 Mon Sep 17 00:00:00 2001 From: Sine Date: Fri, 7 May 2021 14:40:02 +0200 Subject: [PATCH 04/11] LOOP-880: black menu text and aria-label --- .../custom/os2loop/themes/os2loop_theme/assets/app.scss | 4 ++++ .../os2loop_theme/templates/navigation/menu--main.html.twig | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/assets/app.scss b/web/profiles/custom/os2loop/themes/os2loop_theme/assets/app.scss index 672dd697b..2da70be4c 100644 --- a/web/profiles/custom/os2loop/themes/os2loop_theme/assets/app.scss +++ b/web/profiles/custom/os2loop/themes/os2loop_theme/assets/app.scss @@ -16,6 +16,10 @@ a { margin-bottom: $spacer * 2; } +.nav-link { + color: $black !important; +} + .bg-white-loop { @extend .container; background-color: $white; diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/navigation/menu--main.html.twig b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/navigation/menu--main.html.twig index 2309b234d..b112ecf02 100644 --- a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/navigation/menu--main.html.twig +++ b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/navigation/menu--main.html.twig @@ -41,21 +41,20 @@ ] %} {% set classes_link = [ 'nav-link', - 'text-dark', item.is_expanded and item.url.routeName == '' ? 'dropdown-toggle', item.is_collapsed and item.url.routeName == '' ? 'dropdown-toggle', item.in_active_trail ? 'active', ] %} {% if item.url.routeName == '' %} - {% else %} {{ link(item.title, item.url, {'class': classes_link}) }} {% endif %} {% if item.below %} -
+
{{ menus.menu_links(item.below, attributes, menu_level + 1) }}
{% endif %} From 7f7a59f0ca65b08c7f8e4ba6058a03c91b796cdf Mon Sep 17 00:00:00 2001 From: Sine Date: Fri, 7 May 2021 14:40:31 +0200 Subject: [PATCH 05/11] LOOP-880: darken link color --- .../custom/os2loop/themes/os2loop_theme/assets/colors.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/assets/colors.scss b/web/profiles/custom/os2loop/themes/os2loop_theme/assets/colors.scss index b6555a94a..9b1db1526 100644 --- a/web/profiles/custom/os2loop/themes/os2loop_theme/assets/colors.scss +++ b/web/profiles/custom/os2loop/themes/os2loop_theme/assets/colors.scss @@ -39,4 +39,4 @@ $dark-subscribe: darken($subscribe, 10%); $dark-favourite: darken($favourite, 10%); // Link color -$link-color: #0056b3; +$link-color: #0051a8; From 55a35645a11aa31a01e76a1e919d70698822eae8 Mon Sep 17 00:00:00 2001 From: Sine Date: Fri, 7 May 2021 14:41:22 +0200 Subject: [PATCH 06/11] LOOP-880: on tab, visible text remove empty titles --- .../themes/os2loop_theme/assets/icons.scss | 12 +++++++---- .../themes/os2loop_theme/assets/mixins.scss | 10 +++++++++- .../flag--os2loop-favourite.html.twig | 5 ++++- .../flag--os2loop-subscription-node.html.twig | 6 +++++- .../navigation/content-tasks.html.twig | 20 ++++++++++++++----- 5 files changed, 41 insertions(+), 12 deletions(-) diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/assets/icons.scss b/web/profiles/custom/os2loop/themes/os2loop_theme/assets/icons.scss index 334114763..9e022608c 100644 --- a/web/profiles/custom/os2loop/themes/os2loop_theme/assets/icons.scss +++ b/web/profiles/custom/os2loop/themes/os2loop_theme/assets/icons.scss @@ -19,7 +19,7 @@ } &.print { - @include link-icon("\f501"); + @include link-icon("\f501", $text-color: $white); } &.fav { @@ -43,15 +43,19 @@ } &.share { - @include link-icon("\f52e"); + @include link-icon("\f52e", $text-color: $white); } &.flag { - @include link-icon("\f3cc"); + @include link-icon("\f3cc", $text-color: $white); } &.reply { - @include link-icon("\f51f"); + @include link-icon("\f51f", $text-color: $white); + } + + &.bell { + @include link-icon("\f18a", $subscribe, $dark-subscribe); } &.delete { diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/assets/mixins.scss b/web/profiles/custom/os2loop/themes/os2loop_theme/assets/mixins.scss index 74a2289f9..32536051a 100644 --- a/web/profiles/custom/os2loop/themes/os2loop_theme/assets/mixins.scss +++ b/web/profiles/custom/os2loop/themes/os2loop_theme/assets/mixins.scss @@ -1,13 +1,15 @@ @mixin link-icon( $content: null, $color: $icon-base-color, - $hover-color: $dark-icon-base-color + $hover-color: $dark-icon-base-color, + $text-color: $black ) { background-color: $color; &:hover { background-color: $hover-color; } + a { @if $content { width: 100%; @@ -18,6 +20,12 @@ font-family: bootstrap-icons !important; content: $content; } + &:focus { + .visually-hidden { + position: relative !important; + color: $text-color !important; + } + } } } } diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/flag--os2loop-favourite.html.twig b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/flag--os2loop-favourite.html.twig index ed066256b..09cfb2432 100644 --- a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/flag--os2loop-favourite.html.twig +++ b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/flag--os2loop-favourite.html.twig @@ -36,8 +36,11 @@ {# Set nofollow to prevent search bots from crawling anonymous flag links #} {% set attributes = attributes.setAttribute('rel', 'nofollow') %} +{% set attributes = attributes.removeAttribute('title') %}
- + + +
{% endspaceless %} diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/flag--os2loop-subscription-node.html.twig b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/flag--os2loop-subscription-node.html.twig index 422653e02..eeb356ed2 100644 --- a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/flag--os2loop-subscription-node.html.twig +++ b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/flag--os2loop-subscription-node.html.twig @@ -24,6 +24,7 @@ {# Set the remaining Flag CSS classes. #} {% set classes = [ 'icon', + 'bell', 'flag-' ~ flag.id()|clean_class, 'js-flag-' ~ flag.id()|clean_class ~ '-' ~ flaggable.id(), action_class, @@ -32,8 +33,11 @@ {# Set nofollow to prevent search bots from crawling anonymous flag links #} {% set attributes = attributes.setAttribute('rel', 'nofollow') %} +{% set attributes = attributes.removeAttribute('title') %}
- + + +
{% endspaceless %} diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/navigation/content-tasks.html.twig b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/navigation/content-tasks.html.twig index 783b60cee..d0b84c5cd 100644 --- a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/navigation/content-tasks.html.twig +++ b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/navigation/content-tasks.html.twig @@ -10,19 +10,29 @@ #}
- + + +
- + + +
- + + +
- + + +
{{ content.flag_os2loop_favourite }} {{ content.flag_os2loop_subscription_node }} From 7d2f902b4ec49f61ee2ecd42fdae541b20ebdae7 Mon Sep 17 00:00:00 2001 From: Sine Date: Fri, 7 May 2021 14:41:58 +0200 Subject: [PATCH 07/11] LOOP-880: text in logo link --- .../templates/block/block--system-branding-block.html.twig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/block/block--system-branding-block.html.twig b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/block/block--system-branding-block.html.twig index 885cdaf97..fca0cd5eb 100644 --- a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/block/block--system-branding-block.html.twig +++ b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/block/block--system-branding-block.html.twig @@ -15,7 +15,8 @@ */ #} {% if site_logo %} - + + {% include(site_logo) %} {% endif %} From c8d7a445285c8e5dd11f8c34a841e4466a2dfb9c Mon Sep 17 00:00:00 2001 From: Sine Date: Fri, 7 May 2021 14:42:20 +0200 Subject: [PATCH 08/11] LOOP-880: replace fieldset and legend --- .../node--os2loop-documents-collection.html.twig | 6 +++--- .../node--os2loop-documents-document.html.twig | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content/node--os2loop-documents-collection.html.twig b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content/node--os2loop-documents-collection.html.twig index eb99403ee..4b035dc0a 100644 --- a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content/node--os2loop-documents-collection.html.twig +++ b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content/node--os2loop-documents-collection.html.twig @@ -102,10 +102,10 @@ {{ content.os2loop_documents_dc_content }} {% if os2loop_documents_collection_tree|default(false) %} -
- {{ 'Documents in collection'|t }} +
+

{{ 'Documents in collection'|t }}

{{ _self.table_of_contents(os2loop_documents_collection_tree, node) }} -
+
{% endif %}
diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content/node--os2loop-documents-document.html.twig b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content/node--os2loop-documents-document.html.twig index a2688ab17..682480007 100644 --- a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content/node--os2loop-documents-document.html.twig +++ b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content/node--os2loop-documents-document.html.twig @@ -119,21 +119,21 @@
{{ macros.title(os2loop_documents_collection.title.value, "document", node, content) }} {% if os2loop_documents_collection_tree|default(false) %} -
- {{ 'Documents in collection'|t }} +
+

{{ 'Documents in collection'|t }} {{ os2loop_documents_collection.title.value }} - +

{{ _self.table_of_contents(os2loop_documents_collection_tree, os2loop_documents_collection, node) }} -
+
{% elseif os2loop_documents_collections|default(false) %} -
- {{ 'Document is part of these collections'|t }} +
+

{{ 'Document is part of these collections'|t }}

    {% for collection in os2loop_documents_collections %}
  1. {{ collection.title.value }}
    2. {% endfor %}
-
+
{% endif %}
From 85d4f64aac13e3569980b10df121d7369f7d86de Mon Sep 17 00:00:00 2001 From: Sine Date: Fri, 7 May 2021 14:42:45 +0200 Subject: [PATCH 09/11] LOOP-880: move attributes around in tabs --- .../os2loop_theme/templates/navigation/content-tabs.html.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/navigation/content-tabs.html.twig b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/navigation/content-tabs.html.twig index b64ecf174..cfffd7539 100644 --- a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/navigation/content-tabs.html.twig +++ b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/navigation/content-tabs.html.twig @@ -12,8 +12,8 @@ #} From f3aa192d5358d7cf755bed82acf0d3bad802060a Mon Sep 17 00:00:00 2001 From: Sine Date: Fri, 7 May 2021 14:42:59 +0200 Subject: [PATCH 10/11] LOOP-880: remove text muted --- .../os2loop_theme/templates/content-entities/message.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/message.html.twig b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/message.html.twig index 3d6da724c..c1ea8d561 100644 --- a/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/message.html.twig +++ b/web/profiles/custom/os2loop/themes/os2loop_theme/templates/content-entities/message.html.twig @@ -30,7 +30,7 @@
-
{{ message.template.entity.label }}
+
{{ message.template.entity.label }}

{{ content|without('os2loop_message_node_refer') }}

From 51162593d9fdb72bc0da63a016cdac50bcb6c1fc Mon Sep 17 00:00:00 2001 From: Sine Date: Fri, 7 May 2021 15:10:04 +0200 Subject: [PATCH 11/11] LOOP-880: changed the selector to focus-visible --- .../custom/os2loop/themes/os2loop_theme/assets/mixins.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/profiles/custom/os2loop/themes/os2loop_theme/assets/mixins.scss b/web/profiles/custom/os2loop/themes/os2loop_theme/assets/mixins.scss index 32536051a..455f09d5d 100644 --- a/web/profiles/custom/os2loop/themes/os2loop_theme/assets/mixins.scss +++ b/web/profiles/custom/os2loop/themes/os2loop_theme/assets/mixins.scss @@ -20,7 +20,7 @@ font-family: bootstrap-icons !important; content: $content; } - &:focus { + &:focus-visible { .visually-hidden { position: relative !important; color: $text-color !important;