mozilla
/
fxa
зеркало из https://github.com/mozilla/fxa.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge pull request #15949 from mozilla/FXA-8515 

bug(content): Fix font style on signup with passwordless flow
This commit is contained in:
Dan Schomburg 2023-10-24 10:17:34 -07:00 коммит произвёл GitHub
Родитель b7c5e32222 4d2b59319e
Коммит 8cc7a98ef8
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
8 изменённых файлов: 37 добавлений и 23 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
packages/fxa-content-server/app/scripts/templates/400.mustache
Просмотреть файл

@ -1,10 +1,9 @@
<div id="main-content" class="card">
<header>
<h1 id="fxa-400-header">{{#t}}Bad Request{{/t}}</h1>
<h1 id="fxa-400-header" class="card-header">{{#t}}Bad Request{{/t}}</h1>
</header>
<section>
<div class="error visible">{{message}}</div>
</section>
</div>

3
packages/fxa-content-server/app/scripts/templates/500.mustache
Просмотреть файл

@ -1,6 +1,6 @@
<div id="main-content" class="card error-500-page">
<header>
<h1 id="fxa-500-header">{{#t}}500 Error{{/t}}</h1>
<h1 id="fxa-500-header" class="card-header">{{#t}}500 Error{{/t}}</h1>
</header>
<section>
@ -10,4 +10,3 @@
</details>
</section>
</div>

8
packages/fxa-content-server/app/scripts/templates/post_verify/finish_account_setup/set_password.mustache
Просмотреть файл

@ -1,7 +1,7 @@
<div id="main-content" class="card account-setup-set-password">
{{^isLinkValid}}
<header>
<h1 id="fxa-account-setup-set-damaged-header">{{#t}}Link damaged{{/t}}</h1>
<h1 id="fxa-account-setup-set-damaged-header" class="card-header">{{#t}}Link damaged{{/t}}</h1>
</header>
<section>
@ -13,10 +13,10 @@
{{#isLinkValid}}
<header>
<h1 id="fxa-account-setup-set-password-header">
<h1 id="fxa-account-setup-set-password-header" class="card-header">
{{#productName}}
<!-- L10N: For languages structured like English, the second phrase can read "to continue to %(productName)s" -->
{{#t}}Create a Mozilla account{{/t}} <span class="service">{{#t}}Continue to %(productName)s{{/t}}</span>
{{#t}}Create a Mozilla account{{/t}} <span id="subheader" class="card-subheader">{{#t}}Continue to %(productName)s{{/t}}</span>
{{/productName}}
{{^productName}}
{{#t}}Create a Mozilla account{{/t}}
@ -28,7 +28,7 @@
<div class="error"></div>
<form novalidate>
<p id="email">{{ email }}</p>
<p id="email" class="my-5 text-base break-all">{{ email }}</p>
<!-- hidden email field is to allow Fx password manager
to correctly save the updated password. Without it,

4
packages/fxa-content-server/app/styles/_layout.scss
Просмотреть файл

@ -46,7 +46,6 @@
header {
margin-bottom: 15px;
h1,
h2,
h3 {
@include header-font();
@ -54,8 +53,7 @@
margin: 0;
}
h1 {
@include title30();
h1 {
color: $header-color;
line-height: 26px;

11
packages/fxa-content-server/server/templates/pages/src/404.html
Просмотреть файл

@ -12,9 +12,12 @@
<meta name="referrer" content="origin" />
<meta name="robots" content="noindex,nofollow" />
<!-- build:css(.tmp) /styles/main.css -->
<link rel="stylesheet" href="/styles/main.css" />
<!-- endbuild -->
<!-- build:css(.tmp) /styles/main.css -->
<link rel="stylesheet" href="/styles/main.css" />
<!-- endbuild -->
<!-- build:css(.tmp) /styles/tailwind.out.css -->
<link rel="stylesheet" href="/styles/tailwind.out.css" />
<!-- endbuild -->
</head>
<body class="static" data-static-resource-host="{{{staticResourceUrl}}}">
<div id="mozilla-header">
@ -28,7 +31,7 @@
<div id="stage">
<div id="main-content" class="card">
<header>
<h1 id="fxa-404-header">{{#t}}Page not found{{/t}}</h1>
<h1 id="fxa-404-header" class="card-header">{{#t}}Page not found{{/t}}</h1>
</header>
<p class="fxa-404-p" >

7
packages/fxa-content-server/server/templates/pages/src/500.html
Просмотреть файл

@ -15,6 +15,9 @@
<!-- build:css(.tmp) /styles/main.css -->
<link rel="stylesheet" href="/styles/main.css" />
<!-- endbuild -->
<!-- build:css(.tmp) /styles/tailwind.out.css -->
<link rel="stylesheet" href="/styles/tailwind.out.css" />
<!-- endbuild -->
</head>
<body class="static" data-static-resource-host="{{{staticResourceUrl}}}">
<div id="mozilla-header">
@ -28,12 +31,14 @@
<div id="stage">
<div id="main-content" class="card">
<header>
<h1 id="fxa-500-header">{{#t}}500 Error{{/t}}</h1>
<h1 id="fxa-500-header" class="card-header">{{#t}}500 Error{{/t}}</h1>
</header>
<section>
<p>
{{#t}}Oh dear, something went wrong there. We've been notified and
will get working on a fix.{{/t}}
</p>
</section>
<div class="button-row">

7
packages/fxa-content-server/server/templates/pages/src/502.html
Просмотреть файл

@ -15,6 +15,9 @@
<!-- build:css(.tmp) /styles/main.css -->
<link rel="stylesheet" href="/styles/main.css" />
<!-- endbuild -->
<!-- build:css(.tmp) /styles/tailwind.out.css -->
<link rel="stylesheet" href="/styles/tailwind.out.css" />
<!-- endbuild -->
</head>
<body class="static" data-static-resource-host="{{{staticResourceUrl}}}">
<div id="mozilla-header">
@ -28,12 +31,14 @@
<div id="stage">
<div id="main-content" class="card">
<header>
<h1 id="fxa-502-header">{{#t}}502 Error{{/t}}</h1>
<h1 id="fxa-502-header" class="card-header">{{#t}}502 Error{{/t}}</h1>
</header>
<section>
<p>
{{#t}}Oh dear, something went wrong there. We've been notified and
will get working on a fix.{{/t}}
</p>
</section>
<div class="button-row">

17
packages/fxa-content-server/server/templates/pages/src/503.html
Просмотреть файл

@ -12,9 +12,12 @@
<meta name="referrer" content="origin" />
<meta name="robots" content="noindex,nofollow" />
<!-- build:css(.tmp) /styles/main.css -->
<link rel="stylesheet" href="/styles/main.css" />
<!-- endbuild -->
<!-- build:css(.tmp) /styles/main.css -->
<link rel="stylesheet" href="/styles/main.css" />
<!-- endbuild -->
<!-- build:css(.tmp) /styles/tailwind.out.css -->
<link rel="stylesheet" href="/styles/tailwind.out.css" />
<!-- endbuild -->
</head>
<body class="static" data-static-resource-host="{{{staticResourceUrl}}}">
<div id="mozilla-header">
@ -28,14 +31,16 @@
<div id="stage">
<div id="main-content" class="card">
<header>
<h1 id="fxa-503-header">
<h1 id="fxa-503-header" class="card-header">
{{#t}}Server busy, try again soon{{/t}}
</h1>
</header>
<section>
{{#t}}We are currently under heavy strain and are working to return
the system to normal as soon as possible.{{/t}}
<p>
{{#t}}We are currently under heavy strain and are working to return
the system to normal as soon as possible.{{/t}}
</p>
</section>
<div class="button-row">