diff options
Diffstat (limited to 'browser/components/aboutwelcome/content-src/components')
4 files changed, 41 insertions, 6 deletions
diff --git a/browser/components/aboutwelcome/content-src/components/AddonsPicker.jsx b/browser/components/aboutwelcome/content-src/components/AddonsPicker.jsx index 10c88008de..1182c785b9 100644 --- a/browser/components/aboutwelcome/content-src/components/AddonsPicker.jsx +++ b/browser/components/aboutwelcome/content-src/components/AddonsPicker.jsx @@ -20,7 +20,9 @@ export const InstallButton = props => { const [installing, setInstalling] = useState(false); const [installComplete, setInstallComplete] = useState(false); - let buttonLabel = installComplete ? "Installed" : "Add to Firefox"; + let buttonLabel = installComplete + ? { string_id: "amo-picker-install-complete-label" } + : { string_id: "amo-picker-install-button-label" }; function onClick(event) { props.handleAction(event); diff --git a/browser/components/aboutwelcome/content-src/components/EmbeddedMigrationWizard.jsx b/browser/components/aboutwelcome/content-src/components/EmbeddedMigrationWizard.jsx index 2fff85abd9..60186e2694 100644 --- a/browser/components/aboutwelcome/content-src/components/EmbeddedMigrationWizard.jsx +++ b/browser/components/aboutwelcome/content-src/components/EmbeddedMigrationWizard.jsx @@ -4,8 +4,9 @@ import React, { useEffect, useRef } from "react"; -export const EmbeddedMigrationWizard = ({ handleAction }) => { +export const EmbeddedMigrationWizard = ({ handleAction, content }) => { const ref = useRef(); + const options = content.migration_wizard_options; useEffect(() => { const handleBeginMigration = () => { handleAction({ @@ -32,9 +33,29 @@ export const EmbeddedMigrationWizard = ({ handleAction }) => { }, []); // eslint-disable-line react-hooks/exhaustive-deps return ( <migration-wizard - force-show-import-all="false" + force-show-import-all={options?.force_show_import_all || "false"} auto-request-state="" ref={ref} + option-expander-title-string={options?.option_expander_title_string || ""} + hide-option-expander-subtitle={ + options?.hide_option_expander_subtitle || false + } + data-import-complete-success-string={ + options?.data_import_complete_success_string || "" + } + selection-header-string={options?.selection_header_string} + selection-subheader-string={options?.selection_subheader_string || ""} + hide-select-all={options?.hide_select_all || false} + checkbox-margin-inline={options?.checkbox_margin_inline || ""} + checkbox-margin-block={options?.checkbox_margin_block || ""} + import-button-string={options?.import_button_string || ""} + import-button-class={options?.import_button_class || ""} + header-font-size={options?.header_font_size || ""} + header-font-weight={options?.header_font_weight || ""} + header-margin-block={options?.header_margin_block || ""} + subheader-font-size={options?.subheader_font_size || ""} + subheader-font-weight={options?.subheader_font_weight || ""} + subheader-margin-block={options?.subheader_margin_block || ""} ></migration-wizard> ); }; diff --git a/browser/components/aboutwelcome/content-src/components/MSLocalized.jsx b/browser/components/aboutwelcome/content-src/components/MSLocalized.jsx index 42fb071475..61867a75a2 100644 --- a/browser/components/aboutwelcome/content-src/components/MSLocalized.jsx +++ b/browser/components/aboutwelcome/content-src/components/MSLocalized.jsx @@ -13,6 +13,7 @@ export const CONFIGURABLE_STYLES = [ "marginInline", "paddingBlock", "paddingInline", + "textAlign", "whiteSpace", ]; const ZAP_SIZE_THRESHOLD = 160; diff --git a/browser/components/aboutwelcome/content-src/components/MultiStageProtonScreen.jsx b/browser/components/aboutwelcome/content-src/components/MultiStageProtonScreen.jsx index ffe64f05f1..59771e4e48 100644 --- a/browser/components/aboutwelcome/content-src/components/MultiStageProtonScreen.jsx +++ b/browser/components/aboutwelcome/content-src/components/MultiStageProtonScreen.jsx @@ -311,7 +311,10 @@ export class ProtonScreen extends React.PureComponent { /> ) : null} {content.tiles && content.tiles.type === "migration-wizard" ? ( - <EmbeddedMigrationWizard handleAction={this.props.handleAction} /> + <EmbeddedMigrationWizard + handleAction={this.props.handleAction} + content={content} + /> ) : null} </React.Fragment> ); @@ -500,6 +503,7 @@ export class ProtonScreen extends React.PureComponent { <main className={`screen ${this.props.id || ""} ${screenClassName} ${textColorClass}`} + reverse-split={content.reverse_split ? "" : null} role={ariaRole ?? "alertdialog"} layout={content.layout} pos={content.position || "center"} @@ -508,6 +512,7 @@ export class ProtonScreen extends React.PureComponent { ref={input => { this.mainContentHeader = input; }} + no-rdm={content.no_rdm ? "" : null} > {isCenterPosition ? null : this.renderSecondarySection(content)} <div @@ -541,6 +546,12 @@ export class ProtonScreen extends React.PureComponent { content.width && content.position !== "split" ? content.width : null, + paddingBlock: content.split_content_padding_block + ? content.split_content_padding_block + : null, + paddingInline: content.split_content_padding_inline + ? content.split_content_padding_inline + : null, }} > {content.logo ? this.renderPicture(content.logo) : null} @@ -591,11 +602,11 @@ export class ProtonScreen extends React.PureComponent { handleAction={this.props.handleAction} /> ) : null} + {this.renderContentTiles()} + {this.renderLanguageSwitcher()} {content.above_button_content ? this.renderOrderedContent(content.above_button_content) : null} - {this.renderContentTiles()} - {this.renderLanguageSwitcher()} {!hideStepsIndicator && aboveButtonStepsIndicator ? this.renderStepsIndicator() : null} |