From feeaa09e236cd4ee2689a4bfdb01c44f744ebe74 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 21 Nov 2023 11:46:17 +0000 Subject: [PATCH] Bug 34792: Improve flexibility of CookieConsentBar layout This patch makes CSS and markup changes to the CookieConsentBar, in both the OPAC and staff interface, so that the layout of custom text and buttons works better with varying text content and varying browser widths. The patch also adds some JavaScript to the OPAC so that the cookie consent bar interacts better with the language selection footer. When the language selection footer is visible, the cookie consent bar should "stick" to the bottom of the viewport except when the page is scrolled all the way down. When the page is scrolled all the way to the bottom the cookie consent bar should move to the top of the language selection footer. To test, apply the patch and rebuild the OPAC and staff interface CSS. - Go to Administration -> System preferences and enable the CookieConsent preference if necessary. - Follow the link in the preference description to HTML customizations. - Create an HTML customization in the CookieConsentBar display location. Add a paragraph of text. - Go to the OPAC. If you don't see the cookie consent bar at the bottom of the screen you may need to clear your browser cookies and local storage. - Confirm that the text flows well in relation to the buttons: With a lot of text, the text expands to fill the width of the cookie consent bar and the buttons are below. With a small amount of text, the text and buttons should be side by side. - Test that this layout adapts well to various browser widths. - Perform the same tests in the staff interface. Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer --- .../prog/css/src/staff-global.scss | 28 +++++++++++++++---- .../prog/en/includes/intranet-bottom.inc | 4 +-- .../intranet-tmpl/prog/js/cookieconsent.js | 2 +- .../bootstrap/css/src/_responsive.scss | 6 ++++ .../opac-tmpl/bootstrap/css/src/opac.scss | 22 ++++++++++----- .../bootstrap/en/includes/masthead.inc | 4 ++- .../opac-tmpl/bootstrap/js/cookieconsent.js | 21 ++++++++++---- 7 files changed, 64 insertions(+), 23 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index b88f1aad05..808854350d 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -4619,10 +4619,12 @@ div .suggestion_note { /* Cookie consent bar */ #cookieConsentBar { + align-items: center; background: rgba( 0, 0, 0, .7 ); bottom: 0; color: rgba( 255, 255, 255, .9 ); display: none; + flex-wrap: wrap; left: 0; padding: 20px; position: fixed; @@ -4634,16 +4636,23 @@ div .suggestion_note { color: #D7EBFF; } - #consentButtons { - margin-top: 10px; - text-align: right; - } + button { + margin-bottom: .5rem; + margin-top: .5rem; - button:not( :last-child ) { - margin-right: 10px; + &:not( :last-child ) { + margin-right: 10px; + } } } +#consentButtons { + flex-grow: 1; + margin-top: 10px; + text-align: left; + white-space: normal; +} + /* Cookie consent modal */ #cookieConsentModal { .modal-dialog { @@ -4699,6 +4708,13 @@ div .suggestion_note { @import "toolbar"; @import "forms"; +@media only screen and ( min-width: 608px ) { + #consentButtons { + text-align: right; + white-space: nowrap; + } +} + @media ( max-width: 767px ) { .header-menu-link { display: inline-block; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc index 0ddfa53c96..24572c2a3a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc @@ -86,7 +86,7 @@