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.

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

Check pending prod changes #1089

Merged
merged 10 commits into from
Jun 11, 2024
4 changes: 2 additions & 2 deletions foundation/features/templates/feature_plugin.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<section class="sect sect-updates -tighten-1 -has-bg-circle -bg-circle-okfn-yellow before:-translate-x-1/2 before:-translate-y-1/2 mb-20">
<section class="sect -tighten-1 -has-bg-circle -bg-circle-okfn-yellow before:-translate-x-1/2 before:-translate-y-1/2 mb-20">
<div class="sect__content">
<h2 class="mb-8 font-bold text-h1 leading-none">Latest <br> updates</h2>
<div class="content-grid">
Expand All @@ -9,7 +9,7 @@ <h2 class="mb-8 font-bold text-h1 leading-none">Latest <br> updates</h2>
<figure class="{{ figureClassName }}">
<img src="/images/{{ image }}" alt="">
</figure>

{% if feature.title %}
<h3 class="title block mb-8 font-bold text-2xl">{{ feature.title }}</h3>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% load cms_tags %}
<div class="sect -tighten-2 sect-generic {{ has_bg_circle }} {{ instance.size }} {{ instance.color }} {{ css_translate }} mb-20">
<div class="sect -tighten-2 {{ has_bg_circle }} {{ instance.size }} {{ instance.color }} {{ css_translate }} mb-20">
<div class="sect__content">
<div class="slider-wrapper -mx-12">
<div class="slider" data-slider="{ cssEase: 'linear', slidesToShow: 1, slidesToScroll: 1 }" data-slider-mobile="{ cssEase: 'linear', slidesToShow: 1, slidesToScroll: 1 }">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<section class="sect sect-features -tighten-1 mb-20">
<section class="sect -tighten-1 mb-20">
<div class="sect__content">
{% if instance.show_title %}
<h2 class="mb-20 text-h1 text-center font-bold leading-none">{{ instance.title | safe }}</h2>
Expand Down
4 changes: 2 additions & 2 deletions foundation/okfplugins/gallery/templates/gallery_plugin.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% load cms_tags %}
<!-- Slider-->
{% if instance.gallery_type == 'image_slider' %}
<section class="sect sect-gallery true-w-full {{ has_bg_circle }} {{ instance.size }} {{ instance.color }} {{ css_translate }} -mt-20 mb-20">
<section class="sect true-w-full {{ has_bg_circle }} {{ instance.size }} {{ instance.color }} {{ css_translate }} -mt-20 mb-20">
<div class="sect__content overflow-hidden">
<div class="slider-wrapper">
<div class="slider -is-width-auto" data-slider="{ autoplay: true, autoplaySpeed: 0, arrows: false, cssEase: 'linear', slidesToShow: 1, slidesToScroll: 1, speed: 9000, variableWidth: true, draggable: true, pauseOnHover: true }" data-slider-mobile="{ autoplay: true, autoplaySpeed: 0, arrows: false, cssEase: 'linear', slidesToShow: 1, slidesToScroll: 1, speed: 9000, variableWidth: true, draggable: true, pauseOnHover: true }">
Expand All @@ -14,7 +14,7 @@
</section>
<!-- Static Logo-->
{% elif instance.gallery_type == 'logo_static' %}
<section class="sect sect-generic -tighten-1 {{ has_bg_circle }} {{ instance.size }} {{ instance.color }} {{ css_translate }} mx-auto mb-20 text-center">
<section class="sect -tighten-1 {{ has_bg_circle }} {{ instance.size }} {{ instance.color }} {{ css_translate }} mx-auto mb-20 text-center">
<div class="sect__content">
<h3 class="py-6 mb-20 text-2xl font-bold">{{instance.title}}</h3>
<div class="grid grid-cols-2 md:grid-cols-4 lg:grid-cols-5 items-center gap-x-2.5 gap-y-10 mb-20">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% load cms_tags %}
<div class="sect -tighten-1 sect-generic mb-20">
<div class="sect -tighten-1 mb-20">
<div class="sect__content">
<div class="grid {{ grid_cols_class }} gap-10 md:gap-3">
<!--TODO: col-span-{n} did not work, so forloop is used instead-as a quick fix -->
Expand Down
6 changes: 3 additions & 3 deletions foundation/okfplugins/header/templates/header_plugin.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- hero -->
{% if instance.header_type == 'h1' %}
<section class="sect sect-hero {{ has_bg_circle }} {{ instance.size }} {{ instance.color }} {{ css_translate }}">
<section class="sect {{ has_bg_circle }} {{ instance.size }} {{ instance.color }} {{ css_translate }}">
<div class="page-opening mb-20 mt-20">
<h1 class="title">{{ instance.title }}</h1>
<div class="image">
Expand All @@ -12,7 +12,7 @@ <h1 class="title">{{ instance.title }}</h1>
</div>
</section>
{% elif instance.header_type == 'h2' %}
<section class="sect sect-hero mb-20 {{ has_bg_circle }} {{ instance.size }} {{ instance.color }} {{ css_translate }}">
<section class="sect mb-20 {{ has_bg_circle }} {{ instance.size }} {{ instance.color }} {{ css_translate }}">
<div class="sect__content">
<div class="lg:flex lg:gap-x-8 lg:items-center md:flex-row-reverse">
<div class="flex-shrink-0">
Expand All @@ -30,7 +30,7 @@ <h1 class="text-h1 !leading-tight">
</div>
</section>
{% else %}
<section class="sect sect-hero mb-20 {{ has_bg_circle }} {{ instance.size }} -{{ instance.color }} {{ css_translate }}">
<section class="sect mb-20 {{ has_bg_circle }} {{ instance.size }} -{{ instance.color }} {{ css_translate }}">
<div class="sect__content">
<div class="lg:flex lg:gap-x-8 lg:items-center">
<div class="flex-shrink-0">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- default-->
{% if instance.banner_type == 'default' %}
<section class="sect sect-splash-hero mb-20">
<section class="sect mb-20">
<div class="sect__content">
<div class="flex flex-col-reverse lg:flex-row items-center gap-10 lg:gap-2.5">
<div class="lg:w-8/12">
Expand All @@ -17,7 +17,7 @@ <h1 class="text-h0 !leading-tight">

