Skip to content
This repository has been archived by the owner on Jan 17, 2023. It is now read-only.

Commit

Permalink
Fixes #5052 - Messaging on settings page
Browse files Browse the repository at this point in the history
  • Loading branch information
punamdahiya committed Nov 16, 2018
1 parent 396a05a commit 9103f90
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 11 deletions.
3 changes: 2 additions & 1 deletion locales/en-US/server.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -288,9 +288,10 @@ settingsSignInButton = Sign In
.title = Sign in
SettingsPageHeader = Firefox Screenshots Settings
settingsDescription = You can sign in with Firefox Accounts to sync all your screenshots across devices and access them privately.
settingsPageSubHeader = Sync & Accounts
settingsFirefoxAccountSubHeader = Firefox Account
settingsClosePreferences =
.title = Close preferences
settingsFxaDisconnectDescription = If you sign out, you will need to sign in again to regain access to your screenshots.
## Shotindex page

Expand Down
20 changes: 15 additions & 5 deletions server/src/pages/settings/view.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ class Body extends React.Component {
</div>
</div>
);
subInfo = (
<Localized id="settingsFxaDisconnectDescription">
<p className="sub-info">If you sign out, you will need to sign in again to regain access to your screenshots.</p>
</Localized>
);
} else {
info = (
<div className="account-info">
Expand Down Expand Up @@ -85,11 +90,16 @@ class Body extends React.Component {
<p className="header">Firefox Screenshots Settings</p>
</Localized>
<hr />
<Localized id="settingsPageSubHeader">
<p className="sub-header">Sync & Accounts</p>
</Localized>
{ info }
{ subInfo}
<div className="settingsBody">
<div>
<Localized id="settingsFirefoxAccountSubHeader">
<p className="sub-header">Firefox Account</p>
</Localized>
{ info }
{ subInfo}
</div>
<div className="fxaSyncImage"></div>
</div>
</div>;
}

Expand Down
33 changes: 28 additions & 5 deletions static/css/settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
position: relative;

@include respond-to("small") {
width: 480px;
width: 380px;
}

@include respond-to("medium") {
Expand All @@ -50,9 +50,12 @@
}

.preferences {
margin: auto;
padding: 40px 20px 0 20px;

@include respond-to("small") {
width: 480px;
width: 380px;
padding: 40px 0;
}

@include respond-to("medium") {
Expand All @@ -63,9 +66,6 @@
width: 960px;
}

margin: auto;
padding: 40px 20px 0 20px;

.info-container {
margin-inline-start: 30px;
height: 100px;
Expand Down Expand Up @@ -135,4 +135,27 @@
background-color: $light-active;
}
}

.settingsBody {
@include flex-container(row, flex-start, stretch, wrap);
}

.fxaSyncImage {
background-image: url("../img/fxa-sync.svg");
background-repeat: no-repeat;
background-size: 410px auto;
background-position: center center;
margin-top: $grid-unit;
min-width: 410px;
height: 300px;

@include respond-to("small") {
min-width: 380px;
background-size: 380px auto;
}

@include respond-to("large") {
margin-left: $grid-unit * 4;
}
}
}
1 change: 1 addition & 0 deletions static/img/fxa-sync.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 9103f90

Please sign in to comment.