ISAICP-5624: Fix double scrollbar on IE

ec-europa · Dec 3, 2019 · d4bffad · d4bffad
1 parent ae83f59
commit d4bffad
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 0 deletions.
diff --git a/web/themes/joinup/joinup_theme.info.yml b/web/themes/joinup/joinup_theme.info.yml
@@ -11,6 +11,8 @@ libraries:
 libraries-extend:
   core/drupal.tableselect:
     - joinup_theme/tableselect
+  oe_webtools_cookie_consent/oe_webtools_cookie_consent.cck:
+    - joinup_theme/cookie-extend
 
 stylesheets-remove:
   - core/themes/stable/css/core/vertical-tabs.css

diff --git a/web/themes/joinup/joinup_theme.libraries.yml b/web/themes/joinup/joinup_theme.libraries.yml
@@ -49,3 +49,10 @@ shared_entity:
     - core/jquery
     - core/jquery.once
     - core/drupal
+
+cookie-extend:
+  version: VERSION
+  js:
+    js/cookie-extend.js: {}
+  dependencies:
+    - core/jquery
diff --git a/web/themes/joinup/js/cookie-extend.js b/web/themes/joinup/js/cookie-extend.js
@@ -0,0 +1,13 @@
+/**
+ * @file
+ * Cookie banner extended script.
+ */
+
+(function ($) {
+  // Add custom class if page has cookie banner.
+  $(window).bind("load", function() {
+    if (window.bannerDisplayed) {
+      $('body').addClass('has-cookie-consent-banner');
+    }
+  });
+})(jQuery);
diff --git a/web/themes/joinup/prototype/sass/_mdl-hacks.sass b/web/themes/joinup/prototype/sass/_mdl-hacks.sass
@@ -76,6 +76,9 @@
     .section--content
       flex-grow: 1
       flex-shrink: 0
+  body.has-cookie-consent-banner
+    .mdl-layout__container
+      height: auto
 
 .filters
   .mdl-menu__container