Merge branch 'develop' into staging

* develop: Updating os2web_meetings_agman Update ref. to base theme Borger.dk Timezone Add timezone
OS2web · Jun 8, 2021 · e85bb0b · e85bb0b
2 parents 9e8c3a9 + 33e8399
commit e85bb0b
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 15 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/web/themes/custom/fds_ballerup_theme/dist/stylesheets/stylesheet.css b/web/themes/custom/fds_ballerup_theme/dist/stylesheets/stylesheet.css
diff --git a/web/themes/custom/fds_ballerup_theme/src/styles/theme/components/_accordion.scss b/web/themes/custom/fds_ballerup_theme/src/styles/theme/components/_accordion.scss
@@ -34,6 +34,28 @@
       border-top: 1px solid #dadde0;
     }
   }
+
+  li.has-selfservice-links {
+    position: relative;
+
+    .selfservice-links {
+      position: absolute;
+
+      top: 0;
+      right: 0;
+
+      z-index: 500;
+
+      padding-top: 14px;
+      padding-bottom: 14px;
+      padding-right: 14px;
+      padding-left: 20px;
+    }
+
+    .accordion-button {
+      padding-right: 12rem;
+    }
+  }
 }
 .accordion-button {
   position: relative;

diff --git a/...ustom/fds_ballerup_theme/templates/node/full/node--os2web-hearings-hearing-case.html.twig b/...ustom/fds_ballerup_theme/templates/node/full/node--os2web-hearings-hearing-case.html.twig
@@ -7,7 +7,7 @@
   view_mode ? view_mode|clean_class,
 ]
 %}
-{% set timestamp = node.field_os2web_m_start_date.value|date('U') %}
+{% set timestamp = node.field_os2web_m_start_date.date|date('U') %}
 <div {{ attributes.addClass(classes) }}>
   {{ content.field_os2web_hearings_heading }}
   {{ content.field_os2web_hearings_intro }}

diff --git a/...mes/custom/fds_ballerup_theme/templates/node/full/node--os2web-meetings-meeting.html.twig b/...mes/custom/fds_ballerup_theme/templates/node/full/node--os2web-meetings-meeting.html.twig
@@ -7,10 +7,7 @@
   view_mode ? view_mode|clean_class,
 ]
 %}
-{% if node.field_os2web_m_start_date.value %}
-  {% set timestamp = node.field_os2web_m_start_date.value|date('U') %}
-{% endif %}
-{% set timestamp = node.field_os2web_m_start_date.value|date('U') %}
+{% set timestamp = node.field_os2web_m_start_date.date|date('U') %}
 <div {{ attributes.addClass(classes) }}>
   <h1>{{ label }}</h1>
   <div class="fields-inline">

diff --git a/...lerup_theme/templates/node/teaser/meeting/node--os2web-meetings-meeting--teaser.html.twig b/...lerup_theme/templates/node/teaser/meeting/node--os2web-meetings-meeting--teaser.html.twig
@@ -8,7 +8,7 @@
 ]
 %}
 {% if node.field_os2web_m_start_date.value %}
-{% set timestamp = node.field_os2web_m_start_date.value|date('U') %}
+  {% set timestamp = node.field_os2web_m_start_date.date|date('U') %}
 {% endif %}
 
 <a href="{{ url }}" {{ attributes.addClass(classes) }}>

diff --git a/...ballerup_theme/templates/node/teaser/node--os2web-hearings-hearing-case--teaser.html.twig b/...ballerup_theme/templates/node/teaser/node--os2web-hearings-hearing-case--teaser.html.twig
@@ -7,7 +7,7 @@
   view_mode ? view_mode|clean_class,
 ]
 %}
-{% set timestamp = node.field_os2web_hearings_end_date.value|date('U') %}
+{% set timestamp = node.field_os2web_hearings_end_date.date|date('U') %}
 
 <a href="{{ url }}" {{ attributes.addClass(classes) }}>
   <div class="entity-{{ view_mode|clean_class }}--{{ node.bundle|clean_class }}__date">