From 0c49fac5f78a9148a40337f70b0cef94a482114f Mon Sep 17 00:00:00 2001 From: Djordje Vlaisavljevic Date: Wed, 17 Aug 2022 21:17:25 +0200 Subject: [PATCH] Updated new/edit offer form design refs https://github.com/TryGhost/Team/issues/1811 --- ghost/admin/app/styles/layouts/offers.css | 20 ++++++++++++++++---- ghost/admin/app/styles/layouts/settings.css | 14 ++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/ghost/admin/app/styles/layouts/offers.css b/ghost/admin/app/styles/layouts/offers.css index 3e46eecfbd..d2649aedf1 100644 --- a/ghost/admin/app/styles/layouts/offers.css +++ b/ghost/admin/app/styles/layouts/offers.css @@ -175,6 +175,10 @@ margin-left: 24px; } +.gh-offer-trial-duration .form-group { + margin-bottom: 0; +} + .gh-offer-trial-duration .trial-duration::before { position: absolute; content: "days"; @@ -186,7 +190,7 @@ } .gh-offer-trial-info { - margin: 4px 0 0; + margin: 8px 0 0; color: #738393; font-size: 1.25rem; font-weight: 400; @@ -403,9 +407,13 @@ grid-column-gap: 0px; } - .gh-offer-duration .form-group { + .gh-offer-duration .form-group, .gh-offer-tier-and-trial > .form-group { margin-bottom: 1.6em; } + + .gh-offer-trial-duration .form-group { + margin-bottom: 0; + } } @media (max-width: 1280px) { @@ -462,7 +470,7 @@ grid-column-gap: 24px; } - .gh-offer-duration .form-group { + .gh-offer-duration .form-group, .gh-offer-tier-and-trial > .form-group { margin-bottom: 0; } } @@ -526,9 +534,13 @@ grid-column-gap: 0px; } - .gh-offer-duration .form-group { + .gh-offer-duration .form-group, .gh-offer-tier-and-trial > .form-group { margin-bottom: 1.6em; } + + .gh-offer-trial-duration .form-group { + margin-bottom: 0; + } } @media (max-width: 1000px) { diff --git a/ghost/admin/app/styles/layouts/settings.css b/ghost/admin/app/styles/layouts/settings.css index b9cf347a98..b4cc0b6169 100644 --- a/ghost/admin/app/styles/layouts/settings.css +++ b/ghost/admin/app/styles/layouts/settings.css @@ -2412,6 +2412,11 @@ p.theme-validation-details { grid-gap: 32px; } +.gh-settings-members-pricetrialcont .trial-docs-link { + color: #30cf43; + white-space: nowrap; +} + .gh-settings-members-pricelabelcont { display: flex; align-items: baseline; @@ -2662,6 +2667,15 @@ p.theme-validation-details { color: var(--red); } +@media (max-width: 1080px) { + .gh-settings-members-pricetrialcont { + display: grid; + grid-template-columns: none; + grid-gap: 0px; + margin-bottom: 24px; + } +} + @media (max-width: 500px) { .gh-members-stripe-info-header { flex-direction: column;