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

New newsletter design #634

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

- Fix following cache issue [#631](https://github.com/datagouv/udata-front/pull/631)
- Add dataservice search to header [#622](https://github.com/datagouv/udata-front/pull/622)
- New footer newsletter design [#634](https://github.com/datagouv/udata-front/pull/634)

## 6.0.7 (2024-12-20)

Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
@import (less) "@gouvfr/dsfr/dist/component/follow/follow.css";

.fr-follow {
.fr-h4 {
--text-title-grey: @text-label-blue-cumulus;
}
p.fr-text--alt {
color: @text-label-blue-cumulus;
}
--background-alt-blue-france: var(--background-default-grey);
--background-alt-blue-france-hover: var(--background-default-grey-hover);
--background-alt-blue-france-active: var(--background-default-grey-active);
--border-default-blue-france: @grey-125;
}

.follow-button {
Expand Down
4 changes: 4 additions & 0 deletions udata_front/theme/gouvfr/assets/less/content/typography.less
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ h6,
font-weight: bold;
}

.font-800 {
font-weight: 800 !important;
}

.sup {
display: inline-block;
font-weight: 300;
Expand Down
9 changes: 9 additions & 0 deletions udata_front/theme/gouvfr/assets/less/font.less
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,12 @@

font-display: swap;
}

@font-face {
font-weight: 800;
font-family: Marianne;
src: url("../fonts/Marianne-ExtraBold.woff2") format("woff2"),
url("../fonts/Marianne-ExtraBold.woff") format("woff");

font-display: swap;
}
4 changes: 0 additions & 4 deletions udata_front/theme/gouvfr/assets/less/specific/footer.less
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
@import (less) "@gouvfr/dsfr/dist/component/footer/footer.css";

.fr-footer {
--border-plain-blue-france: @blue-400;
}

.fr-footer__top-link {
&:extend(a.unstyled);
}
Expand Down
10 changes: 5 additions & 5 deletions udata_front/theme/gouvfr/templates/newsletter.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% cache cache_duration, 'newsletter', g.lang_code|default(config.DEFAULT_LANGUAGE)|string %}
<div class="fr-follow">
<div class="fr-follow border-top">
<div class="fr-container">
<div class="fr-grid-row">
<div class="fr-col-12 fr-col-md-8 flex">
Expand All @@ -8,15 +8,15 @@
</div>
<div class="fr-follow__newsletter fr-col">
<div>
<p class="fr-h4">{{ _("Subscribe to our newsletter") }}</p>
<p class="fr-text--lg fr-text--alt f-italic">{{
<p class="fr-h4 font-800 fs-xl fr-mb-1v">{{ _("Subscribe to our newsletter") }}</p>
<p class="fr-text--lg">{{
_("To stay up to date about {site} and open data news, subscribe to our newsletter and follow our events.")
.format(site=current_site.title)
}}</p>
</div>
<div>
<a
class="fr-btn fr-mr-2w fr-my-1w"
class="fr-btn fr-mr-2w"
title="{{ _('Subscribe to our newsletter') }}"
href="{{ config.NEWSLETTER_SUBSCRIPTION_URL }}"
>
Expand All @@ -34,7 +34,7 @@
</div>
<div class="fr-col-12 fr-col-md-4">
<div class="fr-follow__social">
<p class="fr-h5">{{ _("Follow us") }}
<p class="fr-h5 font-800 fs-xl">{{ _("Follow us") }}
<br> {{ _("on social media") }}
</p>
<ul class="fr-links-group">
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.