diff --git a/config/_default/config.toml b/config/_default/config.toml index b92697bc0c..199da51a1c 100644 --- a/config/_default/config.toml +++ b/config/_default/config.toml @@ -17,7 +17,6 @@ assetDir = "src" site_banner_enabled = false github_username = "letsencrypt" -mastodon_username = "letsencrypt" linkedin_url = "https://www.linkedin.com/company/lets-encrypt/" crowdfunding_url = "https://www.generosity.com/community-fundraising/make-a-more-secure-web-with-let-s-encrypt" diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index c72ff59bf4..7d00250dab 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -16,9 +16,6 @@ {{ partial "header" . }} {{ block "main" . }}{{ end }} - {{ if .Page.Params.should_display_prominent_newsletter_form }} - {{ partial "newsletter-form" . }} - {{ end }} {{ partial "footer" . }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 30cc9fd41c..e481700bef 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -29,7 +29,7 @@ {{- range .Page.Translations -}} {{- if eq "en" .Language.Lang -}} {{- $currentpage_en := .Page -}} - + {{- if.Page.Params.show_lastmod -}} {{- partial "lastmod" . -}} {{- end -}} @@ -81,11 +81,11 @@ {{- i18n "english_is_canonical" | safeHTML -}} {{- end -}} - + {{- if.Page.Params.show_lastmod -}} {{- partial "lastmod" . -}} {{- end -}} - + {{- partial "outdated_translation" . -}} {{- $scratch := newScratch -}} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 4ba4ab73a1..1b633dea98 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,3 +1,12 @@ +{{ if and (ne .Section "documents") (.Page.Params.display_newsletter_embed) }} +
+
+ {{ partial "newsletter-form" . }} +
+
+{{ end }} + + {{ if and (ne .Section "docs") (ne .Section "documents") (not .Params.no_donate_footer) }} - -
{{ i18n "footer_policies" | safeHTML }}
- {{ if not .Page.Params.should_display_prominent_newsletter_form }} + {{ if and (not .Page.Params.should_display_prominent_newsletter_form) (not .Page.Params.display_newsletter_embed) }}
{{ i18n "subscribe_to_newsletter_headline" }}
{{ partial "newsletter-form" . }} {{ end }} diff --git a/layouts/partials/newsletter-embed.html b/layouts/partials/newsletter-embed.html new file mode 100644 index 0000000000..45a0d7b8c5 --- /dev/null +++ b/layouts/partials/newsletter-embed.html @@ -0,0 +1,8 @@ + +
+ +
\ No newline at end of file diff --git a/layouts/partials/newsletter-form.html b/layouts/partials/newsletter-form.html index 4477530fb3..68a3d4ea0a 100644 --- a/layouts/partials/newsletter-form.html +++ b/layouts/partials/newsletter-form.html @@ -1,3 +1,12 @@ -
- -
\ No newline at end of file + + \ No newline at end of file diff --git a/src/css/_layout.scss b/src/css/_layout.scss index 7dcc8c5eee..099117d480 100644 --- a/src/css/_layout.scss +++ b/src/css/_layout.scss @@ -299,50 +299,17 @@ html[dir="rtl"] .social-media-list { .footer-col-wrapper { font-size: 15px; color: $text-color; - margin-left: -$spacing-unit / 2; - @extend %clearfix; -} + display: grid; + grid-template-columns: repeat(2, 1fr); + gap: $spacing-unit; -.footer-col { - float: left; - margin-bottom: $spacing-unit / 2; - padding-left: $spacing-unit / 2; -} - -/* 2 Column Version -.footer-col-1 { - width: -webkit-calc(35% - (#{$spacing-unit} / 2)); - width: calc(35% - (#{$spacing-unit} / 2)); -} - -.footer-col-2 { - width: -webkit-calc(65% - (#{$spacing-unit} / 2)); - width: calc(65% - (#{$spacing-unit} / 2)); -} - -@include media-query($on-laptop) { - .footer-col-1, - .footer-col-2 { - width: -webkit-calc(50% - (#{$spacing-unit} / 2)); - width: calc(50% - (#{$spacing-unit} / 2)); + @include media-query($on-palm) { + grid-template-columns: 1fr; } } -*/ - -// 3 column version - -.footer-col-1 { - width: -webkit-calc(25% - (#{$footer-spacing-unit} / 3)); - width: calc(25% - (#{$footer-spacing-unit} / 3)); -} -.footer-col-2 { - width: -webkit-calc(40% - (#{$footer-spacing-unit} / 3)); - width: calc(40% - (#{$footer-spacing-unit} / 3)); -} -.footer-col-3 { - width: -webkit-calc(33.3% - (#{$footer-spacing-unit} / 3)); - width: calc(33.3% - (#{$footer-spacing-unit} / 3)); +.footer-col { + margin-bottom: $spacing-unit / 2; } .footer-newsletter-col { @@ -360,25 +327,6 @@ html[dir="rtl"] .social-media-list { } } -@include media-query($on-laptop) { - .footer-col-1, - .footer-col-2, - .footer-col-3 { - width: -webkit-calc(33.3% - (#{$footer-spacing-unit} / 3)); - width: calc(33.3% - (#{$footer-spacing-unit} / 3)); - } -} - -@include media-query($on-palm) { - .footer-col { - float: none; - width: -webkit-calc(100% - (#{$footer-spacing-unit} / 3)); - width: calc(100% - (#{$footer-spacing-unit} / 3)); - } -} - - - /** * Page content */ diff --git a/src/css/main.scss b/src/css/main.scss index a521914dab..9c6e615003 100644 --- a/src/css/main.scss +++ b/src/css/main.scss @@ -128,6 +128,12 @@ div[data-netlify-site-id] { } } +.newsletter-form-wrapper { + border: 1px solid #ccc; + border-radius: 10px; + padding: 20px; +} + // Import partials from `sass_dir` (defaults to `_sass`) @import "fonts", "pure", "pure-fix", "base", "layout", "nav",