Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace wrapper--cookieconsent with tailwind classes #4301

Merged
merged 4 commits into from
Dec 31, 2024
Merged

Replace wrapper--cookieconsent with tailwind classes #4301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3fb177a
Replace wrapper--cookieconsent with twailwind
theskumar Dec 20, 2024
dccb8d5
Remove unused wrapper--relative
theskumar Dec 20, 2024
745a47b
Remove unused wrapper--mediaboxes
theskumar Dec 20, 2024
1139360
Remove 'card--reviewer' class
theskumar Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 49 additions & 10 deletions hypha/cookieconsent/templates/includes/banner.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,42 @@
{% load i18n wagtailcore_tags %}

{% 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__brief">
<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">
{{ settings.cookieconsent_message|richtext }}
</div>

<div class="cookieconsent__actions">
{% 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--accept lg:ms-[20px]" title="{% trans 'Accept tracking cookies.' %}" type="button" data-consent="accept">{% trans 'Accept all' %}</button>
<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--accept lg:ms-[20px]"
title="{% trans 'Accept tracking cookies.' %}"
type="button"
data-consent="accept"
>{% trans 'Accept all' %}</button>
{% 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 %}
<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>
Expand All @@ -25,6 +45,7 @@ <h2 class="cookieconsent__title">{% trans settings.cookieconsent_title %}</h2>
<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>
</div>

<div class="cookieconsent__info-wrapper">
<div class="cookieconsent__info">
<p class="font-semibold">{% trans "Essential Cookies" %}</p>
Expand All @@ -38,14 +59,32 @@ <h2 class="cookieconsent__title">{% trans settings.cookieconsent_title %}</h2>
</div>
{% endif %}
</div>

<div class="cookieconsent__actions">
{% 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--accept lg:ms-[20px]" title="{% trans 'Accept tracking cookies.' %}" type="button" data-consent="accept">{% trans 'Accept all' %}</button>
<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--accept lg:ms-[20px]"
title="{% trans 'Accept tracking cookies.' %}"
type="button"
data-consent="accept"
>{% trans 'Accept all' %}</button>
{% 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 %}
<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>
Expand Down
4 changes: 0 additions & 4 deletions hypha/static_src/sass/components/_card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,4 @@
margin-inline-start: 1rem;
}
}

&__reviewer {
margin-inline-start: 10px;
}
}
15 changes: 0 additions & 15 deletions hypha/static_src/sass/components/_wrapper.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@
background-color: var(--color-bg-default);
}

&--media-boxes {
max-width: 1220px;
padding: 0 20px;
margin: 0 auto;
}

&--embed {
width: 100%;
height: 100%;
Expand Down Expand Up @@ -210,10 +204,6 @@
}
}

&--relative {
position: relative;
}

&--activity-feed {
padding: 0 20px;
margin-block-start: 50px;
Expand Down Expand Up @@ -263,9 +253,4 @@
flex: 1;
}
}

&--cookieconsent {
padding: 40px 20px;
z-index: 20;
}
}
Loading