Skip to content
Snippets Groups Projects
Unverified Commit 0846f657 authored by Saurabh Kumar's avatar Saurabh Kumar Committed by GitHub
Browse files

Replace wrapper--cookieconsent with tailwind classes (#4301)

- One less scss rule, removes extra px to allow for better spacing in
mobile view + html wrapping
- Remove unused `wrapper--relative`
- Remove unused `wrapper--media-boxes` 
- Remove unused `card--reviewers`
parent 556a8487
No related branches found
No related tags found
1 merge request!110v5.23.0 upstream merge!
{% load i18n wagtailcore_tags %} {% load i18n wagtailcore_tags %}
{% if show_banner %} {% if show_banner %}
<div class="wrapper wrapper--cookieconsent cookieconsent"> <div class="cookieconsent w-full z-20 py-8">
<div class="cookieconsent__content"> <div class="cookieconsent__content">
<div class="cookieconsent__brief"> <div class="cookieconsent__brief">
<div> <div>
<h2 class="cookieconsent__title">{% trans settings.cookieconsent_title %}</h2> <h2 class="cookieconsent__title">
{% trans settings.cookieconsent_title %}
</h2>
<div class="cookieconsent__message rich-text"> <div class="cookieconsent__message rich-text">
{{ settings.cookieconsent_message|richtext }} {{ settings.cookieconsent_message|richtext }}
</div> </div>
<div class="cookieconsent__actions"> <div class="cookieconsent__actions">
{% if settings.cookieconsent_analytics %} {% if settings.cookieconsent_analytics %}
<button class="button button--cookieconsent button--decline" title="{% trans 'Decline tracking cookies.' %}" type="button" data-consent="decline">{% trans 'Essential only' %}</button> <button class="button button--cookieconsent button--decline"
<button class="button button--cookieconsent button--accept lg:ms-[20px]" title="{% trans 'Accept tracking cookies.' %}" type="button" data-consent="accept">{% trans 'Accept all' %}</button> title="{% trans 'Decline tracking cookies.' %}"
type="button"
data-consent="decline"
>{% trans 'Essential only' %}</button>
<button class="button button--cookieconsent button--accept lg:ms-[20px]"
title="{% trans 'Accept tracking cookies.' %}"
type="button"
data-consent="accept"
>{% trans 'Accept all' %}</button>
{% else %} {% else %}
<button class="button button--cookieconsent button--accept" title="{% trans 'Acknowledge use of essential cookies.' %}" data-consent="ack">{% trans 'Ok' %}</button> <button class="button button--cookieconsent button--accept"
title="{% trans 'Acknowledge use of essential cookies.' %}"
data-consent="ack"
>{% trans 'Ok' %}</button>
{% endif %} {% endif %}
<button class="button button--cookieconsent button--learn-more lg:ms-[20px]" title="{% trans 'Learn more about specific cookies used.' %}" show-learn-more="true">{% trans 'Learn More' %}</button>
<button class="button button--cookieconsent button--learn-more lg:ms-[20px]"
title="{% trans 'Learn more about specific cookies used.' %}"
show-learn-more="true"
>{% trans 'Learn More' %}</button>
</div> </div>
</div> </div>
</div> </div>
...@@ -25,6 +45,7 @@ ...@@ -25,6 +45,7 @@
<div class="cookieconsent__statement"> <div class="cookieconsent__statement">
<p>{% trans "This Website uses cookies. Below you can select the categories of cookies to allow when you use our website and services." %}</p> <p>{% trans "This Website uses cookies. Below you can select the categories of cookies to allow when you use our website and services." %}</p>
</div> </div>
<div class="cookieconsent__info-wrapper"> <div class="cookieconsent__info-wrapper">
<div class="cookieconsent__info"> <div class="cookieconsent__info">
<p class="font-semibold">{% trans "Essential Cookies" %}</p> <p class="font-semibold">{% trans "Essential Cookies" %}</p>
...@@ -38,14 +59,32 @@ ...@@ -38,14 +59,32 @@
</div> </div>
{% endif %} {% endif %}
</div> </div>
<div class="cookieconsent__actions"> <div class="cookieconsent__actions">
{% if settings.cookieconsent_analytics %} {% if settings.cookieconsent_analytics %}
<button class="button button--cookieconsent button--decline" title="{% trans 'Decline tracking cookies.' %}" type="button" data-consent="decline">{% trans 'Essential only' %}</button> <button class="button button--cookieconsent button--decline"
<button class="button button--cookieconsent button--accept lg:ms-[20px]" title="{% trans 'Accept tracking cookies.' %}" type="button" data-consent="accept">{% trans 'Accept all' %}</button> title="{% trans 'Decline tracking cookies.' %}"
type="button"
data-consent="decline"
>{% trans 'Essential only' %}</button>
<button class="button button--cookieconsent button--accept lg:ms-[20px]"
title="{% trans 'Accept tracking cookies.' %}"
type="button"
data-consent="accept"
>{% trans 'Accept all' %}</button>
{% else %} {% else %}
<button class="button button--cookieconsent button--accept" title="{% trans 'Acknowledge use of essential cookies.' %}" data-consent="ack">{% trans 'Ok' %}</button> <button class="button button--cookieconsent button--accept"
title="{% trans 'Acknowledge use of essential cookies.' %}"
data-consent="ack"
>{% trans 'Ok' %}</button>
{% endif %} {% endif %}
<button class="button button--cookieconsent button--learn-more lg:ms-[20px]" title="{% trans 'Return to main cookie menu.' %}" show-learn-more="false" tabindex="-1">{% trans 'Back' %}</button>
<button class="button button--cookieconsent button--learn-more lg:ms-[20px]"
title="{% trans 'Return to main cookie menu.' %}"
show-learn-more="false"
tabindex="-1"
>{% trans 'Back' %}</button>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -39,8 +39,4 @@ ...@@ -39,8 +39,4 @@
margin-inline-start: 1rem; margin-inline-start: 1rem;
} }
} }
&__reviewer {
margin-inline-start: 10px;
}
} }
...@@ -31,12 +31,6 @@ ...@@ -31,12 +31,6 @@
background-color: var(--color-bg-default); background-color: var(--color-bg-default);
} }
&--media-boxes {
max-width: 1220px;
padding: 0 20px;
margin: 0 auto;
}
&--embed { &--embed {
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -210,10 +204,6 @@ ...@@ -210,10 +204,6 @@
} }
} }
&--relative {
position: relative;
}
&--activity-feed { &--activity-feed {
padding: 0 20px; padding: 0 20px;
margin-block-start: 50px; margin-block-start: 50px;
...@@ -263,9 +253,4 @@ ...@@ -263,9 +253,4 @@
flex: 1; flex: 1;
} }
} }
&--cookieconsent {
padding: 40px 20px;
z-index: 20;
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment