Merge branch '1.1.x' of https://git.drupalcode.org/project/socialblue into...

Merge branch '1.1.x' of https://git.drupalcode.org/project/socialblue into bugfix/3217356-improve-secondary-nav-behavior

assets/css/offcanvas--sky.css

@@ -6,7 +6,7 @@
     margin: 1rem 0;
     padding: 0 1rem;
   }
-  .socialblue--sky[class*='path-all'] [data-class='exposed-filter-block'] {
+  .socialblue--sky[class*='path-all'] [data-class='exposed-filter-block'], .socialblue--sky.path-birthday [data-class='exposed-filter-block'] {
     padding: 0;
     margin: 0;
   }

components/04-organisms/offcanvas/offcanvas--sky.scss

@@ -12,7 +12,8 @@
     }
   }
 
-  &[class*='path-all'] {
+  &[class*='path-all'],
+  &.path-birthday {
     [data-class='exposed-filter-block'] {
       @include for-tablet-landscape-down {
         padding: 0;

templates/profile/profile--profile--default--sky.html.twig

@@ -90,6 +90,13 @@
       </div>
     {% endif %}
 
+    {% if user_lang %}
+      <div class="list-item card--content-merged__list">
+        <div class="list-item__label">{% trans %}Language{% endtrans %}</div>
+        <div class="list-item__text">{{ user_lang }}</a></div>
+      </div>
+    {% endif %}
+
     {% if content.field_profile_address|render %}
       <div class="list-item card--content-merged__list">
           <div class="list-item__label">{% trans %}Address{% endtrans %}</div>
@@ -183,9 +190,9 @@
 
     {{  content|without('field_profile_phone_number', 'user_mail', 'field_profile_address',
       'field_profile_self_introduction', 'field_profile_interests', 'field_profile_expertise',
-      'field_profile_profile_tag', 'field_manager_notes', 'social_tagging') }}
+      'field_profile_profile_tag', 'field_manager_notes', 'social_tagging', 'user_lang') }}
 
-    {% if (content|render is empty and user_mail is empty)%}
+    {% if (content|render is empty and user_mail is empty and user_lang is empty)%}
         {% trans %}{{ profile_name }} {{ profile_name_extra }} has not shared profile information.{% endtrans %}
     {% endif %}