Skip to content

Commit c303334

Browse files
Merge pull request #20292 from mozilla/FXA-13319
fix(settings): make non-transparent CMS header push page content down
2 parents f88135d + c0d91f3 commit c303334

2 files changed

Lines changed: 11 additions & 4 deletions

File tree

packages/fxa-settings/src/components/AppLayout/index.tsx

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ export const AppLayout = ({
108108
cmsBackgrounds?.header &&
109109
'mobileLandscape:[background:var(--cms-header-bg)]',
110110
// Absolute position so the background-image can optionally show through.
111-
showSplitLayout && 'desktop:absolute'
111+
showSplitLayout && !cmsBackgrounds?.header && 'desktop:absolute'
112112
)}
113113
style={
114114
cmsBackgrounds?.header
@@ -153,7 +153,12 @@ export const AppLayout = ({
153153
</>
154154
) : wrapInCard ? (
155155
<>
156-
<div className={classNames('card', widthClass)}>
156+
<div
157+
className={classNames(
158+
'card mobileLandscape:my-4',
159+
widthClass
160+
)}
161+
>
157162
{children}
158163
</div>
159164
</>
@@ -207,7 +212,9 @@ export const AppLayout = ({
207212
<CardLoadingSpinner />
208213
</section>
209214
) : (
210-
<section className="card">{children}</section>
215+
<section className="card mobileLandscape:my-4">
216+
{children}
217+
</section>
211218
)}
212219
</main>
213220
<footer className="w-full py-2 px-6 tablet:px-10 flex text-grey-400 dark:text-grey-300">

packages/fxa-settings/src/pages/Signin/SigninPasskeyFallback/__snapshots__/index.test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ exports[`SigninPasskeyFallback renders as expected 1`] = `
3737
>
3838
<section>
3939
<div
40-
class="card"
40+
class="card mobileLandscape:my-4"
4141
>
4242
<span
4343
data-testid="ftlmsg-mock"

0 commit comments

Comments
 (0)