Merge branch 'develop' into staging

* develop: BKDK-469 view mode list advanced Appearance of chosen select BKDK-469 BKDK-469 BKDK-469 BKDK-488 BKDK-487 hide results before form submission BKDK-485 updating meeting type mapping BKDK-484 BKDK-488 Updating os2web_keyword_paragraph Remove slt Updating os2web_pagebuilder BKDK-447 Added script to get redirects for webforms BKDK-474 BKDK-459 Updating os2web_borgerdk reference
OS2web · Jun 8, 2021 · 9e8c3a9 · 9e8c3a9
2 parents 219358e + eb3d5d2
commit 9e8c3a9
Show file tree

Hide file tree

Showing 9 changed files with 100 additions and 60 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/_misc.scss b/web/themes/custom/fds_ballerup_theme/src/styles/theme/_misc.scss
@@ -119,18 +119,7 @@ svg.ext {
   display: none;
 }
 
-#views-exposed-form-os2web-meetings-search-os2web-meetings-embed-search-from-to-dates {
-  margin-bottom: $grid-gutter-width / 2;
-  padding: 30px;
-
-  border-radius: 3px;
-  box-shadow: 0 1px 2px 0 rgba(27, 27, 29, .2);
-  background-color: #fff;
-
-  .form-item-from-date,
-  .form-item-to-date {
-    max-width: 130px;
-  }
+.view {
 
   .form-type-select {
 
@@ -150,8 +139,20 @@ svg.ext {
       border: $outer-border;
     }
   }
+}
+
+#views-exposed-form-os2web-meetings-search-os2web-meetings-embed-search-from-to-dates {
+  margin-bottom: $grid-gutter-width / 2;
+  padding: 30px;
+
+  border-radius: 3px;
+  box-shadow: 0 1px 2px 0 rgba(27, 27, 29, .2);
+  background-color: #fff;
 
-  .form-select {}
+  .form-item-from-date,
+  .form-item-to-date {
+    max-width: 130px;
+  }
 
   .form-actions {
     margin-bottom: 0;
@@ -407,6 +408,18 @@ body {
   }
 }
 
+.field--name-field-os2web-hearings-reply {
+  display: none !important;
+}
+
+body.page-node-type-os2web-news,
+body.page-node-type-os2web-page {
+
+  h1, .h1 {
+    font-weight: 400;
+  }
+}
+
 // --------------------------------------------------
 // Responsive
 // --------------------------------------------------

diff --git a/web/themes/custom/fds_ballerup_theme/src/styles/theme/entity/list/_news.scss b/web/themes/custom/fds_ballerup_theme/src/styles/theme/entity/list/_news.scss
@@ -101,6 +101,8 @@ a.entity-list--os2web-news {
       flex-shrink: 0;
 
       img {
+        display: block;
+
         width: 100%;
       }
     }

diff --git a/...hemes/custom/fds_ballerup_theme/src/styles/theme/entity/search-result/_search-result.scss b/...hemes/custom/fds_ballerup_theme/src/styles/theme/entity/search-result/_search-result.scss
@@ -20,6 +20,7 @@
 // Styling
 // --------------------------------------------------
 
+.entity-list-advanced,
 .entity-search-index,
 .entity-search-result {
   margin-bottom: 1rem;
@@ -33,6 +34,7 @@
   }
 }
 
+a.entity-list-advanced,
 a.entity-search-index,
 a.entity-search-result {
   max-width: unset;

diff --git a/...plates/field/field--node--field-os2web-page-heading--os2web-page--list-advanced.html.twig b/...plates/field/field--node--field-os2web-page-heading--os2web-page--list-advanced.html.twig
@@ -0,0 +1 @@
+{% extends "@fds_base_theme/custom/fields/h2-fake-h3.html.twig" %}
diff --git a/...emplates/field/field--node--field-os2web-page-intro--os2web-page--list-advanced.html.twig b/...emplates/field/field--node--field-os2web-page-intro--os2web-page--list-advanced.html.twig
@@ -0,0 +1 @@
+{% extends "@fds_base_theme/custom/fields/normal-text.html.twig" %}
diff --git a/...node--os2web-page--search-index.html.twig → ...ode--os2web-page--list-advanced.html.twig b/...node--os2web-page--search-index.html.twig → ...ode--os2web-page--list-advanced.html.twig
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
@@ -27,10 +27,7 @@
 
   <div class="entity-{{ view_mode|clean_class }}--{{ node.bundle|clean_class }}__content">
     <div class="row">
-      <div class="col col-sm-5 col--align-center">
-        {{ content.field_os2web_m_type }}
-      </div>
-      <div class="col col-sm-7 col--align-center d-none d-sm-flex">
+      <div class="col col--align-center">
         {% if timestamp %}
           {{ timestamp | format_date('long') }}
         {% endif %}
-Original file line number
+Diff line change
@@ Expand Up / @@ -101,6 +101,8 @@ a.entity-list--os2web-news { @@
           flex-shrink: 0;
           img {
+            display: block;
             width: 100%;
           }
         }
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{% extends "@fds_base_theme/custom/fields/h2-fake-h3.html.twig" %}