<!-- section default-->
{% elif instance.banner_type == 'opening_default' %}
<section class="sect sect-hero -tighten-1 mx-auto -has-bg-circle -bg-circle-okfn-purple -bg-circle-lg mb-20">
<section class="sect -tighten-1 mx-auto -has-bg-circle -bg-circle-okfn-purple -bg-circle-lg mb-20">
<div class="sect__content">
<div class="lg:flex lg:gap-x-8 lg:items-center md:flex-row-reverse md:!gap-x-28">
<div class="flex-shrink-0">
Expand All @@ -36,7 +36,7 @@ <h2 class="mb-8 font-bold text-h1 leading-none">{{ instance.title | safe}}</h2>

<!-- section center-->
{% elif instance.banner_type == 'opening_center' %}
<section class="sect sect-library md:!col-start-5 md:!col-end-9 -has-bg-circle -bg-circle-lg -bg-circle-okfn-green before:top-1/2 before:left-1/2 before:-translate-y-1/2 mb-20 text-center">
<section class="sect md:!col-start-5 md:!col-end-9 -has-bg-circle -bg-circle-lg -bg-circle-okfn-green before:top-1/2 before:left-1/2 before:-translate-y-1/2 mb-20 text-center">
<div class="sect__content">
<img src="/assets/images/home-sect-library.png" src="{{ instance.image.url }}" alt="{{ instance.image_alt }}">
<h2 class="mb-8 font-bold text-h1 leading-none">{{ instance.title | safe }}</h2>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- sect-newsletter -->
{% if instance.campaign_type == 'campaign' %}
<section class="sect sect-campaign -tighten-1 mb-20">
<section class="sect -tighten-1 mb-20">
<div class="sect__content">
<div class="lg:flex lg:items-center lg:gap-16">
<img class="mx-auto mb-10 lg:mb-0 lg:flex-shrink-0 max-w-[15rem] lg:max-w-[31.625rem]" src="{% if instance.image %}{{ instance.image.url }}{% else %}/assets/img/call-to-action-newsletter.svg{% endif %}" alt="{{ instance.image_alt }}">
Expand All @@ -22,7 +22,7 @@ <h2 class="mb-5 text-h1 leading-none font-bold">{{ instance.heading|safe}}</h2>
</div>
</section>
{% elif instance.campaign_type == 'small' %}
<section class="sect sect-call-to-action-medium mb-20">
<section class="sect mb-20">
<div class="sect__content">
<div class="grid grid-cols-12 gap-y-10 lg:gap-y-0">
<div class="col-span-full lg:col-start-2 lg:col-end-8 flex items-center lg:pr-4">
Expand All @@ -41,7 +41,7 @@ <h2 class="mr-4 text-okfn-lg leading-none font-mono">Don't miss a thing</h2>
</div>
</section>
{% elif instance.campaign_type == 'medium' %}
<section class="sect sect-call-to-action-medium -tighten-3 mb-20">
<section class="sect -tighten-3 mb-20">
<div class="sect__content">
<div class="flex flex-col justify-center">
<img class="max-w-[15rem] lg:max-w-xs mx-auto mb-10 lg:mb-3" src="{% if instance.image %}{{ instance.image.url }}{% else %}/assets/img/call-to-action-newsletter.svg{% endif %}" alt="{{ instance.image_alt }}">
Expand All @@ -58,7 +58,7 @@ <h2 class="mb-10 text-h1 leading-none font-bold text-center">{{ instance.heading
</div>
</section>
{% else %}
<section class="sect sect-newsletter -tighten-1 mb-20 -has-bg-circle -bg-circle-lg before:top-full before:left-full before:-translate-y-1/2 before:-translate-x-1/2">
<section class="sect -tighten-1 mb-20 -has-bg-circle -bg-circle-lg before:top-full before:left-full before:-translate-y-1/2 before:-translate-x-1/2">
<div class="sect__content">
<div class="lg:flex lg:flex-row-reverse lg:items-center lg:gap-16">
<img class="mx-auto lg:flex-shrink-0" src="/assets/img/section-newsletter.png" alt="">
Expand Down
2 changes: 1 addition & 1 deletion foundation/okfplugins/video/templates/video_plugin.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="sect -tighten-2 sect-generic mb-20">
<div class="sect -tighten-2 mb-20">
<div class="sect__content">
<!-- img-set-video -->
<figure class="img-set -video -is-video" data-play-video="{{ instance.video_id }}">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

{% static_placeholder "Network Group Header" %}
<!-- hero -->
<section class="sect sect-hero mb-20">
<section class="sect mb-20">
<div class="sect__content">
<div class="lg:flex lg:gap-x-8 lg:items-center md:flex-row-reverse">
<div class="flex-shrink-0">
Expand Down
2 changes: 1 addition & 1 deletion requirements.dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
pip-tools==7.3.0
flake8==7.0.0
django-webtest==1.9.11
coverage==7.4.4
coverage==7.5.3
6 changes: 1 addition & 5 deletions requirements.dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,12 @@ build==1.2.1
# via pip-tools
click==8.1.7
# via pip-tools
coverage==7.4.4
coverage==7.5.3
# via -r requirements.dev.in
django-webtest==1.9.11
# via -r requirements.dev.in
flake8==7.0.0
# via -r requirements.dev.in
importlib-metadata==7.1.0
# via build
mccabe==0.7.0
# via flake8
packaging==24.0
Expand Down Expand Up @@ -51,8 +49,6 @@ webtest==3.0.0
# via django-webtest
wheel==0.43.0
# via pip-tools
zipp==3.18.1
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
6 changes: 3 additions & 3 deletions requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ django-countries==7.5.1
django-csp==3.7
django-environ==0.11.2
django-haystack==3.2.1
django-filer==3.1.1
django-filer==3.1.3
django-markdown-deux==1.0.6
django-mptt==0.16.0
django-pagedown==2.2.1
django-reversion==5.0.12
django-sekizai==4.1.0
django-storages==1.14.2
django-storages==1.14.3
django-treebeard==4.7
django-simple-captcha==0.6.0
djangocms-admin-style==3.3.1
Expand All @@ -40,5 +40,5 @@ micawber==0.5.5
# this is a secure version
pillow==10.3.0
psycopg2-binary==2.9.9
requests==2.31.0
requests==2.32.3
whoosh==2.7.4
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ django-csp==3.7
# via -r requirements.in
django-environ==0.11.2
# via -r requirements.in
django-filer==3.1.1
django-filer==3.1.3
# via
# -r requirements.in
# djangocms-picture
Expand Down Expand Up @@ -87,7 +87,7 @@ django-sekizai==4.1.0
# django-cms
django-simple-captcha==0.6.0
# via -r requirements.in
django-storages==1.14.2
django-storages==1.14.3
# via -r requirements.in
django-treebeard==4.7
# via
Expand Down Expand Up @@ -184,7 +184,7 @@ reportlab==4.2.0
# via
# easy-thumbnails
# svglib
requests==2.31.0
requests==2.32.3
# via
# -r requirements.in
# google-api-core
Expand Down
4 changes: 2 additions & 2 deletions templates/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="headline -tighten-1 text-center mb-20">
<h1 class="col-span-full px-3 py-5 font-bold text-center text-h1">We&#x27;re sorry, but the requested page could not be found. If you think there should have been something here, you can try searching for it:</h1>
</div>
<section class="sect sect-features -tighten-1 mb-20">
<section class="sect -tighten-1 mb-20">
<div class="sect__content">
<form action="/search" method="get" class="form">
<div class="input-fake flex items-center">
Expand All @@ -24,7 +24,7 @@ <h1 class="col-span-full px-3 py-5 font-bold text-center text-h1">We&#x27;re sor
</div>
</section>
<!-- sect-newsletter -->
<section class="sect sect-newsletter -tighten-1 mb-20 -has-bg-circle -bg-circle-lg before:top-full before:left-full before:-translate-y-1/2 before:-translate-x-1/2">
<section class="sect -tighten-1 mb-20 -has-bg-circle -bg-circle-lg before:top-full before:left-full before:-translate-y-1/2 before:-translate-x-1/2">
<div class="sect__content">
<div class="lg:flex lg:flex-row-reverse lg:items-center lg:gap-16">
<img class="mx-auto lg:flex-shrink-0" src="/assets/img/section-newsletter.png" alt="">
Expand Down
2 changes: 1 addition & 1 deletion templates/cms/plugins/text.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="sect -tighten-2 sect-generic mb-20">
<div class="sect -tighten-2 mb-20">
<div class="sect__content">
<div class="block-txt">
{{ body|safe }}
Expand Down
2 changes: 1 addition & 1 deletion templates/cms_apphook.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% load cms_tags %}

{% block body %}
<section class="sect sect-features -tighten-1 mb-20">
<section class="sect -tighten-1 mb-20">
<div class="sect__content">
{% block main %}{% endblock %}
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/cms_contact.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

{% block body %}

<section class="sect sect-features -tighten-1 mb-20">
<section class="sect -tighten-1 mb-20">
<div class="sect__content">

<div id="general">
Expand Down
2 changes: 1 addition & 1 deletion templates/djangocms_picture/default/picture.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% load thumbnail l10n %}
<div class="sect -tighten-2 sect-generic mb-20">
<div class="sect -tighten-2 mb-20">
<div class="sect__content">
{% if picture_link %}
<a class="highlight" href="{{ picture_link }}"
Expand Down
2 changes: 1 addition & 1 deletion templates/includes/newsletter.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
-->

<!-- sect-newsletter -->
<section class="sect sect-newsletter -tighten-1 mb-20 -has-bg-circle -bg-circle-lg before:top-full before:left-full before:-translate-y-1/2 before:-translate-x-1/2">
<section class="sect -tighten-1 mb-20 -has-bg-circle -bg-circle-lg before:top-full before:left-full before:-translate-y-1/2 before:-translate-x-1/2">
<div class="sect__content">
<div class="lg:flex lg:flex-row-reverse lg:items-center lg:gap-16">
<img class="mx-auto lg:flex-shrink-0" src="/assets/img/section-newsletter.png" alt="">
Expand Down
2 changes: 1 addition & 1 deletion templates/registration/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% block title %}Login{% endblock %}

{% block body %}
<section class="sect sect-features -tighten-1 mb-20">
<section class="sect -tighten-1 mb-20">
<div class="headline -tighten-1 text-center mb-20">
<h1 class="col-span-full px-3 py-5 font-bold text-center text-h1">Login</h1>
</div>
Expand Down
Loading