WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 50b350f

Browse files
committed
style(settings): General style updates
Because: * Switching design to text-start default instead of text-center * Some images were cut off on mobile This commit: * Update style for AppLayout * Update image styling * Various tweaks to accomodate change to text-start * Set size for Mozilla logo in Storybook sidebar * Replace placeholder image used in storybooks * Increase spacing below primary buttons Closes #FXA-10613
1 parent 6a04b30 commit 50b350f

File tree

81 files changed

+168
-167
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+168
-167
lines changed

packages/fxa-content-server/app/scripts/templates/connect_another_device.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="card-base">
1+
<div class="card">
22
{{#isFirefoxDesktop}}
33
<h1 class="text-base text-grey-400" id="fxa-connect-another-device-header">{{#t}}Connect another device{{/t}}</h1>
44
{{/isFirefoxDesktop}}

packages/fxa-content-server/app/scripts/templates/pair/failure.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="card-base">
1+
<div class="card">
22
<section>
33
<div class="error"></div>
44
<div class="success"></div>

packages/fxa-content-server/app/scripts/templates/pair/index.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
<div class="card-base">
2+
<div class="card">
33
<header class="relative">
44
{{#showSuccessMessage}}
55
<div id="fxa-connected-heading"

packages/fxa-content-server/app/scripts/templates/pair/unsupported.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="card-base">
1+
<div class="card">
22
{{#showCADHeader}}
33
<header>
44
<h1 class="mb-5 text-grey-400 text-base">{{#t}}Connect another device{{/t}}</h1>

packages/fxa-react/styles/flows.css

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,8 @@
66
* applied after content-server no longer needs it */
77
/* Transparent border around card is for Windows HCM mode */
88

9-
/* Does not specify text-align */
10-
.card-base {
11-
@apply relative w-full border border-transparent mobileLandscape:w-120 mobileLandscape:bg-white rounded-xl px-8 pb-12 pt-9 mobileLandscape:shadow-card-grey-drop mb-6;
12-
}
13-
149
.card {
15-
@apply card-base text-center;
10+
@apply relative w-full border border-transparent mobileLandscape:w-120 mobileLandscape:bg-white rounded-xl px-8 py-9 mobileLandscape:shadow-card-grey-drop mb-6;
1611

1712
/* HACK until content-server no longer needs .card, otherwise component classes take precedence */
1813
&.card-xl {
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,9 @@
11
<link rel="shortcut icon" href="./favicon.ico" />
2+
<style>
3+
/* Adjust the max size for the brand image */
4+
.sidebar-container img {
5+
max-width: 200px; /* Customize max width */
6+
max-height: 50px; /* Customize max height */
7+
object-fit: contain;
8+
}
9+
</style>
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,12 @@ type AppLayoutProps = {
1515
title?: string;
1616
children: React.ReactNode;
1717
widthClass?: string;
18-
cardClass?: string;
1918
};
2019

2120
export const AppLayout = ({
2221
title,
2322
children,
2423
widthClass,
25-
cardClass = 'card',
2624
}: AppLayoutProps) => {
2725
const { l10n } = useLocalization();
2826

@@ -53,7 +51,7 @@ export const AppLayout = ({
5351
</header>
5452
<main className="mobileLandscape:flex mobileLandscape:items-center mobileLandscape:flex-1">
5553
<section>
56-
<div className={classNames(cardClass, widthClass)}>{children}</div>
54+
<div className={classNames('card', widthClass)}>{children}</div>
5755
</section>
5856
</main>
5957
</div>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ export const ButtonDownloadRecoveryKeyPDF = ({
145145
<>
146146
<FtlMsg id="recovery-key-download-button-v3">
147147
<button
148-
className="cta-primary cta-xl w-full"
148+
className="cta-primary cta-xl w-full mt-4"
149149
onClick={async () => {
150150
logViewEvent(`flow.${viewName}`, `recovery-key.download-option`);
151151
await downloadFile();

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,14 @@ const ChooseWhatToSync = ({
3232
return (
3333
<>
3434
<FtlMsg id="choose-what-to-sync-prompt-2">
35-
<h2 className="font-normal mb-4 text-base text-center">
36-
Choose what to sync
37-
</h2>
35+
<h2 className="mb-2 font-bold">Choose what to sync</h2>
3836
</FtlMsg>
39-
<ul className="flex flex-wrap text-start text-sm mb-4 ltr:mobileLandscape:ml-6 rtl:mobileLandscape:mr-6">
37+
<ul className="flex flex-wrap text-sm mb-4">
4038
{offeredSyncEngineConfigs.map((engineConfig) => {
4139
return (
4240
<li
4341
key={engineConfig.id}
44-
className="flex-50% rtl:mobileLandscape:pr-6 ltr:mobileLandscape:pl-6 rtl:pr-3 ltr:pl-3"
42+
className="basis-1/2 mobileLandscape:ps-4 pe-2"
4543
>
4644
<FtlMsg id={engineConfig.ftlId} attrs={{ label: true }}>
4745
<InputCheckboxBlue

0 commit comments

Comments
 (0)