From 066655c1012330184cb5305ea7eef5dbe4fa5d1c Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Thu, 23 Nov 2023 22:29:34 -0700 Subject: [PATCH] Mainly finish making design responsive --- new/index.html | 14 +++++++----- new/resources/css/common.css | 1 + new/resources/css/features.css | 33 ++++++++++++++++++++-------- new/resources/css/marketing.css | 34 ++++++++++------------------ new/resources/css/sponsor.css | 39 ++++++++++++++++++++++++++++++++- new/sponsor.html | 2 +- 6 files changed, 84 insertions(+), 39 deletions(-) diff --git a/new/index.html b/new/index.html index 42f77dd..87fe301 100644 --- a/new/index.html +++ b/new/index.html @@ -163,12 +163,14 @@ -
-

sponsored by users like you

-

- Caddy is free software and relies on sponsorships to survive. Not just donations: sponsorships ensure ongoing development and provide your business with tangible benefits. -

- See sponsorships +
+
+

sponsored by users like you

+

+ Caddy is free software and relies on sponsorships to survive. Not just donations: sponsorships ensure ongoing development and provide your business with tangible benefits. +

+ See sponsorships +
diff --git a/new/resources/css/common.css b/new/resources/css/common.css index f2cb155..e86e4ca 100644 --- a/new/resources/css/common.css +++ b/new/resources/css/common.css @@ -581,6 +581,7 @@ footer .nostalgia-badges { justify-content: center; width: 100%; display: flex; + flex-wrap: wrap; } footer .nostalgia p { diff --git a/new/resources/css/features.css b/new/resources/css/features.css index f011558..c6a30c7 100644 --- a/new/resources/css/features.css +++ b/new/resources/css/features.css @@ -3,6 +3,10 @@ padding-bottom: 50px; } +h3 { + margin-left: 0; +} + /* .datagrid { display: flex; flex-wrap: wrap; @@ -45,7 +49,6 @@ .feature-row { display: grid; - grid: auto / 1fr 2fr 1fr; gap: 2em; padding: 2em 0; border-bottom: 2px dashed #a4c8ff25; /* #e6eaf0 */ @@ -105,11 +108,10 @@ flex: 1; margin-right: 50px; min-width: 0; - min-width: 300px; } -.split img { - max-width: 100%; +.split picture { + min-width: 0; } .split img, @@ -122,13 +124,26 @@ -/* TODO: Figure this out */ -@media (max-width: 800px) { - .feature-row { - grid: repeat(3,auto) / 1fr 1fr; - } + + +@media (min-width: 600px) and (max-width: 899px) { + .feature-row .detail { + grid-area: 1/2/span 3/2; + } .feature-row .benefits { grid-area: 2 / 1; } +} + +@media (min-width: 600px) { + .feature-row { + grid: repeat(3,auto) / 1fr 1fr; + } +} + +@media (min-width: 900px) { + .feature-row { + grid: auto / 1fr 2fr 1fr; + } } \ No newline at end of file diff --git a/new/resources/css/marketing.css b/new/resources/css/marketing.css index 18dd1e2..64ec87c 100644 --- a/new/resources/css/marketing.css +++ b/new/resources/css/marketing.css @@ -218,23 +218,6 @@ section.light.gray { line-height: 1.65; } -.sides { - display: flex; - gap: 50px; - align-items: center; - margin: 100px 0; -} - -.sides > * { - flex: 1; -} - -.side-flex { - display: flex; - gap: 2em; - flex: 1.5; -} - .cols, .spacing { --gap: 50px; @@ -259,16 +242,13 @@ section.dark .cols { color: #aec6c3; } + .cols .col { min-width: 350px; padding-left: 1em; flex: 1; } -.cols-big .col { - min-width: 450px; -} - h3 { font-weight: 600; font-size: 20px; @@ -366,6 +346,10 @@ section.dark h3.yellow { max-width: none; } +.asides h3 { + margin-left: 0; +} + .asides p { margin-left: 0; margin-right: 0; @@ -650,10 +634,16 @@ div.ap-wrapper:fullscreen div.ap-player { } @media (max-width: 1000px) { + h1, + h2 { + overflow-wrap: anywhere; + } + h1 { + font-size: 75px; + } .asides { flex-direction: column; } - .display { margin-top: 50px; margin-bottom: 50px; diff --git a/new/resources/css/sponsor.css b/new/resources/css/sponsor.css index 3828132..bfdab35 100644 --- a/new/resources/css/sponsor.css +++ b/new/resources/css/sponsor.css @@ -7,7 +7,7 @@ p.footnote { --plan-border: 1px solid #eceff133; border: var(--plan-border); border-radius: 10px; - width: 50%; + flex: 1; display: flex; flex-direction: column; } @@ -193,4 +193,41 @@ ul.check li.minus::before { .button.purple { position: relative; z-index: 2; +} + + + + +.sides { + display: flex; + gap: 50px; + align-items: center; + margin: 100px 0; +} + +.sides > * { + flex: 1; +} + +.side-flex { + display: flex; + gap: 2em; + flex: 1.5; +} + + + + + + +@media (max-width: 1150px) { + .sides { + flex-direction: column; + } +} + +@media (max-width: 700px) { + .side-flex { + flex-direction: column; + } } \ No newline at end of file diff --git a/new/sponsor.html b/new/sponsor.html index 481a37d..e0c1e0a 100644 --- a/new/sponsor.html +++ b/new/sponsor.html @@ -481,7 +481,7 @@

The original author of Caddy, Matt Holt, operates Dyanim, LLC to maintain the project and direct development alongside a global community. Sponsorships are fulfilled by Dyanim, LLC.

-
+

Are these software licenses?