diff --git a/website/assets/images/logo-creative-commons-160x30@2x.png b/website/assets/images/logo-creative-commons-160x30@2x.png new file mode 100644 index 0000000000..e5da159b4b Binary files /dev/null and b/website/assets/images/logo-creative-commons-160x30@2x.png differ diff --git a/website/assets/images/logo-creative-commons-80x15@2x.png b/website/assets/images/logo-creative-commons-80x15@2x.png deleted file mode 100644 index 1d5c817558..0000000000 Binary files a/website/assets/images/logo-creative-commons-80x15@2x.png and /dev/null differ diff --git a/website/assets/images/logo-twitter-32x26@2x.png b/website/assets/images/logo-twitter-32x26@2x.png deleted file mode 100644 index 67f3c1860d..0000000000 Binary files a/website/assets/images/logo-twitter-32x26@2x.png and /dev/null differ diff --git a/website/assets/images/logo-twitter-50x44@2x.png b/website/assets/images/logo-twitter-50x44@2x.png new file mode 100644 index 0000000000..58b92bbfb3 Binary files /dev/null and b/website/assets/images/logo-twitter-50x44@2x.png differ diff --git a/website/assets/styles/layout.less b/website/assets/styles/layout.less index 23a0449cc0..3fb29638d5 100644 --- a/website/assets/styles/layout.less +++ b/website/assets/styles/layout.less @@ -1,4 +1,4 @@ -@footer-height: 288px; +@footer-height: 222px; @container-md-max-width: 1100px; [v-cloak] { display: none; } @@ -208,14 +208,28 @@ html, body { [purpose='footer-container'] { padding-left: 40px; padding-right: 40px; - padding-bottom: 70px; - padding-top: 60px; + padding-bottom: 32px; + padding-top: 40px; + } + + [purpose='footer-bottom'] { + padding-left: 40px; + padding-right: 70px; + } [purpose='footer-nav'] { display: flex; flex-direction: row; } + + [purpose='legal-nav'] { + padding-left: 16px; + display: inline; + font-size: 11px; + line-height: 18px; + text-decoration: underline; + } } body.detected-mobile { @@ -232,40 +246,42 @@ body.detected-mobile { color: #6a67fe; } -@media (max-width: 1199px) { - [purpose='page-wrap'] { - padding-bottom: 404px; - - [purpose='page-footer'] { - height: 404px; - - [purpose='footer-container'] { - padding-bottom: 40px; - } - } - } -} @media (max-width: 767px) { [purpose='page-wrap'] { - padding-bottom: 518px; + padding-bottom: 264px; [purpose='page-footer'] { - height: 518px; + height: 264px; } + } } -@media (max-width: 500px) { +@media (max-width: 575px) { + [purpose='page-wrap'] { + padding-bottom: 371px; + + [purpose='page-footer'] { + height: 371px; + } + } +} + +@media (max-width: 490px) { [purpose='page-wrap'] { - padding-bottom: 728px; + padding-bottom: 581px; [purpose='page-footer'] { - height: 728px; + height: 581px; [purpose='footer-nav'] { display: block; } + [purpose='legal-nav'] { + padding-left: 0px; + display: block; + } } } } diff --git a/website/config/routes.js b/website/config/routes.js index 098a795231..0208159b62 100644 --- a/website/config/routes.js +++ b/website/config/routes.js @@ -160,6 +160,7 @@ module.exports.routes = { 'GET /apply': 'https://fleet-device-management.breezy.hr', 'GET /company/stewardship': 'https://github.com/fleetdm/fleet', // FUTURE: page about how we approach open source and our commitments to the community 'GET /legal/terms': 'https://docs.google.com/document/d/1OM6YDVIs7bP8wg6iA3VG13X086r64tWDqBSRudG4a0Y/edit', + 'GET /legal/privacy': 'https://docs.google.com/document/d/17i_g1aGpnuSmlqj35-yHJiwj7WRrLdC_Typc1Yb7aBE/edit', // ╦ ╦╔═╗╔╗ ╦ ╦╔═╗╔═╗╦╔═╔═╗ diff --git a/website/views/layouts/layout.ejs b/website/views/layouts/layout.ejs index 50789161fa..b585d7d505 100644 --- a/website/views/layouts/layout.ejs +++ b/website/views/layouts/layout.ejs @@ -123,61 +123,68 @@ <%- body %> -