diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index cda57f765844..8ac9c1718382 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -1316,6 +1316,12 @@ pref("browser.newtabpage.activity-stream.improvesearch.handoffToAwesomebar", tru pref("browser.newtabpage.activity-stream.improvesearch.handoffToAwesomebar", false); #endif +#ifdef NIGHTLY_BUILD +pref("trailhead.firstrun.cohort", 1); +#else +pref("trailhead.firstrun.cohort", 0); +#endif + // Enable the DOM fullscreen API. pref("full-screen-api.enabled", true); diff --git a/browser/components/newtab/.eslintrc.jsx-a11y.js b/browser/components/newtab/.eslintrc.jsx-a11y.js new file mode 100644 index 000000000000..f178e8c037e2 --- /dev/null +++ b/browser/components/newtab/.eslintrc.jsx-a11y.js @@ -0,0 +1,17 @@ +module.exports = { + "plugins": [ + "jsx-a11y" // require("eslint-plugin-jsx-a11y") + ], + "extends": "plugin:jsx-a11y/recommended", + "overrides": [{ + // These files use fluent-dom to insert content + "files": [ + "content-src/asrouter/templates/OnboardingMessage/**", + "content-src/asrouter/templates/Trailhead/**", + ], + "rules": { + "jsx-a11y/anchor-has-content": 0, + "jsx-a11y/heading-has-content": 0, + } + }], +}; diff --git a/browser/components/newtab/bin/render-activity-stream-html.js b/browser/components/newtab/bin/render-activity-stream-html.js index fe5b748e68bd..c4a54c09b008 100644 --- a/browser/components/newtab/bin/render-activity-stream-html.js +++ b/browser/components/newtab/bin/render-activity-stream-html.js @@ -100,8 +100,9 @@ function templateHTML(options, html) { +
${isPrerendered ? html : ""}
- ${options.noscripts ? "" : scriptRender} + ${options.noscripts ? "" : scriptRender} `; diff --git a/browser/components/newtab/common/Actions.jsm b/browser/components/newtab/common/Actions.jsm index e7c0d14be0b9..645151ab5903 100644 --- a/browser/components/newtab/common/Actions.jsm +++ b/browser/components/newtab/common/Actions.jsm @@ -46,10 +46,12 @@ for (const type of [ "DISCOVERY_STREAM_IMPRESSION_STATS", "DISCOVERY_STREAM_LAYOUT_RESET", "DISCOVERY_STREAM_LAYOUT_UPDATE", + "DISCOVERY_STREAM_LINK_BLOCKED", "DISCOVERY_STREAM_LOADED_CONTENT", "DISCOVERY_STREAM_OPT_OUT", "DISCOVERY_STREAM_SPOCS_CAPS", "DISCOVERY_STREAM_SPOCS_ENDPOINT", + "DISCOVERY_STREAM_SPOCS_FILL", "DISCOVERY_STREAM_SPOCS_UPDATE", "DISCOVERY_STREAM_SPOC_IMPRESSION", "DOWNLOAD_CHANGED", @@ -291,6 +293,21 @@ function ASRouterUserEvent(data) { }); } +/** + * DiscoveryStreamSpocsFill - A telemetry ping indicating a SPOCS Fill event. + * + * @param {object} data Fields to include in the ping (spocs_fills, etc.) + * @param {int} importContext (For testing) Override the import context for testing. + * @return {object} An AlsoToMain action + */ +function DiscoveryStreamSpocsFill(data, importContext = globalImportContext) { + const action = { + type: actionTypes.DISCOVERY_STREAM_SPOCS_FILL, + data, + }; + return importContext === UI_CODE ? AlsoToMain(action) : action; +} + /** * UndesiredEvent - A telemetry ping indicating an undesired state. * @@ -398,6 +415,7 @@ this.actionCreators = { WebExtEvent, DiscoveryStreamImpressionStats, DiscoveryStreamLoadedContent, + DiscoveryStreamSpocsFill, }; // These are helpers to test for certain kinds of actions diff --git a/browser/components/newtab/common/Reducers.jsm b/browser/components/newtab/common/Reducers.jsm index c3a8bfc410b9..5ff672bced70 100644 --- a/browser/components/newtab/common/Reducers.jsm +++ b/browser/components/newtab/common/Reducers.jsm @@ -533,7 +533,7 @@ function DiscoveryStream(prevState = INITIAL_STATE.DiscoveryStream, action) { }; } return prevState; - case at.PLACES_LINK_BLOCKED: + case at.DISCOVERY_STREAM_LINK_BLOCKED: return isNotReady() ? prevState : nextState(items => items.filter(item => item.url !== action.data.url)); diff --git a/browser/components/newtab/content-src/asrouter/asrouter-content.jsx b/browser/components/newtab/content-src/asrouter/asrouter-content.jsx index 19508c5c009e..d5050ac3dda3 100644 --- a/browser/components/newtab/content-src/asrouter/asrouter-content.jsx +++ b/browser/components/newtab/content-src/asrouter/asrouter-content.jsx @@ -11,9 +11,11 @@ import ReactDOM from "react-dom"; import {ReturnToAMO} from "./templates/ReturnToAMO/ReturnToAMO"; import {SnippetsTemplates} from "./templates/template-manifest"; import {StartupOverlay} from "./templates/StartupOverlay/StartupOverlay"; +import {Trailhead} from "./templates/Trailhead/Trailhead"; const INCOMING_MESSAGE_NAME = "ASRouter:parent-to-child"; const OUTGOING_MESSAGE_NAME = "ASRouter:child-to-parent"; +const TEMPLATES_ABOVE_PAGE = ["trailhead"]; const TEMPLATES_BELOW_SEARCH = ["simple_below_search_snippet"]; export const ASRouterUtils = { @@ -96,7 +98,8 @@ export class ASRouterUISurface extends React.PureComponent { this.sendUserActionTelemetry = this.sendUserActionTelemetry.bind(this); this.state = {message: {}, bundle: {}}; if (props.document) { - this.portalContainer = props.document.getElementById("footer-snippets-container"); + this.headerPortal = props.document.getElementById("header-asrouter-container"); + this.footerPortal = props.document.getElementById("footer-asrouter-container"); } } @@ -221,7 +224,8 @@ export class ASRouterUISurface extends React.PureComponent { renderSnippets() { if (this.state.bundle.template === "onboarding" || this.state.message.template === "fxa_overlay" || - this.state.message.template === "return_to_amo_overlay") { + this.state.message.template === "return_to_amo_overlay" || + this.state.message.template === "trailhead") { return null; } const SnippetComponent = SnippetsTemplates[this.state.message.template]; @@ -288,6 +292,20 @@ export class ASRouterUISurface extends React.PureComponent { return null; } + renderTrailhead() { + const {message} = this.state; + if (message.template === "trailhead") { + return (); + } + return null; + } + renderPreviewBanner() { if (this.state.message.provider !== "preview") { return null; @@ -305,6 +323,7 @@ export class ASRouterUISurface extends React.PureComponent { const {message, bundle} = this.state; if (!message.id && !bundle.template) { return null; } const shouldRenderBelowSearch = TEMPLATES_BELOW_SEARCH.includes(message.template); + const shouldRenderInHeader = TEMPLATES_ABOVE_PAGE.includes(message.template); return shouldRenderBelowSearch ? // Render special below search snippets in place; @@ -314,11 +333,12 @@ export class ASRouterUISurface extends React.PureComponent { ReactDOM.createPortal( <> {this.renderPreviewBanner()} + {this.renderTrailhead()} {this.renderFirstRunOverlay()} {this.renderOnboarding()} {this.renderSnippets()} , - this.portalContainer + shouldRenderInHeader ? this.headerPortal : this.footerPortal ); } } diff --git a/browser/components/newtab/content-src/asrouter/components/ModalOverlay/ModalOverlay.jsx b/browser/components/newtab/content-src/asrouter/components/ModalOverlay/ModalOverlay.jsx index c76c87651c7a..1ba8bf8593c2 100644 --- a/browser/components/newtab/content-src/asrouter/components/ModalOverlay/ModalOverlay.jsx +++ b/browser/components/newtab/content-src/asrouter/components/ModalOverlay/ModalOverlay.jsx @@ -1,30 +1,51 @@ import React from "react"; -export class ModalOverlay extends React.PureComponent { +export class ModalOverlayWrapper extends React.PureComponent { + constructor(props) { + super(props); + this.onKeyDown = this.onKeyDown.bind(this); + } + + onKeyDown(event) { + if (event.key === "Escape") { + this.props.onClose(); + } + } + componentWillMount() { - this.setState({active: true}); - document.body.classList.add("modal-open"); + this.props.document.addEventListener("keydown", this.onKeyDown); + this.props.document.body.classList.add("modal-open"); } componentWillUnmount() { - document.body.classList.remove("modal-open"); - this.setState({active: false}); + this.props.document.removeEventListener("keydown", this.onKeyDown); + this.props.document.body.classList.remove("modal-open"); } render() { - const {active} = this.state; - const {title, button_label} = this.props; - return ( -
-
-
-

{title}

- {this.props.children} -
- -
-
+ const {props} = this; + return ( +
+
+ {props.children}
- ); + ); + } +} + +ModalOverlayWrapper.defaultProps = {document: global.document}; + +export class ModalOverlay extends React.PureComponent { + render() { + const {title, button_label} = this.props; + return ( + +

{title}

+ {this.props.children} +
+ +
+ ); } } diff --git a/browser/components/newtab/content-src/asrouter/components/ModalOverlay/_ModalOverlay.scss b/browser/components/newtab/content-src/asrouter/components/ModalOverlay/_ModalOverlay.scss index 486cf54361ba..bf56b1e14daf 100644 --- a/browser/components/newtab/content-src/asrouter/components/ModalOverlay/_ModalOverlay.scss +++ b/browser/components/newtab/content-src/asrouter/components/ModalOverlay/_ModalOverlay.scss @@ -5,8 +5,7 @@ } .modalOverlayOuter { - background: $white; - opacity: 0.93; + background: var(--newtab-overlay-color); height: 100%; position: fixed; top: 0; diff --git a/browser/components/newtab/content-src/asrouter/docs/targeting-attributes.md b/browser/components/newtab/content-src/asrouter/docs/targeting-attributes.md index 1d8f8cb52c80..2a8a18c5a55a 100644 --- a/browser/components/newtab/content-src/asrouter/docs/targeting-attributes.md +++ b/browser/components/newtab/content-src/asrouter/docs/targeting-attributes.md @@ -28,6 +28,7 @@ Please note that some targeting attributes require stricter controls on the tele * [sync](#sync) * [topFrecentSites](#topfrecentsites) * [totalBookmarksCount](#totalbookmarkscount) +* [trailheadCohort](#trailheadcohort) * [usesFirefoxSync](#usesfirefoxsync) * [xpinstallEnabled](#xpinstallEnabled) * [hasPinnedTabs](#haspinnedtabs) @@ -424,6 +425,11 @@ Total number of bookmarks. declare const totalBookmarksCount: number; ``` +### `trailheadCohort` + +(67+ only) Experiment cohort for special trailhead project + + ### `usesFirefoxSync` Does the user use Firefox sync? diff --git a/browser/components/newtab/content-src/asrouter/templates/OnboardingMessage/OnboardingMessage.jsx b/browser/components/newtab/content-src/asrouter/templates/OnboardingMessage/OnboardingMessage.jsx index 523483cea035..038cb73d4ba0 100644 --- a/browser/components/newtab/content-src/asrouter/templates/OnboardingMessage/OnboardingMessage.jsx +++ b/browser/components/newtab/content-src/asrouter/templates/OnboardingMessage/OnboardingMessage.jsx @@ -1,7 +1,13 @@ import {ModalOverlay} from "../../components/ModalOverlay/ModalOverlay"; import React from "react"; -class OnboardingCard extends React.PureComponent { +const FLUENT_FILES = [ + "branding/brand.ftl", + "browser/branding/sync-brand.ftl", + "browser/newtab/onboarding.ftl", +]; + +export class OnboardingCard extends React.PureComponent { constructor(props) { super(props); this.onClick = this.onClick.bind(this); @@ -20,16 +26,19 @@ class OnboardingCard extends React.PureComponent { render() { const {content} = this.props; + const className = this.props.className || "onboardingMessage"; return ( -
+
-

{content.title}

-

{content.text}

+

+

- - + +

@@ -38,6 +47,14 @@ class OnboardingCard extends React.PureComponent { } export class OnboardingMessage extends React.PureComponent { + componentWillMount() { + FLUENT_FILES.forEach(file => { + const link = document.head.appendChild(document.createElement("link")); + link.href = file; + link.rel = "localization"; + }); + } + render() { const {props} = this; const {button_label, header} = props.extraTemplateStrings; diff --git a/browser/components/newtab/content-src/asrouter/templates/OnboardingMessage/_OnboardingMessage.scss b/browser/components/newtab/content-src/asrouter/templates/OnboardingMessage/_OnboardingMessage.scss index b37f07a74f0c..3afc51d73dd1 100644 --- a/browser/components/newtab/content-src/asrouter/templates/OnboardingMessage/_OnboardingMessage.scss +++ b/browser/components/newtab/content-src/asrouter/templates/OnboardingMessage/_OnboardingMessage.scss @@ -55,43 +55,6 @@ height: 250px; } - .onboardingMessageImage { - height: 100px; - width: 120px; - background-size: 120px; - background-position: center center; - background-repeat: no-repeat; - display: inline-block; - vertical-align: middle; - - - @media(max-width: 850px) { - height: 75px; - min-width: 80px; - background-size: 80px; - } - - &.addons { - background-image: url('resource://activity-stream/data/content/assets/illustration-addons@2x.png'); - } - - &.privatebrowsing { - background-image: url('resource://activity-stream/data/content/assets/illustration-privatebrowsing@2x.png'); - } - - &.screenshots { - background-image: url('resource://activity-stream/data/content/assets/illustration-screenshots@2x.png'); - } - - &.gift { - background-image: url('resource://activity-stream/data/content/assets/illustration-gift@2x.png'); - } - - &.sync { - background-image: url('resource://activity-stream/data/content/assets/illustration-sync@2x.png'); - } - } - .onboardingContent { height: 175px; @@ -164,3 +127,84 @@ content: none; } } + +// Also used for Trailhead +.onboardingMessageImage { + height: 100px; + width: 120px; + background-size: 120px; + background-position: center center; + background-repeat: no-repeat; + display: inline-block; + vertical-align: middle; + + @media(max-width: 850px) { + height: 75px; + min-width: 80px; + background-size: 80px; + } + + &.addons { + background-image: url('#{$image-path}illustration-addons@2x.png'); + } + + &.privatebrowsing { + background-image: url('#{$image-path}illustration-privatebrowsing@2x.png'); + } + + &.screenshots { + background-image: url('#{$image-path}illustration-screenshots@2x.png'); + } + + &.gift { + background-image: url('#{$image-path}illustration-gift@2x.png'); + } + + &.sync { + background-image: url('#{$image-path}illustration-sync@2x.png'); + } + + &.devices { + background-image: url('#{$image-path}trailhead/card-illo-devices.png'); + } + + &.fbcont { + background-image: url('#{$image-path}trailhead/card-illo-fbcont.png'); + } + + &.ffmonitor { + background-image: url('#{$image-path}trailhead/card-illo-ffmonitor.png'); + } + + &.ffsend { + background-image: url('#{$image-path}trailhead/card-illo-ffsend.png'); + } + + &.lockwise { + background-image: url('#{$image-path}trailhead/card-illo-lockwise.png'); + } + + &.mobile { + background-image: url('#{$image-path}trailhead/card-illo-mobile.png'); + } + + &.pledge { + background-image: url('#{$image-path}trailhead/card-illo-pledge.png'); + } + + &.pocket { + background-image: url('#{$image-path}trailhead/card-illo-pocket.png'); + } + + &.private { + background-image: url('#{$image-path}trailhead/card-illo-private.png'); + } + + &.sendtab { + background-image: url('#{$image-path}trailhead/card-illo-sendtab.png'); + } + + &.tracking { + background-image: url('#{$image-path}trailhead/card-illo-tracking.png'); + } +} diff --git a/browser/components/newtab/content-src/asrouter/templates/Trailhead/Trailhead.jsx b/browser/components/newtab/content-src/asrouter/templates/Trailhead/Trailhead.jsx new file mode 100644 index 000000000000..0a864baa336f --- /dev/null +++ b/browser/components/newtab/content-src/asrouter/templates/Trailhead/Trailhead.jsx @@ -0,0 +1,184 @@ +import {actionCreators as ac, actionTypes as at} from "common/Actions.jsm"; +import {ModalOverlayWrapper} from "../../components/ModalOverlay/ModalOverlay"; +import {OnboardingCard} from "../OnboardingMessage/OnboardingMessage"; +import React from "react"; + +const FLUENT_FILES = [ + "branding/brand.ftl", + "browser/branding/sync-brand.ftl", + // These are finalized strings exposed to localizers + "browser/newtab/onboarding.ftl", + // These are WIP/in-development strings that only get used if the string + // doesn't already exist in onboarding.ftl above + "trailhead.ftl", +]; + +export class Trailhead extends React.PureComponent { + constructor(props) { + super(props); + this.closeModal = this.closeModal.bind(this); + this.onInputChange = this.onInputChange.bind(this); + this.onSubmit = this.onSubmit.bind(this); + this.onInputInvalid = this.onInputInvalid.bind(this); + + this.state = { + emailInput: "", + isModalOpen: true, + flowId: "", + flowBeginTime: 0, + }; + this.didFetch = false; + } + + async componentWillMount() { + FLUENT_FILES.forEach(file => { + const link = document.head.appendChild(document.createElement("link")); + link.href = file; + link.rel = "localization"; + }); + + if (this.props.fxaEndpoint && !this.didFetch) { + try { + this.didFetch = true; + const fxaParams = "entrypoint=activity-stream-firstrun&utm_source=activity-stream&utm_campaign=firstrun&utm_term=trailhead&form_type=email"; + const response = await fetch(`${this.props.fxaEndpoint}/metrics-flow?${fxaParams}`, {credentials: "omit"}); + if (response.status === 200) { + const {flowId, flowBeginTime} = await response.json(); + this.setState({flowId, flowBeginTime}); + } else { + this.props.dispatch(ac.OnlyToMain({type: at.TELEMETRY_UNDESIRED_EVENT, data: {event: "FXA_METRICS_FETCH_ERROR", value: response.status}})); + } + } catch (error) { + this.props.dispatch(ac.OnlyToMain({type: at.TELEMETRY_UNDESIRED_EVENT, data: {event: "FXA_METRICS_ERROR"}})); + } + } + } + + componentDidMount() { + // We need to remove hide-main since we should show it underneath everything that has rendered + global.document.body.classList.remove("hide-main"); + + // Add inline-onboarding class to disable fixed search header and fixed positioned settings icon + global.document.body.classList.add("inline-onboarding"); + } + + componentDidUnmount() { + global.document.body.classList.remove("inline-onboarding"); + } + + onInputChange(e) { + let error = e.target.previousSibling; + this.setState({emailInput: e.target.value}); + error.classList.remove("active"); + e.target.classList.remove("invalid"); + } + + onSubmit() { + this.props.dispatch(ac.UserEvent({event: "SUBMIT_EMAIL", ...this._getFormInfo()})); + + global.addEventListener("visibilitychange", this.closeModal); + } + + closeModal() { + global.removeEventListener("visibilitychange", this.closeModal); + global.document.body.classList.remove("welcome"); + this.setState({isModalOpen: false}); + this.props.dispatch(ac.UserEvent({event: "SKIPPED_SIGNIN", ...this._getFormInfo()})); + } + + /** + * Report to telemetry additional information about the form submission. + */ + _getFormInfo() { + const value = {has_flow_params: this.state.flowId.length > 0}; + return {value}; + } + + onInputInvalid(e) { + let error = e.target.previousSibling; + error.classList.add("active"); + e.target.classList.add("invalid"); + e.preventDefault(); // Override built-in form validation popup + e.target.focus(); + } + + render() { + const {props} = this; + const {bundle: cards, content} = props.message; + return (<> + {this.state.isModalOpen && content ? +
+
+

{content.title.value}

+ {content.subtitle && +

{content.subtitle.value}

+ } +
    + {content.benefits.map(item => ( +
  • +

    {item.title.value}

    +

    {item.text.value}

    +
    • + ))} +
+ + {content.learn.text.value} + +
+
+

{content.form.title.value}

+

{content.form.text.value}

+
+ + + + + + + + + +

+ +

+ + +

+ + +
+
+ + + : null} + {(cards && cards.length) ?
+
+

+
+ {cards.map(card => ( + + ))} +
+

+
: null} + ); + } +} diff --git a/browser/components/newtab/content-src/asrouter/templates/Trailhead/_Trailhead.scss b/browser/components/newtab/content-src/asrouter/templates/Trailhead/_Trailhead.scss new file mode 100644 index 000000000000..79d9dbec5597 --- /dev/null +++ b/browser/components/newtab/content-src/asrouter/templates/Trailhead/_Trailhead.scss @@ -0,0 +1,337 @@ +.trailhead { + $benefit-icon-size: 62px; + $benefit-icon-spacing: $benefit-icon-size + 12px; + + background: url('#{$image-path}trailhead/accounts-form-bg.jpg') bottom / cover; + color: $white; + height: auto; + top: 100px; + + @media (max-height: 700px) { + position: absolute; + top: 20px; + } + + a { + color: $white; + text-decoration: underline; + } + + input, + button { + border-radius: 4px; + padding: 10px; + } + + .trailheadInner { + $content-spacing: 40px; + + display: grid; + grid-column-gap: $content-spacing; + grid-template-columns: 5fr 3fr; + padding: $content-spacing 60px; + } + + .trailheadContent { + h1 { + font-size: 36px; + font-weight: 200; + line-height: 46px; + margin: 0; + } + + .trailheadLearn { + display: block; + margin-top: 30px; + margin-inline-start: $benefit-icon-spacing; + } + } + + &.syncCohort { + left: calc(50% - 430px); + width: 860px; + + @media (max-width: 860px) { + left: 0; + width: 100%; + } + + .trailheadInner { + grid-template-columns: 4fr 3fr; + } + + .trailheadContent { + .trailheadBenefits { + background: url('#{$image-path}sync-devices.svg'); + background-position: center center; + background-repeat: no-repeat; + background-size: contain; + height: 200px; + margin-inline-end: 60px; + } + + .trailheadLearn { + margin-inline-start: 0; + } + } + } + + .trailheadBenefits { + padding: 0; + + li { + background-position: left 4px; + background-repeat: no-repeat; + background-size: $benefit-icon-size; + -moz-context-properties: fill; + fill: $blue-50; + list-style: none; + padding-inline-start: $benefit-icon-spacing; + + &:dir(rtl) { + background-position-x: right; + } + + &.knowledge { + background-image: url('#{$image-path}trailhead/benefit-knowledge.png'); + } + + &.privacy { + background-image: url('#{$image-path}trailhead/benefit-privacy.png'); + } + + &.products { + background-image: url('#{$image-path}trailhead/benefit-products.png'); + } + } + + h3 { + color: $violet-20; + font-size: 22px; + font-weight: 400; + margin-bottom: 4px; + } + + p { + color: $white; + font-size: 15px; + line-height: 22px; + margin: 4px 0 15px; + margin-inline-end: 60px; + } + } + + .trailheadForm { + $logo-size: 100px; + + background: url('#{$image-path}trailhead/firefox-logo.png') top center / $logo-size no-repeat; + min-width: 260px; + padding-top: $logo-size; + text-align: center; + + h3 { + font-size: 36px; + font-weight: 200; + line-height: 46px; + margin: 12px 0 4px; + } + + p { + color: $white; + font-size: 15px; + line-height: 22px; + margin: 0 0 20px; + } + + .trailheadTerms { + margin: 4px 30px 20px; + + a, + & { + color: $white-70; + font-size: 12px; + line-height: 20px; + } + } + + form { + position: relative; + + .error.active { + inset-inline-start: 0; + z-index: 0; + } + } + + button, + input { + border: 0; + width: 100%; + } + + input { + background-color: $white; + color: $grey-70; + font-size: 15px; + } + + button { + background-color: $blue-60; + cursor: pointer; + display: block; + font-size: 15px; + font-weight: 400; + padding: 14px; + + &:hover, + &:focus { + background-color: $trailhead-blue-60; + } + + &:focus { + outline: dotted 1px; + } + } + } + + .trailheadStart { + border: 1px solid $white-50; + cursor: pointer; + display: block; + font-size: 15px; + font-weight: 400; + margin: 0 auto 40px; + min-width: 300px; + padding: 14px; + + &:hover, + &:focus { + background-color: $trailhead-blue-60; + border-color: transparent; + } + + &:focus { + outline: dotted 1px; + } + } +} + +.trailheadCards { + background: var(--trailhead-cards-background-color); + text-align: center; + + h1 { + font-size: 36px; + font-weight: 200; + margin: 0 0 40px; + color: var(--trailhead-header-text-color); + } +} + +.trailheadCardsInner { + margin: auto; + padding: 40px $section-horizontal-padding; + + @media (min-width: $break-point-medium) { + width: $wrapper-max-width-medium; + } + + @media (min-width: $break-point-large) { + width: $wrapper-max-width-large; + } + + @media (min-width: $break-point-widest) { + width: $wrapper-max-width-widest; + } + +} + +.trailheadCardGrid { + display: grid; + grid-gap: $base-gutter; + margin: 0; + + @media (min-width: $break-point-medium) { + grid-template-columns: repeat(auto-fit, $card-width); + } + + @media (min-width: $break-point-widest) { + grid-template-columns: repeat(auto-fit, $card-width-large); + } +} + +.trailheadCard { + position: relative; + background: var(--newtab-card-background-color); + border-radius: 4px; + box-shadow: var(--newtab-card-shadow); + + font-size: 13px; + padding: 20px; + + @media (min-width: $break-point-widest) { + font-size: 15px; + padding: 40px; + } + + .onboardingTitle { + font-weight: normal; + color: var(--newtab-text-primary-color); + margin: 10px 0 4px; + font-size: 15px; + + @media (min-width: $break-point-widest) { + font-size: 18px; + } + } + + .onboardingText { + margin: 0 0 60px; + color: var(--newtab-text-conditional-color); + line-height: 1.5; + font-weight: 200; + } + + .onboardingButton { + color: var(--newtab-text-conditional-color); + background: var(--trailhead-card-button-background-color); + border: 0; + height: 30px; + min-width: 70%; + padding: 0 14px; + + &:focus, + &:hover { + box-shadow: none; + background: var(--trailhead-card-button-background-hover-color); + } + } + + .onboardingButtonContainer { + height: 60px; + position: absolute; + bottom: 0; + left: 0; + width: 100%; + text-align: center; + } +} + +.inline-onboarding { + .outer-wrapper { + position: relative; + + .prefs-button { + button { + position: absolute; + } + } + } +} + +// If the window is too short, we need to allow scrolling so user can get to Start Browsing button. +@media (max-height: 700px) { + .activity-stream.welcome.inline-onboarding { + overflow: auto; + } +} diff --git a/browser/components/newtab/content-src/components/Base/Base.jsx b/browser/components/newtab/content-src/components/Base/Base.jsx index 73632f766cd6..d85c393009fe 100644 --- a/browser/components/newtab/content-src/components/Base/Base.jsx +++ b/browser/components/newtab/content-src/components/Base/Base.jsx @@ -72,6 +72,7 @@ export class _Base extends React.PureComponent { // we don't want to add them back to the Activity Stream view document.body.classList.contains("welcome") ? "welcome" : "", document.body.classList.contains("hide-main") ? "hide-main" : "", + document.body.classList.contains("inline-onboarding") ? "inline-onboarding" : "", ].filter(v => v).join(" "); global.document.body.className = bodyClassName; } @@ -158,7 +159,7 @@ export class BaseContent extends React.PureComponent {
} - +
{isDiscoveryStream ? ( diff --git a/browser/components/newtab/content-src/components/DiscoveryStreamBase/DiscoveryStreamBase.jsx b/browser/components/newtab/content-src/components/DiscoveryStreamBase/DiscoveryStreamBase.jsx index 1adb7c2f84f2..2dd14157738a 100644 --- a/browser/components/newtab/content-src/components/DiscoveryStreamBase/DiscoveryStreamBase.jsx +++ b/browser/components/newtab/content-src/components/DiscoveryStreamBase/DiscoveryStreamBase.jsx @@ -1,3 +1,4 @@ +import {actionCreators as ac} from "common/Actions.jsm"; import {CardGrid} from "content-src/components/DiscoveryStreamComponents/CardGrid/CardGrid"; import {CollapsibleSection} from "content-src/components/CollapsibleSection/CollapsibleSection"; import {connect} from "react-redux"; @@ -168,12 +169,19 @@ export class _DiscoveryStreamBase extends React.PureComponent { render() { // Select layout render data by adding spocs and position to recommendations - const layoutRender = selectLayoutRender(this.props.DiscoveryStream, this.props.Prefs.values, rickRollCache); + const {layoutRender, spocsFill} = selectLayoutRender(this.props.DiscoveryStream, this.props.Prefs.values, rickRollCache); const {config, feeds, spocs} = this.props.DiscoveryStream; if (!spocs.loaded || !feeds.loaded) { return null; } + // Send SPOCS Fill if any. Note that it should not send it again if the same + // page gets re-rendered by state changes. + if (spocsFill.length && !this._spocsFillSent) { + this.props.dispatch(ac.DiscoveryStreamSpocsFill({spoc_fills: spocsFill})); + this._spocsFillSent = true; + } + // Allow rendering without extracting special components if (!config.collapsible) { return this.renderLayout(layoutRender); diff --git a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/_CardGrid.scss b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/_CardGrid.scss index 85a92606a207..4d88aca915ba 100644 --- a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/_CardGrid.scss +++ b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/CardGrid/_CardGrid.scss @@ -15,6 +15,10 @@ $col4-header-font-size: 14; border-radius: 4px; } + .ds-card-link:focus { + @include ds-fade-in; + } + &.ds-card-grid-border { .ds-card:not(.placeholder) { @include dark-theme-only { diff --git a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSCard/_DSCard.scss b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSCard/_DSCard.scss index 12ef79deedfe..fa0b901b5b70 100644 --- a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSCard/_DSCard.scss +++ b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSCard/_DSCard.scss @@ -62,6 +62,10 @@ $excerpt-line-height: 20; flex-direction: column; justify-content: space-between; height: 100%; + + &:focus { + @include ds-fade-in; + } } .meta { diff --git a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/Hero/_Hero.scss b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/Hero/_Hero.scss index c6ee1a19331a..f9f5c9dbf196 100644 --- a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/Hero/_Hero.scss +++ b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/Hero/_Hero.scss @@ -67,6 +67,10 @@ $card-header-in-hero-line-height: 20; padding-top: 16px; height: 100%; + &:focus { + @include ds-fade-in; + } + @at-root .ds-hero-no-border .ds-hero-item .wrapper { border-top: 0; border-bottom: 0; diff --git a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/List/_List.scss b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/List/_List.scss index 0ed6814f291d..ac4e43e8a215 100644 --- a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/List/_List.scss +++ b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/List/_List.scss @@ -86,6 +86,10 @@ $item-line-height: 20; } } +.ds-list-item-link:focus { + @include ds-fade-in; +} + .ds-list-numbers { $counter-whitespace: ($item-line-height - $item-font-size) * 1px; $counter-size: 32px; diff --git a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/TopSites/_TopSites.scss b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/TopSites/_TopSites.scss index 3b11ddf52290..f6641b847fa6 100644 --- a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/TopSites/_TopSites.scss +++ b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/TopSites/_TopSites.scss @@ -8,6 +8,10 @@ .top-site-outer { padding: 0 12px; + + .top-site-inner > a:-moz-any(.active, :focus) .tile { + @include ds-fade-in; + } } .top-sites-list { diff --git a/browser/components/newtab/content-src/components/Search/_Search.scss b/browser/components/newtab/content-src/components/Search/_Search.scss index 25dfb8fe180a..75d2bf4e6752 100644 --- a/browser/components/newtab/content-src/components/Search/_Search.scss +++ b/browser/components/newtab/content-src/components/Search/_Search.scss @@ -246,7 +246,7 @@ $glyph-forward: url('chrome://browser/skin/forward.svg'); } @media (min-height: 701px) { - .fixed-search { + body:not(.inline-onboarding) .fixed-search { main { padding-top: 146px; } diff --git a/browser/components/newtab/content-src/lib/selectLayoutRender.js b/browser/components/newtab/content-src/lib/selectLayoutRender.js index d6b3408849ce..d00a4371a268 100644 --- a/browser/components/newtab/content-src/lib/selectLayoutRender.js +++ b/browser/components/newtab/content-src/lib/selectLayoutRender.js @@ -2,6 +2,9 @@ export const selectLayoutRender = (state, prefs, rickRollCache) => { const {layout, feeds, spocs} = state; let spocIndex = 0; let bufferRollCache = []; + // Records the chosen and unchosen spocs by the probability selection. + let chosenSpocs = new Set(); + let unchosenSpocs = new Set(); // rickRollCache stores random probability values for each spoc position. This cache is empty // on page refresh and gets filled with random values on first render inside maybeInjectSpocs. @@ -13,6 +16,11 @@ export const selectLayoutRender = (state, prefs, rickRollCache) => { spocs.data.spocs && spocs.data.spocs.length) { const recommendations = [...data.recommendations]; for (let position of spocsConfig.positions) { + const spoc = spocs.data.spocs[spocIndex]; + if (!spoc) { + break; + } + // Cache random number for a position let rickRoll; if (isFirstRun) { @@ -23,8 +31,12 @@ export const selectLayoutRender = (state, prefs, rickRollCache) => { bufferRollCache.push(rickRoll); } - if (spocs.data.spocs[spocIndex] && rickRoll <= spocsConfig.probability) { - recommendations.splice(position.index, 0, spocs.data.spocs[spocIndex++]); + if (rickRoll <= spocsConfig.probability) { + spocIndex++; + recommendations.splice(position.index, 0, spoc); + chosenSpocs.add(spoc); + } else { + unchosenSpocs.add(spoc); } } @@ -51,7 +63,7 @@ export const selectLayoutRender = (state, prefs, rickRollCache) => { filterArray.push(...DS_COMPONENTS); } - return layout.map(row => ({ + const layoutRender = layout.map(row => ({ ...row, // Loops through desired components and adds a .data property @@ -94,4 +106,28 @@ export const selectLayoutRender = (state, prefs, rickRollCache) => { return {...component, data}; }), })).filter(row => row.components.length); + + // Generate the payload for the SPOCS Fill ping. Note that a SPOC could be rejected + // by the `probability_selection` first, then gets chosen for the next position. For + // all other SPOCS that never went through the probabilistic selection, its reason will + // be "out_of_position". + let spocsFill = []; + if (spocs.data && spocs.data.spocs) { + const chosenSpocsFill = [...chosenSpocs] + .map(spoc => ({id: spoc.id, reason: "n/a", displayed: 1, full_recalc: 0})); + const unchosenSpocsFill = [...unchosenSpocs] + .filter(spoc => !chosenSpocs.has(spoc)) + .map(spoc => ({id: spoc.id, reason: "probability_selection", displayed: 0, full_recalc: 0})); + const outOfPositionSpocsFill = spocs.data.spocs.slice(spocIndex) + .filter(spoc => !unchosenSpocs.has(spoc)) + .map(spoc => ({id: spoc.id, reason: "out_of_position", displayed: 0, full_recalc: 0})); + + spocsFill = [ + ...chosenSpocsFill, + ...unchosenSpocsFill, + ...outOfPositionSpocsFill, + ]; + } + + return {spocsFill, layoutRender}; }; diff --git a/browser/components/newtab/content-src/styles/_activity-stream.scss b/browser/components/newtab/content-src/styles/_activity-stream.scss index 29b1b2ad9bc9..81266f620f45 100644 --- a/browser/components/newtab/content-src/styles/_activity-stream.scss +++ b/browser/components/newtab/content-src/styles/_activity-stream.scss @@ -170,3 +170,4 @@ input { @import '../asrouter/templates/OnboardingMessage/OnboardingMessage'; @import '../asrouter/templates/EOYSnippet/EOYSnippet'; @import '../asrouter/templates/StartupOverlay/StartupOverlay'; +@import '../asrouter/templates/Trailhead/Trailhead'; diff --git a/browser/components/newtab/content-src/styles/_mixins.scss b/browser/components/newtab/content-src/styles/_mixins.scss index 402c39018b1c..e63b61c8c7f5 100644 --- a/browser/components/newtab/content-src/styles/_mixins.scss +++ b/browser/components/newtab/content-src/styles/_mixins.scss @@ -41,3 +41,10 @@ border-bottom: 1px solid $grey-30; } + +@mixin ds-fade-in { + box-shadow: 0 0 0 1px $blue-50 inset, 0 0 0 1px $blue-50, 0 0 0 5px $blue-50-30; + transition: box-shadow 150ms; + border-radius: 4px; + outline: none; +} diff --git a/browser/components/newtab/content-src/styles/_theme.scss b/browser/components/newtab/content-src/styles/_theme.scss index 7a72848ca7ce..595348dc0eca 100644 --- a/browser/components/newtab/content-src/styles/_theme.scss +++ b/browser/components/newtab/content-src/styles/_theme.scss @@ -78,6 +78,12 @@ body { --newtab-snippets-background-color: #{$white}; --newtab-snippets-hairline-color: transparent; + // Trailhead + --trailhead-header-text-color: #{$trailhead-purple}; + --trailhead-cards-background-color: #{$grey-20}; + --trailhead-card-button-background-color: #{$grey-90-10}; + --trailhead-card-button-background-hover-color: #{$grey-90-20}; + &[lwt-newtab-brighttext] { // General styles --newtab-background-color: #{$grey-80}; @@ -136,5 +142,11 @@ body { // Snippets --newtab-snippets-background-color: #{$grey-70}; --newtab-snippets-hairline-color: #{$white-10}; + + // Trailhead + --trailhead-header-text-color: #{$white-60}; + --trailhead-cards-background-color: #{$grey-90-10}; + --trailhead-card-button-background-color: #{$grey-90-30}; + --trailhead-card-button-background-hover-color: #{$grey-90-40}; } } diff --git a/browser/components/newtab/content-src/styles/_variables.scss b/browser/components/newtab/content-src/styles/_variables.scss index 3fa32e60e4e0..86dbf43dedcd 100644 --- a/browser/components/newtab/content-src/styles/_variables.scss +++ b/browser/components/newtab/content-src/styles/_variables.scss @@ -19,6 +19,7 @@ $teal-70: #008EA4; $teal-80: #005A71; $red-60: #D70022; $yellow-50: #FFE900; +$violet-20: #CB9EFF; // Photon opacity from http://design.firefox.com/photon/visuals/color.html#opacity $grey-10-10: rgba($grey-10, 0.1); @@ -45,6 +46,8 @@ $grey-90-70: rgba($grey-90, 0.7); $grey-90-80: rgba($grey-90, 0.8); $grey-90-90: rgba($grey-90, 0.9); +$blue-50-30: rgba($blue-50, 0.3); + $black: #000; $black-5: rgba($black, 0.05); $black-10: rgba($black, 0.1); @@ -57,6 +60,9 @@ $black-30: rgba($black, 0.3); // Other colors $white: #FFF; $white-10: rgba($white, 0.1); +$white-50: rgba($white, 0.5); +$white-60: rgba($white, 0.6); +$white-70: rgba($white, 0.7); $pocket-teal: #50BCB6; $pocket-red: #EF4056; $shadow-10: rgba(12, 12, 13, 0.1); @@ -72,6 +78,8 @@ $about-welcome-gradient: linear-gradient(to bottom, $blue-70 40%, $aw-extra-blue $about-welcome-extra-links: #676F7E; $firefox-wordmark-default-color: #363959; $firefox-wordmark-darktheme-color: $white; +$trailhead-purple: #2B2156; +$trailhead-blue-60: #0250BB; // Photon transitions from http://design.firefox.com/photon/motion/duration-and-easing.html $photon-easing: cubic-bezier(0.07, 0.95, 0, 1); diff --git a/browser/components/newtab/css/activity-stream-linux.css b/browser/components/newtab/css/activity-stream-linux.css index 3e2736611168..1d3c53e260f7 100644 --- a/browser/components/newtab/css/activity-stream-linux.css +++ b/browser/components/newtab/css/activity-stream-linux.css @@ -67,7 +67,11 @@ body { --newtab-card-placeholder-color: #D7D7DB; --newtab-card-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1); --newtab-snippets-background-color: #FFF; - --newtab-snippets-hairline-color: transparent; } + --newtab-snippets-hairline-color: transparent; + --trailhead-header-text-color: #2B2156; + --trailhead-cards-background-color: #EDEDF0; + --trailhead-card-button-background-color: rgba(12, 12, 13, 0.1); + --trailhead-card-button-background-hover-color: rgba(12, 12, 13, 0.2); } body[lwt-newtab-brighttext] { --newtab-background-color: #2A2A2E; --newtab-border-primary-color: rgba(249, 249, 250, 0.8); @@ -111,7 +115,11 @@ body { --newtab-card-placeholder-color: #4A4A4F; --newtab-card-shadow: 0 1px 8px 0 rgba(12, 12, 13, 0.2); --newtab-snippets-background-color: #38383D; - --newtab-snippets-hairline-color: rgba(255, 255, 255, 0.1); } + --newtab-snippets-hairline-color: rgba(255, 255, 255, 0.1); + --trailhead-header-text-color: rgba(255, 255, 255, 0.6); + --trailhead-cards-background-color: rgba(12, 12, 13, 0.1); + --trailhead-card-button-background-color: rgba(12, 12, 13, 0.3); + --trailhead-card-button-background-hover-color: rgba(12, 12, 13, 0.4); } .icon { background-position: center center; @@ -1139,9 +1147,9 @@ main { visibility: hidden; } } @media (min-height: 701px) { - .fixed-search main { + body:not(.inline-onboarding) .fixed-search main { padding-top: 146px; } - .fixed-search .search-wrapper { + body:not(.inline-onboarding) .fixed-search .search-wrapper { background-color: var(--newtab-search-header-background-color); border-bottom: solid 1px var(--newtab-border-secondary-color); height: 95px; @@ -1151,19 +1159,19 @@ main { top: 0; width: 100%; z-index: 9; } - .fixed-search .search-wrapper .search-inner-wrapper { + body:not(.inline-onboarding) .fixed-search .search-wrapper .search-inner-wrapper { height: 35px; } - .fixed-search .search-wrapper input { + body:not(.inline-onboarding) .fixed-search .search-wrapper input { background-position-x: 16px; background-size: 16px; } - .fixed-search .search-wrapper input:dir(rtl) { + body:not(.inline-onboarding) .fixed-search .search-wrapper input:dir(rtl) { background-position-x: right 16px; } - .fixed-search .search-handoff-button { + body:not(.inline-onboarding) .fixed-search .search-handoff-button { background-position-x: 12px; background-size: 24px; } - .fixed-search .search-handoff-button:dir(rtl) { + body:not(.inline-onboarding) .fixed-search .search-handoff-button:dir(rtl) { background-position-x: right 12px; } - .fixed-search .search-handoff-button .fake-caret { + body:not(.inline-onboarding) .fixed-search .search-handoff-button .fake-caret { top: 10px; } } .contentSearchSuggestionTable { @@ -1876,6 +1884,11 @@ main { border-radius: 4px; } [lwt-newtab-brighttext] .ds-card-grid .ds-card { background: none; } + .ds-card-grid .ds-card-link:focus { + box-shadow: 0 0 0 1px #0A84FF inset, 0 0 0 1px #0A84FF, 0 0 0 5px rgba(10, 132, 255, 0.3); + transition: box-shadow 150ms; + border-radius: 4px; + outline: none; } .ds-card-grid.ds-card-grid-border .ds-card:not(.placeholder) { box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1); } [lwt-newtab-brighttext] .ds-card-grid.ds-card-grid-border .ds-card:not(.placeholder) { @@ -1969,6 +1982,11 @@ main { border-top: 1px solid #4A4A4F; } [lwt-newtab-brighttext] .ds-hero .wrapper { color: #D7D7DB; } + .ds-hero .wrapper:focus { + box-shadow: 0 0 0 1px #0A84FF inset, 0 0 0 1px #0A84FF, 0 0 0 5px rgba(10, 132, 255, 0.3); + transition: box-shadow 150ms; + border-radius: 4px; + outline: none; } .ds-hero-no-border .ds-hero-item .wrapper { border-top: 0; border-bottom: 0; @@ -2204,6 +2222,12 @@ main { [lwt-newtab-brighttext] .ds-list a { color: #F9F9FA; } +.ds-list-item-link:focus { + box-shadow: 0 0 0 1px #0A84FF inset, 0 0 0 1px #0A84FF, 0 0 0 5px rgba(10, 132, 255, 0.3); + transition: box-shadow 150ms; + border-radius: 4px; + outline: none; } + .ds-list-numbers .ds-list-item { counter-increment: list; } @@ -2403,6 +2427,11 @@ main { margin: 0 -25px; } .ds-top-sites .top-sites .top-site-outer { padding: 0 12px; } + .ds-top-sites .top-sites .top-site-outer .top-site-inner > a:-moz-any(.active, :focus) .tile { + box-shadow: 0 0 0 1px #0A84FF inset, 0 0 0 1px #0A84FF, 0 0 0 5px rgba(10, 132, 255, 0.3); + transition: box-shadow 150ms; + border-radius: 4px; + outline: none; } .ds-top-sites .top-sites .top-sites-list { margin: 0 -12px; } @@ -2572,6 +2601,11 @@ main { flex-direction: column; justify-content: space-between; height: 100%; } + .ds-card .ds-card-link:focus { + box-shadow: 0 0 0 1px #0A84FF inset, 0 0 0 1px #0A84FF, 0 0 0 5px rgba(10, 132, 255, 0.3); + transition: box-shadow 150ms; + border-radius: 4px; + outline: none; } .ds-card .meta { display: flex; flex-direction: column; @@ -2799,8 +2833,7 @@ main { overflow: hidden; } .modalOverlayOuter { - background: #FFF; - opacity: 0.93; + background: var(--newtab-overlay-color); height: 100%; position: fixed; top: 0; @@ -3264,29 +3297,6 @@ main { @media (max-width: 650px) { .onboardingMessage { height: 250px; } } - .onboardingMessage .onboardingMessageImage { - height: 100px; - width: 120px; - background-size: 120px; - background-position: center center; - background-repeat: no-repeat; - display: inline-block; - vertical-align: middle; } - @media (max-width: 850px) { - .onboardingMessage .onboardingMessageImage { - height: 75px; - min-width: 80px; - background-size: 80px; } } - .onboardingMessage .onboardingMessageImage.addons { - background-image: url("resource://activity-stream/data/content/assets/illustration-addons@2x.png"); } - .onboardingMessage .onboardingMessageImage.privatebrowsing { - background-image: url("resource://activity-stream/data/content/assets/illustration-privatebrowsing@2x.png"); } - .onboardingMessage .onboardingMessageImage.screenshots { - background-image: url("resource://activity-stream/data/content/assets/illustration-screenshots@2x.png"); } - .onboardingMessage .onboardingMessageImage.gift { - background-image: url("resource://activity-stream/data/content/assets/illustration-gift@2x.png"); } - .onboardingMessage .onboardingMessageImage.sync { - background-image: url("resource://activity-stream/data/content/assets/illustration-sync@2x.png"); } .onboardingMessage .onboardingContent { height: 175px; } .onboardingMessage .onboardingContent > span > h3 { @@ -3337,6 +3347,52 @@ main { .onboardingMessage:last-child::before { content: none; } +.onboardingMessageImage { + height: 100px; + width: 120px; + background-size: 120px; + background-position: center center; + background-repeat: no-repeat; + display: inline-block; + vertical-align: middle; } + @media (max-width: 850px) { + .onboardingMessageImage { + height: 75px; + min-width: 80px; + background-size: 80px; } } + .onboardingMessageImage.addons { + background-image: url("../data/content/assets/illustration-addons@2x.png"); } + .onboardingMessageImage.privatebrowsing { + background-image: url("../data/content/assets/illustration-privatebrowsing@2x.png"); } + .onboardingMessageImage.screenshots { + background-image: url("../data/content/assets/illustration-screenshots@2x.png"); } + .onboardingMessageImage.gift { + background-image: url("../data/content/assets/illustration-gift@2x.png"); } + .onboardingMessageImage.sync { + background-image: url("../data/content/assets/illustration-sync@2x.png"); } + .onboardingMessageImage.devices { + background-image: url("../data/content/assets/trailhead/card-illo-devices.png"); } + .onboardingMessageImage.fbcont { + background-image: url("../data/content/assets/trailhead/card-illo-fbcont.png"); } + .onboardingMessageImage.ffmonitor { + background-image: url("../data/content/assets/trailhead/card-illo-ffmonitor.png"); } + .onboardingMessageImage.ffsend { + background-image: url("../data/content/assets/trailhead/card-illo-ffsend.png"); } + .onboardingMessageImage.lockwise { + background-image: url("../data/content/assets/trailhead/card-illo-lockwise.png"); } + .onboardingMessageImage.mobile { + background-image: url("../data/content/assets/trailhead/card-illo-mobile.png"); } + .onboardingMessageImage.pledge { + background-image: url("../data/content/assets/trailhead/card-illo-pledge.png"); } + .onboardingMessageImage.pocket { + background-image: url("../data/content/assets/trailhead/card-illo-pocket.png"); } + .onboardingMessageImage.private { + background-image: url("../data/content/assets/trailhead/card-illo-private.png"); } + .onboardingMessageImage.sendtab { + background-image: url("../data/content/assets/trailhead/card-illo-sendtab.png"); } + .onboardingMessageImage.tracking { + background-image: url("../data/content/assets/trailhead/card-illo-tracking.png"); } + .EOYSnippetForm { margin: 10px 0 8px; align-self: start; @@ -3631,3 +3687,224 @@ a.firstrun-link { 100% { opacity: 1; transform: translateY(0); } } + +.trailhead { + background: url("../data/content/assets/trailhead/accounts-form-bg.jpg") bottom/cover; + color: #FFF; + height: auto; + top: 100px; } + @media (max-height: 700px) { + .trailhead { + position: absolute; + top: 20px; } } + .trailhead a { + color: #FFF; + text-decoration: underline; } + .trailhead input, + .trailhead button { + border-radius: 4px; + padding: 10px; } + .trailhead .trailheadInner { + display: grid; + grid-column-gap: 40px; + grid-template-columns: 5fr 3fr; + padding: 40px 60px; } + .trailhead .trailheadContent h1 { + font-size: 36px; + font-weight: 200; + line-height: 46px; + margin: 0; } + .trailhead .trailheadContent .trailheadLearn { + display: block; + margin-top: 30px; + margin-inline-start: 74px; } + .trailhead.syncCohort { + left: calc(50% - 430px); + width: 860px; } + @media (max-width: 860px) { + .trailhead.syncCohort { + left: 0; + width: 100%; } } + .trailhead.syncCohort .trailheadInner { + grid-template-columns: 4fr 3fr; } + .trailhead.syncCohort .trailheadContent .trailheadBenefits { + background: url("../data/content/assets/sync-devices.svg"); + background-position: center center; + background-repeat: no-repeat; + background-size: contain; + height: 200px; + margin-inline-end: 60px; } + .trailhead.syncCohort .trailheadContent .trailheadLearn { + margin-inline-start: 0; } + .trailhead .trailheadBenefits { + padding: 0; } + .trailhead .trailheadBenefits li { + background-position: left 4px; + background-repeat: no-repeat; + background-size: 62px; + -moz-context-properties: fill; + fill: #0A84FF; + list-style: none; + padding-inline-start: 74px; } + .trailhead .trailheadBenefits li:dir(rtl) { + background-position-x: right; } + .trailhead .trailheadBenefits li.knowledge { + background-image: url("../data/content/assets/trailhead/benefit-knowledge.png"); } + .trailhead .trailheadBenefits li.privacy { + background-image: url("../data/content/assets/trailhead/benefit-privacy.png"); } + .trailhead .trailheadBenefits li.products { + background-image: url("../data/content/assets/trailhead/benefit-products.png"); } + .trailhead .trailheadBenefits h3 { + color: #CB9EFF; + font-size: 22px; + font-weight: 400; + margin-bottom: 4px; } + .trailhead .trailheadBenefits p { + color: #FFF; + font-size: 15px; + line-height: 22px; + margin: 4px 0 15px; + margin-inline-end: 60px; } + .trailhead .trailheadForm { + background: url("../data/content/assets/trailhead/firefox-logo.png") top center/100px no-repeat; + min-width: 260px; + padding-top: 100px; + text-align: center; } + .trailhead .trailheadForm h3 { + font-size: 36px; + font-weight: 200; + line-height: 46px; + margin: 12px 0 4px; } + .trailhead .trailheadForm p { + color: #FFF; + font-size: 15px; + line-height: 22px; + margin: 0 0 20px; } + .trailhead .trailheadForm .trailheadTerms { + margin: 4px 30px 20px; } + .trailhead .trailheadForm .trailheadTerms a, .trailhead .trailheadForm .trailheadTerms { + color: rgba(255, 255, 255, 0.7); + font-size: 12px; + line-height: 20px; } + .trailhead .trailheadForm form { + position: relative; } + .trailhead .trailheadForm form .error.active { + inset-inline-start: 0; + z-index: 0; } + .trailhead .trailheadForm button, + .trailhead .trailheadForm input { + border: 0; + width: 100%; } + .trailhead .trailheadForm input { + background-color: #FFF; + color: #38383D; + font-size: 15px; } + .trailhead .trailheadForm button { + background-color: #0060DF; + cursor: pointer; + display: block; + font-size: 15px; + font-weight: 400; + padding: 14px; } + .trailhead .trailheadForm button:hover, .trailhead .trailheadForm button:focus { + background-color: #0250BB; } + .trailhead .trailheadForm button:focus { + outline: dotted 1px; } + .trailhead .trailheadStart { + border: 1px solid rgba(255, 255, 255, 0.5); + cursor: pointer; + display: block; + font-size: 15px; + font-weight: 400; + margin: 0 auto 40px; + min-width: 300px; + padding: 14px; } + .trailhead .trailheadStart:hover, .trailhead .trailheadStart:focus { + background-color: #0250BB; + border-color: transparent; } + .trailhead .trailheadStart:focus { + outline: dotted 1px; } + +.trailheadCards { + background: var(--trailhead-cards-background-color); + text-align: center; } + .trailheadCards h1 { + font-size: 36px; + font-weight: 200; + margin: 0 0 40px; + color: var(--trailhead-header-text-color); } + +.trailheadCardsInner { + margin: auto; + padding: 40px 25px; } + @media (min-width: 610px) { + .trailheadCardsInner { + width: 530px; } } + @media (min-width: 866px) { + .trailheadCardsInner { + width: 786px; } } + @media (min-width: 1122px) { + .trailheadCardsInner { + width: 1042px; } } + +.trailheadCardGrid { + display: grid; + grid-gap: 32px; + margin: 0; } + @media (min-width: 610px) { + .trailheadCardGrid { + grid-template-columns: repeat(auto-fit, 224px); } } + @media (min-width: 1122px) { + .trailheadCardGrid { + grid-template-columns: repeat(auto-fit, 309px); } } + +.trailheadCard { + position: relative; + background: var(--newtab-card-background-color); + border-radius: 4px; + box-shadow: var(--newtab-card-shadow); + font-size: 13px; + padding: 20px; } + @media (min-width: 1122px) { + .trailheadCard { + font-size: 15px; + padding: 40px; } } + .trailheadCard .onboardingTitle { + font-weight: normal; + color: var(--newtab-text-primary-color); + margin: 10px 0 4px; + font-size: 15px; } + @media (min-width: 1122px) { + .trailheadCard .onboardingTitle { + font-size: 18px; } } + .trailheadCard .onboardingText { + margin: 0 0 60px; + color: var(--newtab-text-conditional-color); + line-height: 1.5; + font-weight: 200; } + .trailheadCard .onboardingButton { + color: var(--newtab-text-conditional-color); + background: var(--trailhead-card-button-background-color); + border: 0; + height: 30px; + min-width: 70%; + padding: 0 14px; } + .trailheadCard .onboardingButton:focus, .trailheadCard .onboardingButton:hover { + box-shadow: none; + background: var(--trailhead-card-button-background-hover-color); } + .trailheadCard .onboardingButtonContainer { + height: 60px; + position: absolute; + bottom: 0; + left: 0; + width: 100%; + text-align: center; } + +.inline-onboarding .outer-wrapper { + position: relative; } + .inline-onboarding .outer-wrapper .prefs-button button { + position: absolute; } + +@media (max-height: 700px) { + .activity-stream.welcome.inline-onboarding { + overflow: auto; } } diff --git a/browser/components/newtab/css/activity-stream-mac.css b/browser/components/newtab/css/activity-stream-mac.css index 27e0898acaec..85c8031af17b 100644 --- a/browser/components/newtab/css/activity-stream-mac.css +++ b/browser/components/newtab/css/activity-stream-mac.css @@ -70,7 +70,11 @@ body { --newtab-card-placeholder-color: #D7D7DB; --newtab-card-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1); --newtab-snippets-background-color: #FFF; - --newtab-snippets-hairline-color: transparent; } + --newtab-snippets-hairline-color: transparent; + --trailhead-header-text-color: #2B2156; + --trailhead-cards-background-color: #EDEDF0; + --trailhead-card-button-background-color: rgba(12, 12, 13, 0.1); + --trailhead-card-button-background-hover-color: rgba(12, 12, 13, 0.2); } body[lwt-newtab-brighttext] { --newtab-background-color: #2A2A2E; --newtab-border-primary-color: rgba(249, 249, 250, 0.8); @@ -114,7 +118,11 @@ body { --newtab-card-placeholder-color: #4A4A4F; --newtab-card-shadow: 0 1px 8px 0 rgba(12, 12, 13, 0.2); --newtab-snippets-background-color: #38383D; - --newtab-snippets-hairline-color: rgba(255, 255, 255, 0.1); } + --newtab-snippets-hairline-color: rgba(255, 255, 255, 0.1); + --trailhead-header-text-color: rgba(255, 255, 255, 0.6); + --trailhead-cards-background-color: rgba(12, 12, 13, 0.1); + --trailhead-card-button-background-color: rgba(12, 12, 13, 0.3); + --trailhead-card-button-background-hover-color: rgba(12, 12, 13, 0.4); } .icon { background-position: center center; @@ -1142,9 +1150,9 @@ main { visibility: hidden; } } @media (min-height: 701px) { - .fixed-search main { + body:not(.inline-onboarding) .fixed-search main { padding-top: 146px; } - .fixed-search .search-wrapper { + body:not(.inline-onboarding) .fixed-search .search-wrapper { background-color: var(--newtab-search-header-background-color); border-bottom: solid 1px var(--newtab-border-secondary-color); height: 95px; @@ -1154,19 +1162,19 @@ main { top: 0; width: 100%; z-index: 9; } - .fixed-search .search-wrapper .search-inner-wrapper { + body:not(.inline-onboarding) .fixed-search .search-wrapper .search-inner-wrapper { height: 35px; } - .fixed-search .search-wrapper input { + body:not(.inline-onboarding) .fixed-search .search-wrapper input { background-position-x: 16px; background-size: 16px; } - .fixed-search .search-wrapper input:dir(rtl) { + body:not(.inline-onboarding) .fixed-search .search-wrapper input:dir(rtl) { background-position-x: right 16px; } - .fixed-search .search-handoff-button { + body:not(.inline-onboarding) .fixed-search .search-handoff-button { background-position-x: 12px; background-size: 24px; } - .fixed-search .search-handoff-button:dir(rtl) { + body:not(.inline-onboarding) .fixed-search .search-handoff-button:dir(rtl) { background-position-x: right 12px; } - .fixed-search .search-handoff-button .fake-caret { + body:not(.inline-onboarding) .fixed-search .search-handoff-button .fake-caret { top: 10px; } } .contentSearchSuggestionTable { @@ -1879,6 +1887,11 @@ main { border-radius: 4px; } [lwt-newtab-brighttext] .ds-card-grid .ds-card { background: none; } + .ds-card-grid .ds-card-link:focus { + box-shadow: 0 0 0 1px #0A84FF inset, 0 0 0 1px #0A84FF, 0 0 0 5px rgba(10, 132, 255, 0.3); + transition: box-shadow 150ms; + border-radius: 4px; + outline: none; } .ds-card-grid.ds-card-grid-border .ds-card:not(.placeholder) { box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1); } [lwt-newtab-brighttext] .ds-card-grid.ds-card-grid-border .ds-card:not(.placeholder) { @@ -1972,6 +1985,11 @@ main { border-top: 1px solid #4A4A4F; } [lwt-newtab-brighttext] .ds-hero .wrapper { color: #D7D7DB; } + .ds-hero .wrapper:focus { + box-shadow: 0 0 0 1px #0A84FF inset, 0 0 0 1px #0A84FF, 0 0 0 5px rgba(10, 132, 255, 0.3); + transition: box-shadow 150ms; + border-radius: 4px; + outline: none; } .ds-hero-no-border .ds-hero-item .wrapper { border-top: 0; border-bottom: 0; @@ -2207,6 +2225,12 @@ main { [lwt-newtab-brighttext] .ds-list a { color: #F9F9FA; } +.ds-list-item-link:focus { + box-shadow: 0 0 0 1px #0A84FF inset, 0 0 0 1px #0A84FF, 0 0 0 5px rgba(10, 132, 255, 0.3); + transition: box-shadow 150ms; + border-radius: 4px; + outline: none; } + .ds-list-numbers .ds-list-item { counter-increment: list; } @@ -2406,6 +2430,11 @@ main { margin: 0 -25px; } .ds-top-sites .top-sites .top-site-outer { padding: 0 12px; } + .ds-top-sites .top-sites .top-site-outer .top-site-inner > a:-moz-any(.active, :focus) .tile { + box-shadow: 0 0 0 1px #0A84FF inset, 0 0 0 1px #0A84FF, 0 0 0 5px rgba(10, 132, 255, 0.3); + transition: box-shadow 150ms; + border-radius: 4px; + outline: none; } .ds-top-sites .top-sites .top-sites-list { margin: 0 -12px; } @@ -2575,6 +2604,11 @@ main { flex-direction: column; justify-content: space-between; height: 100%; } + .ds-card .ds-card-link:focus { + box-shadow: 0 0 0 1px #0A84FF inset, 0 0 0 1px #0A84FF, 0 0 0 5px rgba(10, 132, 255, 0.3); + transition: box-shadow 150ms; + border-radius: 4px; + outline: none; } .ds-card .meta { display: flex; flex-direction: column; @@ -2802,8 +2836,7 @@ main { overflow: hidden; } .modalOverlayOuter { - background: #FFF; - opacity: 0.93; + background: var(--newtab-overlay-color); height: 100%; position: fixed; top: 0; @@ -3267,29 +3300,6 @@ main { @media (max-width: 650px) { .onboardingMessage { height: 250px; } } - .onboardingMessage .onboardingMessageImage { - height: 100px; - width: 120px; - background-size: 120px; - background-position: center center; - background-repeat: no-repeat; - display: inline-block; - vertical-align: middle; } - @media (max-width: 850px) { - .onboardingMessage .onboardingMessageImage { - height: 75px; - min-width: 80px; - background-size: 80px; } } - .onboardingMessage .onboardingMessageImage.addons { - background-image: url("resource://activity-stream/data/content/assets/illustration-addons@2x.png"); } - .onboardingMessage .onboardingMessageImage.privatebrowsing { - background-image: url("resource://activity-stream/data/content/assets/illustration-privatebrowsing@2x.png"); } - .onboardingMessage .onboardingMessageImage.screenshots { - background-image: url("resource://activity-stream/data/content/assets/illustration-screenshots@2x.png"); } - .onboardingMessage .onboardingMessageImage.gift { - background-image: url("resource://activity-stream/data/content/assets/illustration-gift@2x.png"); } - .onboardingMessage .onboardingMessageImage.sync { - background-image: url("resource://activity-stream/data/content/assets/illustration-sync@2x.png"); } .onboardingMessage .onboardingContent { height: 175px; } .onboardingMessage .onboardingContent > span > h3 { @@ -3340,6 +3350,52 @@ main { .onboardingMessage:last-child::before { content: none; } +.onboardingMessageImage { + height: 100px; + width: 120px; + background-size: 120px; + background-position: center center; + background-repeat: no-repeat; + display: inline-block; + vertical-align: middle; } + @media (max-width: 850px) { + .onboardingMessageImage { + height: 75px; + min-width: 80px; + background-size: 80px; } } + .onboardingMessageImage.addons { + background-image: url("../data/content/assets/illustration-addons@2x.png"); } + .onboardingMessageImage.privatebrowsing { + background-image: url("../data/content/assets/illustration-privatebrowsing@2x.png"); } + .onboardingMessageImage.screenshots { + background-image: url("../data/content/assets/illustration-screenshots@2x.png"); } + .onboardingMessageImage.gift { + background-image: url("../data/content/assets/illustration-gift@2x.png"); } + .onboardingMessageImage.sync { + background-image: url("../data/content/assets/illustration-sync@2x.png"); } + .onboardingMessageImage.devices { + background-image: url("../data/content/assets/trailhead/card-illo-devices.png"); } + .onboardingMessageImage.fbcont { + background-image: url("../data/content/assets/trailhead/card-illo-fbcont.png"); } + .onboardingMessageImage.ffmonitor { + background-image: url("../data/content/assets/trailhead/card-illo-ffmonitor.png"); } + .onboardingMessageImage.ffsend { + background-image: url("../data/content/assets/trailhead/card-illo-ffsend.png"); } + .onboardingMessageImage.lockwise { + background-image: url("../data/content/assets/trailhead/card-illo-lockwise.png"); } + .onboardingMessageImage.mobile { + background-image: url("../data/content/assets/trailhead/card-illo-mobile.png"); } + .onboardingMessageImage.pledge { + background-image: url("../data/content/assets/trailhead/card-illo-pledge.png"); } + .onboardingMessageImage.pocket { + background-image: url("../data/content/assets/trailhead/card-illo-pocket.png"); } + .onboardingMessageImage.private { + background-image: url("../data/content/assets/trailhead/card-illo-private.png"); } + .onboardingMessageImage.sendtab { + background-image: url("../data/content/assets/trailhead/card-illo-sendtab.png"); } + .onboardingMessageImage.tracking { + background-image: url("../data/content/assets/trailhead/card-illo-tracking.png"); } + .EOYSnippetForm { margin: 10px 0 8px; align-self: start; @@ -3634,3 +3690,224 @@ a.firstrun-link { 100% { opacity: 1; transform: translateY(0); } } + +.trailhead { + background: url("../data/content/assets/trailhead/accounts-form-bg.jpg") bottom/cover; + color: #FFF; + height: auto; + top: 100px; } + @media (max-height: 700px) { + .trailhead { + position: absolute; + top: 20px; } } + .trailhead a { + color: #FFF; + text-decoration: underline; } + .trailhead input, + .trailhead button { + border-radius: 4px; + padding: 10px; } + .trailhead .trailheadInner { + display: grid; + grid-column-gap: 40px; + grid-template-columns: 5fr 3fr; + padding: 40px 60px; } + .trailhead .trailheadContent h1 { + font-size: 36px; + font-weight: 200; + line-height: 46px; + margin: 0; } + .trailhead .trailheadContent .trailheadLearn { + display: block; + margin-top: 30px; + margin-inline-start: 74px; } + .trailhead.syncCohort { + left: calc(50% - 430px); + width: 860px; } + @media (max-width: 860px) { + .trailhead.syncCohort { + left: 0; + width: 100%; } } + .trailhead.syncCohort .trailheadInner { + grid-template-columns: 4fr 3fr; } + .trailhead.syncCohort .trailheadContent .trailheadBenefits { + background: url("../data/content/assets/sync-devices.svg"); + background-position: center center; + background-repeat: no-repeat; + background-size: contain; + height: 200px; + margin-inline-end: 60px; } + .trailhead.syncCohort .trailheadContent .trailheadLearn { + margin-inline-start: 0; } + .trailhead .trailheadBenefits { + padding: 0; } + .trailhead .trailheadBenefits li { + background-position: left 4px; + background-repeat: no-repeat; + background-size: 62px; + -moz-context-properties: fill; + fill: #0A84FF; + list-style: none; + padding-inline-start: 74px; } + .trailhead .trailheadBenefits li:dir(rtl) { + background-position-x: right; } + .trailhead .trailheadBenefits li.knowledge { + background-image: url("../data/content/assets/trailhead/benefit-knowledge.png"); } + .trailhead .trailheadBenefits li.privacy { + background-image: url("../data/content/assets/trailhead/benefit-privacy.png"); } + .trailhead .trailheadBenefits li.products { + background-image: url("../data/content/assets/trailhead/benefit-products.png"); } + .trailhead .trailheadBenefits h3 { + color: #CB9EFF; + font-size: 22px; + font-weight: 400; + margin-bottom: 4px; } + .trailhead .trailheadBenefits p { + color: #FFF; + font-size: 15px; + line-height: 22px; + margin: 4px 0 15px; + margin-inline-end: 60px; } + .trailhead .trailheadForm { + background: url("../data/content/assets/trailhead/firefox-logo.png") top center/100px no-repeat; + min-width: 260px; + padding-top: 100px; + text-align: center; } + .trailhead .trailheadForm h3 { + font-size: 36px; + font-weight: 200; + line-height: 46px; + margin: 12px 0 4px; } + .trailhead .trailheadForm p { + color: #FFF; + font-size: 15px; + line-height: 22px; + margin: 0 0 20px; } + .trailhead .trailheadForm .trailheadTerms { + margin: 4px 30px 20px; } + .trailhead .trailheadForm .trailheadTerms a, .trailhead .trailheadForm .trailheadTerms { + color: rgba(255, 255, 255, 0.7); + font-size: 12px; + line-height: 20px; } + .trailhead .trailheadForm form { + position: relative; } + .trailhead .trailheadForm form .error.active { + inset-inline-start: 0; + z-index: 0; } + .trailhead .trailheadForm button, + .trailhead .trailheadForm input { + border: 0; + width: 100%; } + .trailhead .trailheadForm input { + background-color: #FFF; + color: #38383D; + font-size: 15px; } + .trailhead .trailheadForm button { + background-color: #0060DF; + cursor: pointer; + display: block; + font-size: 15px; + font-weight: 400; + padding: 14px; } + .trailhead .trailheadForm button:hover, .trailhead .trailheadForm button:focus { + background-color: #0250BB; } + .trailhead .trailheadForm button:focus { + outline: dotted 1px; } + .trailhead .trailheadStart { + border: 1px solid rgba(255, 255, 255, 0.5); + cursor: pointer; + display: block; + font-size: 15px; + font-weight: 400; + margin: 0 auto 40px; + min-width: 300px; + padding: 14px; } + .trailhead .trailheadStart:hover, .trailhead .trailheadStart:focus { + background-color: #0250BB; + border-color: transparent; } + .trailhead .trailheadStart:focus { + outline: dotted 1px; } + +.trailheadCards { + background: var(--trailhead-cards-background-color); + text-align: center; } + .trailheadCards h1 { + font-size: 36px; + font-weight: 200; + margin: 0 0 40px; + color: var(--trailhead-header-text-color); } + +.trailheadCardsInner { + margin: auto; + padding: 40px 25px; } + @media (min-width: 610px) { + .trailheadCardsInner { + width: 530px; } } + @media (min-width: 866px) { + .trailheadCardsInner { + width: 786px; } } + @media (min-width: 1122px) { + .trailheadCardsInner { + width: 1042px; } } + +.trailheadCardGrid { + display: grid; + grid-gap: 32px; + margin: 0; } + @media (min-width: 610px) { + .trailheadCardGrid { + grid-template-columns: repeat(auto-fit, 224px); } } + @media (min-width: 1122px) { + .trailheadCardGrid { + grid-template-columns: repeat(auto-fit, 309px); } } + +.trailheadCard { + position: relative; + background: var(--newtab-card-background-color); + border-radius: 4px; + box-shadow: var(--newtab-card-shadow); + font-size: 13px; + padding: 20px; } + @media (min-width: 1122px) { + .trailheadCard { + font-size: 15px; + padding: 40px; } } + .trailheadCard .onboardingTitle { + font-weight: normal; + color: var(--newtab-text-primary-color); + margin: 10px 0 4px; + font-size: 15px; } + @media (min-width: 1122px) { + .trailheadCard .onboardingTitle { + font-size: 18px; } } + .trailheadCard .onboardingText { + margin: 0 0 60px; + color: var(--newtab-text-conditional-color); + line-height: 1.5; + font-weight: 200; } + .trailheadCard .onboardingButton { + color: var(--newtab-text-conditional-color); + background: var(--trailhead-card-button-background-color); + border: 0; + height: 30px; + min-width: 70%; + padding: 0 14px; } + .trailheadCard .onboardingButton:focus, .trailheadCard .onboardingButton:hover { + box-shadow: none; + background: var(--trailhead-card-button-background-hover-color); } + .trailheadCard .onboardingButtonContainer { + height: 60px; + position: absolute; + bottom: 0; + left: 0; + width: 100%; + text-align: center; } + +.inline-onboarding .outer-wrapper { + position: relative; } + .inline-onboarding .outer-wrapper .prefs-button button { + position: absolute; } + +@media (max-height: 700px) { + .activity-stream.welcome.inline-onboarding { + overflow: auto; } } diff --git a/browser/components/newtab/css/activity-stream-windows.css b/browser/components/newtab/css/activity-stream-windows.css index d6b3e8513a51..d0ec6a66e2a1 100644 --- a/browser/components/newtab/css/activity-stream-windows.css +++ b/browser/components/newtab/css/activity-stream-windows.css @@ -67,7 +67,11 @@ body { --newtab-card-placeholder-color: #D7D7DB; --newtab-card-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1); --newtab-snippets-background-color: #FFF; - --newtab-snippets-hairline-color: transparent; } + --newtab-snippets-hairline-color: transparent; + --trailhead-header-text-color: #2B2156; + --trailhead-cards-background-color: #EDEDF0; + --trailhead-card-button-background-color: rgba(12, 12, 13, 0.1); + --trailhead-card-button-background-hover-color: rgba(12, 12, 13, 0.2); } body[lwt-newtab-brighttext] { --newtab-background-color: #2A2A2E; --newtab-border-primary-color: rgba(249, 249, 250, 0.8); @@ -111,7 +115,11 @@ body { --newtab-card-placeholder-color: #4A4A4F; --newtab-card-shadow: 0 1px 8px 0 rgba(12, 12, 13, 0.2); --newtab-snippets-background-color: #38383D; - --newtab-snippets-hairline-color: rgba(255, 255, 255, 0.1); } + --newtab-snippets-hairline-color: rgba(255, 255, 255, 0.1); + --trailhead-header-text-color: rgba(255, 255, 255, 0.6); + --trailhead-cards-background-color: rgba(12, 12, 13, 0.1); + --trailhead-card-button-background-color: rgba(12, 12, 13, 0.3); + --trailhead-card-button-background-hover-color: rgba(12, 12, 13, 0.4); } .icon { background-position: center center; @@ -1139,9 +1147,9 @@ main { visibility: hidden; } } @media (min-height: 701px) { - .fixed-search main { + body:not(.inline-onboarding) .fixed-search main { padding-top: 146px; } - .fixed-search .search-wrapper { + body:not(.inline-onboarding) .fixed-search .search-wrapper { background-color: var(--newtab-search-header-background-color); border-bottom: solid 1px var(--newtab-border-secondary-color); height: 95px; @@ -1151,19 +1159,19 @@ main { top: 0; width: 100%; z-index: 9; } - .fixed-search .search-wrapper .search-inner-wrapper { + body:not(.inline-onboarding) .fixed-search .search-wrapper .search-inner-wrapper { height: 35px; } - .fixed-search .search-wrapper input { + body:not(.inline-onboarding) .fixed-search .search-wrapper input { background-position-x: 16px; background-size: 16px; } - .fixed-search .search-wrapper input:dir(rtl) { + body:not(.inline-onboarding) .fixed-search .search-wrapper input:dir(rtl) { background-position-x: right 16px; } - .fixed-search .search-handoff-button { + body:not(.inline-onboarding) .fixed-search .search-handoff-button { background-position-x: 12px; background-size: 24px; } - .fixed-search .search-handoff-button:dir(rtl) { + body:not(.inline-onboarding) .fixed-search .search-handoff-button:dir(rtl) { background-position-x: right 12px; } - .fixed-search .search-handoff-button .fake-caret { + body:not(.inline-onboarding) .fixed-search .search-handoff-button .fake-caret { top: 10px; } } .contentSearchSuggestionTable { @@ -1876,6 +1884,11 @@ main { border-radius: 4px; } [lwt-newtab-brighttext] .ds-card-grid .ds-card { background: none; } + .ds-card-grid .ds-card-link:focus { + box-shadow: 0 0 0 1px #0A84FF inset, 0 0 0 1px #0A84FF, 0 0 0 5px rgba(10, 132, 255, 0.3); + transition: box-shadow 150ms; + border-radius: 4px; + outline: none; } .ds-card-grid.ds-card-grid-border .ds-card:not(.placeholder) { box-shadow: 0 1px 4px 0 rgba(12, 12, 13, 0.1); } [lwt-newtab-brighttext] .ds-card-grid.ds-card-grid-border .ds-card:not(.placeholder) { @@ -1969,6 +1982,11 @@ main { border-top: 1px solid #4A4A4F; } [lwt-newtab-brighttext] .ds-hero .wrapper { color: #D7D7DB; } + .ds-hero .wrapper:focus { + box-shadow: 0 0 0 1px #0A84FF inset, 0 0 0 1px #0A84FF, 0 0 0 5px rgba(10, 132, 255, 0.3); + transition: box-shadow 150ms; + border-radius: 4px; + outline: none; } .ds-hero-no-border .ds-hero-item .wrapper { border-top: 0; border-bottom: 0; @@ -2204,6 +2222,12 @@ main { [lwt-newtab-brighttext] .ds-list a { color: #F9F9FA; } +.ds-list-item-link:focus { + box-shadow: 0 0 0 1px #0A84FF inset, 0 0 0 1px #0A84FF, 0 0 0 5px rgba(10, 132, 255, 0.3); + transition: box-shadow 150ms; + border-radius: 4px; + outline: none; } + .ds-list-numbers .ds-list-item { counter-increment: list; } @@ -2403,6 +2427,11 @@ main { margin: 0 -25px; } .ds-top-sites .top-sites .top-site-outer { padding: 0 12px; } + .ds-top-sites .top-sites .top-site-outer .top-site-inner > a:-moz-any(.active, :focus) .tile { + box-shadow: 0 0 0 1px #0A84FF inset, 0 0 0 1px #0A84FF, 0 0 0 5px rgba(10, 132, 255, 0.3); + transition: box-shadow 150ms; + border-radius: 4px; + outline: none; } .ds-top-sites .top-sites .top-sites-list { margin: 0 -12px; } @@ -2572,6 +2601,11 @@ main { flex-direction: column; justify-content: space-between; height: 100%; } + .ds-card .ds-card-link:focus { + box-shadow: 0 0 0 1px #0A84FF inset, 0 0 0 1px #0A84FF, 0 0 0 5px rgba(10, 132, 255, 0.3); + transition: box-shadow 150ms; + border-radius: 4px; + outline: none; } .ds-card .meta { display: flex; flex-direction: column; @@ -2799,8 +2833,7 @@ main { overflow: hidden; } .modalOverlayOuter { - background: #FFF; - opacity: 0.93; + background: var(--newtab-overlay-color); height: 100%; position: fixed; top: 0; @@ -3264,29 +3297,6 @@ main { @media (max-width: 650px) { .onboardingMessage { height: 250px; } } - .onboardingMessage .onboardingMessageImage { - height: 100px; - width: 120px; - background-size: 120px; - background-position: center center; - background-repeat: no-repeat; - display: inline-block; - vertical-align: middle; } - @media (max-width: 850px) { - .onboardingMessage .onboardingMessageImage { - height: 75px; - min-width: 80px; - background-size: 80px; } } - .onboardingMessage .onboardingMessageImage.addons { - background-image: url("resource://activity-stream/data/content/assets/illustration-addons@2x.png"); } - .onboardingMessage .onboardingMessageImage.privatebrowsing { - background-image: url("resource://activity-stream/data/content/assets/illustration-privatebrowsing@2x.png"); } - .onboardingMessage .onboardingMessageImage.screenshots { - background-image: url("resource://activity-stream/data/content/assets/illustration-screenshots@2x.png"); } - .onboardingMessage .onboardingMessageImage.gift { - background-image: url("resource://activity-stream/data/content/assets/illustration-gift@2x.png"); } - .onboardingMessage .onboardingMessageImage.sync { - background-image: url("resource://activity-stream/data/content/assets/illustration-sync@2x.png"); } .onboardingMessage .onboardingContent { height: 175px; } .onboardingMessage .onboardingContent > span > h3 { @@ -3337,6 +3347,52 @@ main { .onboardingMessage:last-child::before { content: none; } +.onboardingMessageImage { + height: 100px; + width: 120px; + background-size: 120px; + background-position: center center; + background-repeat: no-repeat; + display: inline-block; + vertical-align: middle; } + @media (max-width: 850px) { + .onboardingMessageImage { + height: 75px; + min-width: 80px; + background-size: 80px; } } + .onboardingMessageImage.addons { + background-image: url("../data/content/assets/illustration-addons@2x.png"); } + .onboardingMessageImage.privatebrowsing { + background-image: url("../data/content/assets/illustration-privatebrowsing@2x.png"); } + .onboardingMessageImage.screenshots { + background-image: url("../data/content/assets/illustration-screenshots@2x.png"); } + .onboardingMessageImage.gift { + background-image: url("../data/content/assets/illustration-gift@2x.png"); } + .onboardingMessageImage.sync { + background-image: url("../data/content/assets/illustration-sync@2x.png"); } + .onboardingMessageImage.devices { + background-image: url("../data/content/assets/trailhead/card-illo-devices.png"); } + .onboardingMessageImage.fbcont { + background-image: url("../data/content/assets/trailhead/card-illo-fbcont.png"); } + .onboardingMessageImage.ffmonitor { + background-image: url("../data/content/assets/trailhead/card-illo-ffmonitor.png"); } + .onboardingMessageImage.ffsend { + background-image: url("../data/content/assets/trailhead/card-illo-ffsend.png"); } + .onboardingMessageImage.lockwise { + background-image: url("../data/content/assets/trailhead/card-illo-lockwise.png"); } + .onboardingMessageImage.mobile { + background-image: url("../data/content/assets/trailhead/card-illo-mobile.png"); } + .onboardingMessageImage.pledge { + background-image: url("../data/content/assets/trailhead/card-illo-pledge.png"); } + .onboardingMessageImage.pocket { + background-image: url("../data/content/assets/trailhead/card-illo-pocket.png"); } + .onboardingMessageImage.private { + background-image: url("../data/content/assets/trailhead/card-illo-private.png"); } + .onboardingMessageImage.sendtab { + background-image: url("../data/content/assets/trailhead/card-illo-sendtab.png"); } + .onboardingMessageImage.tracking { + background-image: url("../data/content/assets/trailhead/card-illo-tracking.png"); } + .EOYSnippetForm { margin: 10px 0 8px; align-self: start; @@ -3631,3 +3687,224 @@ a.firstrun-link { 100% { opacity: 1; transform: translateY(0); } } + +.trailhead { + background: url("../data/content/assets/trailhead/accounts-form-bg.jpg") bottom/cover; + color: #FFF; + height: auto; + top: 100px; } + @media (max-height: 700px) { + .trailhead { + position: absolute; + top: 20px; } } + .trailhead a { + color: #FFF; + text-decoration: underline; } + .trailhead input, + .trailhead button { + border-radius: 4px; + padding: 10px; } + .trailhead .trailheadInner { + display: grid; + grid-column-gap: 40px; + grid-template-columns: 5fr 3fr; + padding: 40px 60px; } + .trailhead .trailheadContent h1 { + font-size: 36px; + font-weight: 200; + line-height: 46px; + margin: 0; } + .trailhead .trailheadContent .trailheadLearn { + display: block; + margin-top: 30px; + margin-inline-start: 74px; } + .trailhead.syncCohort { + left: calc(50% - 430px); + width: 860px; } + @media (max-width: 860px) { + .trailhead.syncCohort { + left: 0; + width: 100%; } } + .trailhead.syncCohort .trailheadInner { + grid-template-columns: 4fr 3fr; } + .trailhead.syncCohort .trailheadContent .trailheadBenefits { + background: url("../data/content/assets/sync-devices.svg"); + background-position: center center; + background-repeat: no-repeat; + background-size: contain; + height: 200px; + margin-inline-end: 60px; } + .trailhead.syncCohort .trailheadContent .trailheadLearn { + margin-inline-start: 0; } + .trailhead .trailheadBenefits { + padding: 0; } + .trailhead .trailheadBenefits li { + background-position: left 4px; + background-repeat: no-repeat; + background-size: 62px; + -moz-context-properties: fill; + fill: #0A84FF; + list-style: none; + padding-inline-start: 74px; } + .trailhead .trailheadBenefits li:dir(rtl) { + background-position-x: right; } + .trailhead .trailheadBenefits li.knowledge { + background-image: url("../data/content/assets/trailhead/benefit-knowledge.png"); } + .trailhead .trailheadBenefits li.privacy { + background-image: url("../data/content/assets/trailhead/benefit-privacy.png"); } + .trailhead .trailheadBenefits li.products { + background-image: url("../data/content/assets/trailhead/benefit-products.png"); } + .trailhead .trailheadBenefits h3 { + color: #CB9EFF; + font-size: 22px; + font-weight: 400; + margin-bottom: 4px; } + .trailhead .trailheadBenefits p { + color: #FFF; + font-size: 15px; + line-height: 22px; + margin: 4px 0 15px; + margin-inline-end: 60px; } + .trailhead .trailheadForm { + background: url("../data/content/assets/trailhead/firefox-logo.png") top center/100px no-repeat; + min-width: 260px; + padding-top: 100px; + text-align: center; } + .trailhead .trailheadForm h3 { + font-size: 36px; + font-weight: 200; + line-height: 46px; + margin: 12px 0 4px; } + .trailhead .trailheadForm p { + color: #FFF; + font-size: 15px; + line-height: 22px; + margin: 0 0 20px; } + .trailhead .trailheadForm .trailheadTerms { + margin: 4px 30px 20px; } + .trailhead .trailheadForm .trailheadTerms a, .trailhead .trailheadForm .trailheadTerms { + color: rgba(255, 255, 255, 0.7); + font-size: 12px; + line-height: 20px; } + .trailhead .trailheadForm form { + position: relative; } + .trailhead .trailheadForm form .error.active { + inset-inline-start: 0; + z-index: 0; } + .trailhead .trailheadForm button, + .trailhead .trailheadForm input { + border: 0; + width: 100%; } + .trailhead .trailheadForm input { + background-color: #FFF; + color: #38383D; + font-size: 15px; } + .trailhead .trailheadForm button { + background-color: #0060DF; + cursor: pointer; + display: block; + font-size: 15px; + font-weight: 400; + padding: 14px; } + .trailhead .trailheadForm button:hover, .trailhead .trailheadForm button:focus { + background-color: #0250BB; } + .trailhead .trailheadForm button:focus { + outline: dotted 1px; } + .trailhead .trailheadStart { + border: 1px solid rgba(255, 255, 255, 0.5); + cursor: pointer; + display: block; + font-size: 15px; + font-weight: 400; + margin: 0 auto 40px; + min-width: 300px; + padding: 14px; } + .trailhead .trailheadStart:hover, .trailhead .trailheadStart:focus { + background-color: #0250BB; + border-color: transparent; } + .trailhead .trailheadStart:focus { + outline: dotted 1px; } + +.trailheadCards { + background: var(--trailhead-cards-background-color); + text-align: center; } + .trailheadCards h1 { + font-size: 36px; + font-weight: 200; + margin: 0 0 40px; + color: var(--trailhead-header-text-color); } + +.trailheadCardsInner { + margin: auto; + padding: 40px 25px; } + @media (min-width: 610px) { + .trailheadCardsInner { + width: 530px; } } + @media (min-width: 866px) { + .trailheadCardsInner { + width: 786px; } } + @media (min-width: 1122px) { + .trailheadCardsInner { + width: 1042px; } } + +.trailheadCardGrid { + display: grid; + grid-gap: 32px; + margin: 0; } + @media (min-width: 610px) { + .trailheadCardGrid { + grid-template-columns: repeat(auto-fit, 224px); } } + @media (min-width: 1122px) { + .trailheadCardGrid { + grid-template-columns: repeat(auto-fit, 309px); } } + +.trailheadCard { + position: relative; + background: var(--newtab-card-background-color); + border-radius: 4px; + box-shadow: var(--newtab-card-shadow); + font-size: 13px; + padding: 20px; } + @media (min-width: 1122px) { + .trailheadCard { + font-size: 15px; + padding: 40px; } } + .trailheadCard .onboardingTitle { + font-weight: normal; + color: var(--newtab-text-primary-color); + margin: 10px 0 4px; + font-size: 15px; } + @media (min-width: 1122px) { + .trailheadCard .onboardingTitle { + font-size: 18px; } } + .trailheadCard .onboardingText { + margin: 0 0 60px; + color: var(--newtab-text-conditional-color); + line-height: 1.5; + font-weight: 200; } + .trailheadCard .onboardingButton { + color: var(--newtab-text-conditional-color); + background: var(--trailhead-card-button-background-color); + border: 0; + height: 30px; + min-width: 70%; + padding: 0 14px; } + .trailheadCard .onboardingButton:focus, .trailheadCard .onboardingButton:hover { + box-shadow: none; + background: var(--trailhead-card-button-background-hover-color); } + .trailheadCard .onboardingButtonContainer { + height: 60px; + position: absolute; + bottom: 0; + left: 0; + width: 100%; + text-align: center; } + +.inline-onboarding .outer-wrapper { + position: relative; } + .inline-onboarding .outer-wrapper .prefs-button button { + position: absolute; } + +@media (max-height: 700px) { + .activity-stream.welcome.inline-onboarding { + overflow: auto; } } diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js index c96fed2c2cfb..40f9921d861b 100644 --- a/browser/components/newtab/data/content/activity-stream.bundle.js +++ b/browser/components/newtab/data/content/activity-stream.bundle.js @@ -92,7 +92,7 @@ __webpack_require__.r(__webpack_exports__); /* WEBPACK VAR INJECTION */(function(global) {/* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2); /* harmony import */ var content_src_components_Base_Base__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(3); -/* harmony import */ var content_src_lib_detect_user_session_start__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(50); +/* harmony import */ var content_src_lib_detect_user_session_start__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(51); /* harmony import */ var content_src_lib_init_store__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(7); /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(26); /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(react_redux__WEBPACK_IMPORTED_MODULE_4__); @@ -100,7 +100,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_5__); /* harmony import */ var react_dom__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(16); /* harmony import */ var react_dom__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(react_dom__WEBPACK_IMPORTED_MODULE_6__); -/* harmony import */ var common_Reducers_jsm__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(55); +/* harmony import */ var common_Reducers_jsm__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(56); @@ -197,7 +197,7 @@ const globalImportContext = typeof Window === "undefined" ? BACKGROUND_PROCESS : // } const actionTypes = {}; -for (const type of ["ADDONS_INFO_REQUEST", "ADDONS_INFO_RESPONSE", "ARCHIVE_FROM_POCKET", "AS_ROUTER_INITIALIZED", "AS_ROUTER_PREF_CHANGED", "AS_ROUTER_TELEMETRY_USER_EVENT", "BLOCK_URL", "BOOKMARK_URL", "COPY_DOWNLOAD_LINK", "DELETE_BOOKMARK_BY_ID", "DELETE_FROM_POCKET", "DELETE_HISTORY_URL", "DIALOG_CANCEL", "DIALOG_OPEN", "DISCOVERY_STREAM_CONFIG_CHANGE", "DISCOVERY_STREAM_CONFIG_SETUP", "DISCOVERY_STREAM_CONFIG_SET_VALUE", "DISCOVERY_STREAM_FEEDS_UPDATE", "DISCOVERY_STREAM_IMPRESSION_STATS", "DISCOVERY_STREAM_LAYOUT_RESET", "DISCOVERY_STREAM_LAYOUT_UPDATE", "DISCOVERY_STREAM_LOADED_CONTENT", "DISCOVERY_STREAM_OPT_OUT", "DISCOVERY_STREAM_SPOCS_CAPS", "DISCOVERY_STREAM_SPOCS_ENDPOINT", "DISCOVERY_STREAM_SPOCS_UPDATE", "DISCOVERY_STREAM_SPOC_IMPRESSION", "DOWNLOAD_CHANGED", "FAKE_FOCUS_SEARCH", "FILL_SEARCH_TERM", "HANDOFF_SEARCH_TO_AWESOMEBAR", "HIDE_SEARCH", "INIT", "NEW_TAB_INIT", "NEW_TAB_INITIAL_STATE", "NEW_TAB_LOAD", "NEW_TAB_REHYDRATED", "NEW_TAB_STATE_REQUEST", "NEW_TAB_UNLOAD", "OPEN_DOWNLOAD_FILE", "OPEN_LINK", "OPEN_NEW_WINDOW", "OPEN_PRIVATE_WINDOW", "OPEN_WEBEXT_SETTINGS", "PAGE_PRERENDERED", "PLACES_BOOKMARK_ADDED", "PLACES_BOOKMARK_REMOVED", "PLACES_HISTORY_CLEARED", "PLACES_LINKS_CHANGED", "PLACES_LINK_BLOCKED", "PLACES_LINK_DELETED", "PLACES_SAVED_TO_POCKET", "POCKET_CTA", "POCKET_LINK_DELETED_OR_ARCHIVED", "POCKET_LOGGED_IN", "POCKET_WAITING_FOR_SPOC", "PREFS_INITIAL_VALUES", "PREF_CHANGED", "PREVIEW_REQUEST", "PREVIEW_REQUEST_CANCEL", "PREVIEW_RESPONSE", "REMOVE_DOWNLOAD_FILE", "RICH_ICON_MISSING", "SAVE_SESSION_PERF_DATA", "SAVE_TO_POCKET", "SCREENSHOT_UPDATED", "SECTION_DEREGISTER", "SECTION_DISABLE", "SECTION_ENABLE", "SECTION_MOVE", "SECTION_OPTIONS_CHANGED", "SECTION_REGISTER", "SECTION_UPDATE", "SECTION_UPDATE_CARD", "SETTINGS_CLOSE", "SETTINGS_OPEN", "SET_PREF", "SHOW_DOWNLOAD_FILE", "SHOW_FIREFOX_ACCOUNTS", "SHOW_SEARCH", "SKIPPED_SIGNIN", "SNIPPETS_BLOCKLIST_CLEARED", "SNIPPETS_BLOCKLIST_UPDATED", "SNIPPETS_DATA", "SNIPPETS_PREVIEW_MODE", "SNIPPETS_RESET", "SNIPPET_BLOCKED", "SUBMIT_EMAIL", "SYSTEM_TICK", "TELEMETRY_IMPRESSION_STATS", "TELEMETRY_PERFORMANCE_EVENT", "TELEMETRY_UNDESIRED_EVENT", "TELEMETRY_USER_EVENT", "TOP_SITES_CANCEL_EDIT", "TOP_SITES_CLOSE_SEARCH_SHORTCUTS_MODAL", "TOP_SITES_EDIT", "TOP_SITES_INSERT", "TOP_SITES_OPEN_SEARCH_SHORTCUTS_MODAL", "TOP_SITES_PIN", "TOP_SITES_PREFS_UPDATED", "TOP_SITES_UNPIN", "TOP_SITES_UPDATED", "TOTAL_BOOKMARKS_REQUEST", "TOTAL_BOOKMARKS_RESPONSE", "UNINIT", "UPDATE_PINNED_SEARCH_SHORTCUTS", "UPDATE_SEARCH_SHORTCUTS", "UPDATE_SECTION_PREFS", "WEBEXT_CLICK", "WEBEXT_DISMISS"]) { +for (const type of ["ADDONS_INFO_REQUEST", "ADDONS_INFO_RESPONSE", "ARCHIVE_FROM_POCKET", "AS_ROUTER_INITIALIZED", "AS_ROUTER_PREF_CHANGED", "AS_ROUTER_TELEMETRY_USER_EVENT", "BLOCK_URL", "BOOKMARK_URL", "COPY_DOWNLOAD_LINK", "DELETE_BOOKMARK_BY_ID", "DELETE_FROM_POCKET", "DELETE_HISTORY_URL", "DIALOG_CANCEL", "DIALOG_OPEN", "DISCOVERY_STREAM_CONFIG_CHANGE", "DISCOVERY_STREAM_CONFIG_SETUP", "DISCOVERY_STREAM_CONFIG_SET_VALUE", "DISCOVERY_STREAM_FEEDS_UPDATE", "DISCOVERY_STREAM_IMPRESSION_STATS", "DISCOVERY_STREAM_LAYOUT_RESET", "DISCOVERY_STREAM_LAYOUT_UPDATE", "DISCOVERY_STREAM_LINK_BLOCKED", "DISCOVERY_STREAM_LOADED_CONTENT", "DISCOVERY_STREAM_OPT_OUT", "DISCOVERY_STREAM_SPOCS_CAPS", "DISCOVERY_STREAM_SPOCS_ENDPOINT", "DISCOVERY_STREAM_SPOCS_FILL", "DISCOVERY_STREAM_SPOCS_UPDATE", "DISCOVERY_STREAM_SPOC_IMPRESSION", "DOWNLOAD_CHANGED", "FAKE_FOCUS_SEARCH", "FILL_SEARCH_TERM", "HANDOFF_SEARCH_TO_AWESOMEBAR", "HIDE_SEARCH", "INIT", "NEW_TAB_INIT", "NEW_TAB_INITIAL_STATE", "NEW_TAB_LOAD", "NEW_TAB_REHYDRATED", "NEW_TAB_STATE_REQUEST", "NEW_TAB_UNLOAD", "OPEN_DOWNLOAD_FILE", "OPEN_LINK", "OPEN_NEW_WINDOW", "OPEN_PRIVATE_WINDOW", "OPEN_WEBEXT_SETTINGS", "PAGE_PRERENDERED", "PLACES_BOOKMARK_ADDED", "PLACES_BOOKMARK_REMOVED", "PLACES_HISTORY_CLEARED", "PLACES_LINKS_CHANGED", "PLACES_LINK_BLOCKED", "PLACES_LINK_DELETED", "PLACES_SAVED_TO_POCKET", "POCKET_CTA", "POCKET_LINK_DELETED_OR_ARCHIVED", "POCKET_LOGGED_IN", "POCKET_WAITING_FOR_SPOC", "PREFS_INITIAL_VALUES", "PREF_CHANGED", "PREVIEW_REQUEST", "PREVIEW_REQUEST_CANCEL", "PREVIEW_RESPONSE", "REMOVE_DOWNLOAD_FILE", "RICH_ICON_MISSING", "SAVE_SESSION_PERF_DATA", "SAVE_TO_POCKET", "SCREENSHOT_UPDATED", "SECTION_DEREGISTER", "SECTION_DISABLE", "SECTION_ENABLE", "SECTION_MOVE", "SECTION_OPTIONS_CHANGED", "SECTION_REGISTER", "SECTION_UPDATE", "SECTION_UPDATE_CARD", "SETTINGS_CLOSE", "SETTINGS_OPEN", "SET_PREF", "SHOW_DOWNLOAD_FILE", "SHOW_FIREFOX_ACCOUNTS", "SHOW_SEARCH", "SKIPPED_SIGNIN", "SNIPPETS_BLOCKLIST_CLEARED", "SNIPPETS_BLOCKLIST_UPDATED", "SNIPPETS_DATA", "SNIPPETS_PREVIEW_MODE", "SNIPPETS_RESET", "SNIPPET_BLOCKED", "SUBMIT_EMAIL", "SYSTEM_TICK", "TELEMETRY_IMPRESSION_STATS", "TELEMETRY_PERFORMANCE_EVENT", "TELEMETRY_UNDESIRED_EVENT", "TELEMETRY_USER_EVENT", "TOP_SITES_CANCEL_EDIT", "TOP_SITES_CLOSE_SEARCH_SHORTCUTS_MODAL", "TOP_SITES_EDIT", "TOP_SITES_INSERT", "TOP_SITES_OPEN_SEARCH_SHORTCUTS_MODAL", "TOP_SITES_PIN", "TOP_SITES_PREFS_UPDATED", "TOP_SITES_UNPIN", "TOP_SITES_UPDATED", "TOTAL_BOOKMARKS_REQUEST", "TOTAL_BOOKMARKS_RESPONSE", "UNINIT", "UPDATE_PINNED_SEARCH_SHORTCUTS", "UPDATE_SEARCH_SHORTCUTS", "UPDATE_SECTION_PREFS", "WEBEXT_CLICK", "WEBEXT_DISMISS"]) { actionTypes[type] = type; } // These are acceptable actions for AS Router messages to have. They can show up // as call-to-action buttons in snippets, onboarding tour, etc. @@ -358,6 +358,22 @@ function ASRouterUserEvent(data) { data }); } +/** + * DiscoveryStreamSpocsFill - A telemetry ping indicating a SPOCS Fill event. + * + * @param {object} data Fields to include in the ping (spocs_fills, etc.) + * @param {int} importContext (For testing) Override the import context for testing. + * @return {object} An AlsoToMain action + */ + + +function DiscoveryStreamSpocsFill(data, importContext = globalImportContext) { + const action = { + type: actionTypes.DISCOVERY_STREAM_SPOCS_FILL, + data + }; + return importContext === UI_CODE ? AlsoToMain(action) : action; +} /** * UndesiredEvent - A telemetry ping indicating an undesired state. * @@ -477,7 +493,8 @@ var actionCreators = { SetPref, WebExtEvent, DiscoveryStreamImpressionStats, - DiscoveryStreamLoadedContent + DiscoveryStreamLoadedContent, + DiscoveryStreamSpocsFill }; // These are helpers to test for certain kinds of actions var actionUtils = { @@ -550,16 +567,16 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var react_intl__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react_intl__WEBPACK_IMPORTED_MODULE_1__); /* harmony import */ var content_src_components_ASRouterAdmin_ASRouterAdmin__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(5); /* harmony import */ var _asrouter_asrouter_content__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6); -/* harmony import */ var content_src_components_ConfirmDialog_ConfirmDialog__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(28); +/* harmony import */ var content_src_components_ConfirmDialog_ConfirmDialog__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(29); /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(26); /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(react_redux__WEBPACK_IMPORTED_MODULE_5__); -/* harmony import */ var content_src_components_DiscoveryStreamBase_DiscoveryStreamBase__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(51); -/* harmony import */ var content_src_components_ErrorBoundary_ErrorBoundary__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(34); -/* harmony import */ var common_PrerenderData_jsm__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(44); +/* harmony import */ var content_src_components_DiscoveryStreamBase_DiscoveryStreamBase__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(52); +/* harmony import */ var content_src_components_ErrorBoundary_ErrorBoundary__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(35); +/* harmony import */ var common_PrerenderData_jsm__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(45); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(11); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_9__); -/* harmony import */ var content_src_components_Search_Search__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(45); -/* harmony import */ var content_src_components_Sections_Sections__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(46); +/* harmony import */ var content_src_components_Search_Search__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(46); +/* harmony import */ var content_src_components_Sections_Sections__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(47); function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); } @@ -648,7 +665,7 @@ class _Base extends react__WEBPACK_IMPORTED_MODULE_9___default.a.PureComponent { updateTheme() { const bodyClassName = ["activity-stream", // If we skipped the about:welcome overlay and removed the CSS classes // we don't want to add them back to the Activity Stream view - document.body.classList.contains("welcome") ? "welcome" : "", document.body.classList.contains("hide-main") ? "hide-main" : ""].filter(v => v).join(" "); + document.body.classList.contains("welcome") ? "welcome" : "", document.body.classList.contains("hide-main") ? "hide-main" : "", document.body.classList.contains("inline-onboarding") ? "inline-onboarding" : ""].filter(v => v).join(" "); global.document.body.className = bodyClassName; } @@ -744,6 +761,7 @@ class BaseContent extends react__WEBPACK_IMPORTED_MODULE_9___default.a.PureCompo showLogo: noSectionsEnabled, handoffEnabled: searchHandoffEnabled }, props.Search)))), react__WEBPACK_IMPORTED_MODULE_9___default.a.createElement(_asrouter_asrouter_content__WEBPACK_IMPORTED_MODULE_3__["ASRouterUISurface"], { + fxaEndpoint: this.props.Prefs.values.fxa_endpoint, dispatch: this.props.dispatch }), react__WEBPACK_IMPORTED_MODULE_9___default.a.createElement("div", { className: `body-wrapper${initialized ? " on" : ""}` @@ -788,7 +806,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var _asrouter_components_ModalOverlay_ModalOverlay__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(15); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(11); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_4__); -/* harmony import */ var _SimpleHashRouter__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(27); +/* harmony import */ var _SimpleHashRouter__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(28); function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); } @@ -1745,7 +1763,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var content_src_lib_init_store__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(7); /* harmony import */ var _rich_text_strings__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(9); /* harmony import */ var _components_ImpressionsWrapper_ImpressionsWrapper__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(10); -/* harmony import */ var fluent_react__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(54); +/* harmony import */ var fluent_react__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(55); /* harmony import */ var content_src_lib_constants__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(13); /* harmony import */ var _templates_OnboardingMessage_OnboardingMessage__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(14); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(11); @@ -1753,8 +1771,9 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var react_dom__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(16); /* harmony import */ var react_dom__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(react_dom__WEBPACK_IMPORTED_MODULE_9__); /* harmony import */ var _templates_ReturnToAMO_ReturnToAMO__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(17); -/* harmony import */ var _templates_template_manifest__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(52); +/* harmony import */ var _templates_template_manifest__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(53); /* harmony import */ var _templates_StartupOverlay_StartupOverlay__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(25); +/* harmony import */ var _templates_Trailhead_Trailhead__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(27); function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); } @@ -1770,8 +1789,10 @@ function _extends() { _extends = Object.assign || function (target) { for (var i + const INCOMING_MESSAGE_NAME = "ASRouter:parent-to-child"; const OUTGOING_MESSAGE_NAME = "ASRouter:child-to-parent"; +const TEMPLATES_ABOVE_PAGE = ["trailhead"]; const TEMPLATES_BELOW_SEARCH = ["simple_below_search_snippet"]; const ASRouterUtils = { addListener(listener) { @@ -1901,7 +1922,8 @@ class ASRouterUISurface extends react__WEBPACK_IMPORTED_MODULE_8___default.a.Pur }; if (props.document) { - this.portalContainer = props.document.getElementById("footer-snippets-container"); + this.headerPortal = props.document.getElementById("header-asrouter-container"); + this.footerPortal = props.document.getElementById("footer-asrouter-container"); } } @@ -2090,7 +2112,7 @@ class ASRouterUISurface extends react__WEBPACK_IMPORTED_MODULE_8___default.a.Pur } renderSnippets() { - if (this.state.bundle.template === "onboarding" || this.state.message.template === "fxa_overlay" || this.state.message.template === "return_to_amo_overlay") { + if (this.state.bundle.template === "onboarding" || this.state.message.template === "fxa_overlay" || this.state.message.template === "return_to_amo_overlay" || this.state.message.template === "trailhead") { return null; } @@ -2161,6 +2183,25 @@ class ASRouterUISurface extends react__WEBPACK_IMPORTED_MODULE_8___default.a.Pur return null; } + renderTrailhead() { + const { + message + } = this.state; + + if (message.template === "trailhead") { + return react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(_templates_Trailhead_Trailhead__WEBPACK_IMPORTED_MODULE_13__["Trailhead"], { + message: message, + onAction: ASRouterUtils.executeAction, + onDoneButton: this.dismissBundle(this.state.bundle.bundle), + sendUserActionTelemetry: this.sendUserActionTelemetry, + dispatch: this.props.dispatch, + fxaEndpoint: this.props.fxaEndpoint + }); + } + + return null; + } + renderPreviewBanner() { if (this.state.message.provider !== "preview") { return null; @@ -2184,12 +2225,13 @@ class ASRouterUISurface extends react__WEBPACK_IMPORTED_MODULE_8___default.a.Pur } const shouldRenderBelowSearch = TEMPLATES_BELOW_SEARCH.includes(message.template); + const shouldRenderInHeader = TEMPLATES_ABOVE_PAGE.includes(message.template); return shouldRenderBelowSearch ? // Render special below search snippets in place; react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("div", { className: "below-search-snippet" }, this.renderSnippets()) : // For onboarding, regular snippets etc. we should render // everything in our footer container. - react_dom__WEBPACK_IMPORTED_MODULE_9___default.a.createPortal(react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_8___default.a.Fragment, null, this.renderPreviewBanner(), this.renderFirstRunOverlay(), this.renderOnboarding(), this.renderSnippets()), this.portalContainer); + react_dom__WEBPACK_IMPORTED_MODULE_9___default.a.createPortal(react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_8___default.a.Fragment, null, this.renderPreviewBanner(), this.renderTrailhead(), this.renderFirstRunOverlay(), this.renderOnboarding(), this.renderSnippets()), shouldRenderInHeader ? this.headerPortal : this.footerPortal); } } @@ -2372,7 +2414,7 @@ module.exports = Redux; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "RICH_TEXT_KEYS", function() { return RICH_TEXT_KEYS; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "generateMessages", function() { return generateMessages; }); -/* harmony import */ var fluent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(53); +/* harmony import */ var fluent__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(54); /** * Properties that allow rich text MUST be added to this list. @@ -2546,6 +2588,7 @@ const NEWTAB_DARK_THEME = { "use strict"; __webpack_require__.r(__webpack_exports__); +/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "OnboardingCard", function() { return OnboardingCard; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "OnboardingMessage", function() { return OnboardingMessage; }); /* harmony import */ var _components_ModalOverlay_ModalOverlay__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(15); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(11); @@ -2554,7 +2597,7 @@ function _extends() { _extends = Object.assign || function (target) { for (var i - +const FLUENT_FILES = ["branding/brand.ftl", "browser/branding/sync-brand.ftl", "browser/newtab/onboarding.ftl"]; class OnboardingCard extends react__WEBPACK_IMPORTED_MODULE_1___default.a.PureComponent { constructor(props) { super(props); @@ -2578,22 +2621,38 @@ class OnboardingCard extends react__WEBPACK_IMPORTED_MODULE_1___default.a.PureCo const { content } = this.props; + const className = this.props.className || "onboardingMessage"; return react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement("div", { - className: "onboardingMessage" + className: className }, react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement("div", { className: `onboardingMessageImage ${content.icon}` }), react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement("div", { className: "onboardingContent" - }, react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement("span", null, react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement("h3", null, " ", content.title, " "), react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement("p", null, " ", content.text, " ")), react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement("span", null, react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement("button", { - tabIndex: "1", + }, react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement("span", null, react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement("h3", { + className: "onboardingTitle", + "data-l10n-id": content.title.string_id + }), react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement("p", { + className: "onboardingText", + "data-l10n-id": content.text.string_id + })), react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement("span", { + className: "onboardingButtonContainer" + }, react__WEBPACK_IMPORTED_MODULE_1___default.a.createElement("button", { + "data-l10n-id": content.primary_button.label.string_id, className: "button onboardingButton", onClick: this.onClick - }, " ", content.primary_button.label, " ")))); + })))); } } - class OnboardingMessage extends react__WEBPACK_IMPORTED_MODULE_1___default.a.PureComponent { + componentWillMount() { + FLUENT_FILES.forEach(file => { + const link = document.head.appendChild(document.createElement("link")); + link.href = file; + link.rel = "localization"; + }); + } + render() { const { props @@ -2623,47 +2682,68 @@ class OnboardingMessage extends react__WEBPACK_IMPORTED_MODULE_1___default.a.Pur "use strict"; __webpack_require__.r(__webpack_exports__); +/* WEBPACK VAR INJECTION */(function(global) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ModalOverlayWrapper", function() { return ModalOverlayWrapper; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ModalOverlay", function() { return ModalOverlay; }); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(11); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__); -class ModalOverlay extends react__WEBPACK_IMPORTED_MODULE_0___default.a.PureComponent { +class ModalOverlayWrapper extends react__WEBPACK_IMPORTED_MODULE_0___default.a.PureComponent { + constructor(props) { + super(props); + this.onKeyDown = this.onKeyDown.bind(this); + } + + onKeyDown(event) { + if (event.key === "Escape") { + this.props.onClose(); + } + } + componentWillMount() { - this.setState({ - active: true - }); - document.body.classList.add("modal-open"); + this.props.document.addEventListener("keydown", this.onKeyDown); + this.props.document.body.classList.add("modal-open"); } componentWillUnmount() { - document.body.classList.remove("modal-open"); - this.setState({ - active: false - }); + this.props.document.removeEventListener("keydown", this.onKeyDown); + this.props.document.body.classList.remove("modal-open"); } render() { const { - active - } = this.state; + props + } = this; + return react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_0___default.a.Fragment, null, react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", { + className: "modalOverlayOuter active", + onClick: props.onClose, + role: "presentation" + }), react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", { + className: `modalOverlayInner active ${props.innerClassName || ""}` + }, props.children)); + } + +} +ModalOverlayWrapper.defaultProps = { + document: global.document +}; +class ModalOverlay extends react__WEBPACK_IMPORTED_MODULE_0___default.a.PureComponent { + render() { const { title, button_label } = this.props; - return react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", null, react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", { - className: `modalOverlayOuter ${active ? "active" : ""}` - }), react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", { - className: `modalOverlayInner ${active ? "active" : ""}` + return react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement(ModalOverlayWrapper, { + onClose: this.props.onDoneButton }, react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("h2", null, " ", title, " "), this.props.children, react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("div", { className: "footer" }, react__WEBPACK_IMPORTED_MODULE_0___default.a.createElement("button", { - tabIndex: "2", - onClick: this.props.onDoneButton, - className: "button primary modalButton" - }, " ", button_label, " ")))); + className: "button primary modalButton", + onClick: this.props.onDoneButton + }, " ", button_label, " "))); } } +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(1))) /***/ }), /* 16 */ @@ -2753,7 +2833,7 @@ class ReturnToAMO extends react__WEBPACK_IMPORTED_MODULE_0___default.a.PureCompo __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "convertLinks", function() { return convertLinks; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "RichText", function() { return RichText; }); -/* harmony import */ var fluent_react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(54); +/* harmony import */ var fluent_react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(55); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(11); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__); /* harmony import */ var _rich_text_strings__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(9); @@ -3170,6 +3250,277 @@ module.exports = ReactRedux; /* 27 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { +"use strict"; +__webpack_require__.r(__webpack_exports__); +/* WEBPACK VAR INJECTION */(function(global) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Trailhead", function() { return Trailhead; }); +/* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2); +/* harmony import */ var _components_ModalOverlay_ModalOverlay__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(15); +/* harmony import */ var _OnboardingMessage_OnboardingMessage__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(14); +/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(11); +/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_3__); +function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); } + + + + + +const FLUENT_FILES = ["branding/brand.ftl", "browser/branding/sync-brand.ftl", // These are finalized strings exposed to localizers +"browser/newtab/onboarding.ftl", // These are WIP/in-development strings that only get used if the string +// doesn't already exist in onboarding.ftl above +"trailhead.ftl"]; +class Trailhead extends react__WEBPACK_IMPORTED_MODULE_3___default.a.PureComponent { + constructor(props) { + super(props); + this.closeModal = this.closeModal.bind(this); + this.onInputChange = this.onInputChange.bind(this); + this.onSubmit = this.onSubmit.bind(this); + this.onInputInvalid = this.onInputInvalid.bind(this); + this.state = { + emailInput: "", + isModalOpen: true, + flowId: "", + flowBeginTime: 0 + }; + this.didFetch = false; + } + + async componentWillMount() { + FLUENT_FILES.forEach(file => { + const link = document.head.appendChild(document.createElement("link")); + link.href = file; + link.rel = "localization"; + }); + + if (this.props.fxaEndpoint && !this.didFetch) { + try { + this.didFetch = true; + const fxaParams = "entrypoint=activity-stream-firstrun&utm_source=activity-stream&utm_campaign=firstrun&utm_term=trailhead&form_type=email"; + const response = await fetch(`${this.props.fxaEndpoint}/metrics-flow?${fxaParams}`, { + credentials: "omit" + }); + + if (response.status === 200) { + const { + flowId, + flowBeginTime + } = await response.json(); + this.setState({ + flowId, + flowBeginTime + }); + } else { + this.props.dispatch(common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__["actionCreators"].OnlyToMain({ + type: common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__["actionTypes"].TELEMETRY_UNDESIRED_EVENT, + data: { + event: "FXA_METRICS_FETCH_ERROR", + value: response.status + } + })); + } + } catch (error) { + this.props.dispatch(common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__["actionCreators"].OnlyToMain({ + type: common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__["actionTypes"].TELEMETRY_UNDESIRED_EVENT, + data: { + event: "FXA_METRICS_ERROR" + } + })); + } + } + } + + componentDidMount() { + // We need to remove hide-main since we should show it underneath everything that has rendered + global.document.body.classList.remove("hide-main"); // Add inline-onboarding class to disable fixed search header and fixed positioned settings icon + + global.document.body.classList.add("inline-onboarding"); + } + + componentDidUnmount() { + global.document.body.classList.remove("inline-onboarding"); + } + + onInputChange(e) { + let error = e.target.previousSibling; + this.setState({ + emailInput: e.target.value + }); + error.classList.remove("active"); + e.target.classList.remove("invalid"); + } + + onSubmit() { + this.props.dispatch(common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__["actionCreators"].UserEvent({ + event: "SUBMIT_EMAIL", + ...this._getFormInfo() + })); + global.addEventListener("visibilitychange", this.closeModal); + } + + closeModal() { + global.removeEventListener("visibilitychange", this.closeModal); + global.document.body.classList.remove("welcome"); + this.setState({ + isModalOpen: false + }); + this.props.dispatch(common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__["actionCreators"].UserEvent({ + event: "SKIPPED_SIGNIN", + ...this._getFormInfo() + })); + } + /** + * Report to telemetry additional information about the form submission. + */ + + + _getFormInfo() { + const value = { + has_flow_params: this.state.flowId.length > 0 + }; + return { + value + }; + } + + onInputInvalid(e) { + let error = e.target.previousSibling; + error.classList.add("active"); + e.target.classList.add("invalid"); + e.preventDefault(); // Override built-in form validation popup + + e.target.focus(); + } + + render() { + const { + props + } = this; + const { + bundle: cards, + content + } = props.message; + return react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_3___default.a.Fragment, null, this.state.isModalOpen && content ? react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(_components_ModalOverlay_ModalOverlay__WEBPACK_IMPORTED_MODULE_1__["ModalOverlayWrapper"], { + innerClassName: `trailhead ${content.className}`, + onClose: this.closeModal + }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("div", { + className: "trailheadInner" + }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("div", { + className: "trailheadContent" + }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("h1", { + "data-l10n-id": content.title.string_id + }, content.title.value), content.subtitle && react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("p", { + "data-l10n-id": content.subtitle.string_id + }, content.subtitle.value), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("ul", { + className: "trailheadBenefits" + }, content.benefits.map(item => react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("li", { + key: item.id, + className: item.id + }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("h3", { + "data-l10n-id": item.title.string_id + }, item.title.value), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("p", { + "data-l10n-id": item.text.string_id + }, item.text.value)))), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("a", { + className: "trailheadLearn", + "data-l10n-id": content.learn.text.string_id, + href: content.learn.url + }, content.learn.text.value)), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("div", { + className: "trailheadForm" + }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("h3", { + "data-l10n-id": content.form.title.string_id + }, content.form.title.value), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("p", { + "data-l10n-id": content.form.text.string_id + }, content.form.text.value), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("form", { + method: "get", + action: this.props.fxaEndpoint, + target: "_blank", + rel: "noopener noreferrer", + onSubmit: this.onSubmit + }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("input", { + name: "service", + type: "hidden", + value: "sync" + }), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("input", { + name: "action", + type: "hidden", + value: "email" + }), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("input", { + name: "context", + type: "hidden", + value: "fx_desktop_v3" + }), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("input", { + name: "entrypoint", + type: "hidden", + value: "activity-stream-firstrun" + }), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("input", { + name: "utm_source", + type: "hidden", + value: "activity-stream" + }), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("input", { + name: "utm_campaign", + type: "hidden", + value: "firstrun" + }), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("input", { + name: "utm_term", + type: "hidden", + value: "trailhead" + }), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("input", { + name: "flow_id", + type: "hidden", + value: this.state.flowId + }), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("input", { + name: "flow_begin_time", + type: "hidden", + value: this.state.flowBeginTime + }), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("p", { + "data-l10n-id": "onboarding-join-form-email-error", + className: "error" + }), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("input", { + "data-l10n-id": content.form.email.string_id, + placeholder: content.form.email.placeholder, + name: "email", + type: "email", + required: "true", + onInvalid: this.onInputInvalid, + onChange: this.onInputChange + }), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("p", { + className: "trailheadTerms", + "data-l10n-id": "onboarding-join-form-legal" + }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("a", { + "data-l10n-name": "terms", + href: "https://accounts.firefox.com/legal/terms" + }), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("a", { + "data-l10n-name": "privacy", + href: "https://accounts.firefox.com/legal/privacy" + })), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", { + "data-l10n-id": content.form.button.string_id, + type: "submit" + }, content.form.button.value)))), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("button", { + className: "trailheadStart", + "data-l10n-id": content.skipButton.string_id, + onClick: this.closeModal + }, content.skipButton.value)) : null, cards && cards.length ? react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("div", { + className: "trailheadCards" + }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("div", { + className: "trailheadCardsInner" + }, react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("h1", { + "data-l10n-id": "onboarding-welcome-header" + }), react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("div", { + className: "trailheadCardGrid" + }, cards.map(card => react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(_OnboardingMessage_OnboardingMessage__WEBPACK_IMPORTED_MODULE_2__["OnboardingCard"], _extends({ + key: card.id, + className: "trailheadCard", + sendUserActionTelemetry: props.sendUserActionTelemetry, + onAction: props.onAction, + UISurface: "TRAILHEAD" + }, card)))))) : null); + } + +} +/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(1))) + +/***/ }), +/* 28 */ +/***/ (function(module, __webpack_exports__, __webpack_require__) { + "use strict"; __webpack_require__.r(__webpack_exports__); /* WEBPACK VAR INJECTION */(function(global) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SimpleHashRouter", function() { return SimpleHashRouter; }); @@ -3213,7 +3564,7 @@ class SimpleHashRouter extends react__WEBPACK_IMPORTED_MODULE_0___default.a.Pure /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(1))) /***/ }), -/* 28 */ +/* 29 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -3320,7 +3671,7 @@ class _ConfirmDialog extends react__WEBPACK_IMPORTED_MODULE_3___default.a.PureCo const ConfirmDialog = Object(react_redux__WEBPACK_IMPORTED_MODULE_1__["connect"])(state => state.Dialog)(_ConfirmDialog); /***/ }), -/* 29 */ +/* 30 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -3330,10 +3681,10 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2); /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(26); /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react_redux__WEBPACK_IMPORTED_MODULE_1__); -/* harmony import */ var content_src_components_ContextMenu_ContextMenu__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(30); +/* harmony import */ var content_src_components_ContextMenu_ContextMenu__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(31); /* harmony import */ var react_intl__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(4); /* harmony import */ var react_intl__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(react_intl__WEBPACK_IMPORTED_MODULE_3__); -/* harmony import */ var content_src_lib_link_menu_options__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(31); +/* harmony import */ var content_src_lib_link_menu_options__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(32); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(11); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_5__); @@ -3419,7 +3770,7 @@ const getState = state => ({ const LinkMenu = Object(react_redux__WEBPACK_IMPORTED_MODULE_1__["connect"])(getState)(Object(react_intl__WEBPACK_IMPORTED_MODULE_3__["injectIntl"])(_LinkMenu)); /***/ }), -/* 30 */ +/* 31 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -3539,7 +3890,7 @@ class ContextMenuItem extends react__WEBPACK_IMPORTED_MODULE_0___default.a.PureC /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(1))) /***/ }), -/* 31 */ +/* 32 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -3832,7 +4183,7 @@ const LinkMenuOptions = { }; /***/ }), -/* 32 */ +/* 33 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -4053,7 +4404,7 @@ ImpressionStats.defaultProps = { /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(1))) /***/ }), -/* 33 */ +/* 34 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -4063,11 +4414,11 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var react_intl__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(4); /* harmony import */ var react_intl__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react_intl__WEBPACK_IMPORTED_MODULE_0__); /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2); -/* harmony import */ var content_src_components_ErrorBoundary_ErrorBoundary__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(34); +/* harmony import */ var content_src_components_ErrorBoundary_ErrorBoundary__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(35); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(11); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_3__); -/* harmony import */ var content_src_components_SectionMenu_SectionMenu__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(35); -/* harmony import */ var content_src_lib_section_menu_options__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(36); +/* harmony import */ var content_src_components_SectionMenu_SectionMenu__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(36); +/* harmony import */ var content_src_lib_section_menu_options__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(37); @@ -4349,7 +4700,7 @@ const CollapsibleSection = Object(react_intl__WEBPACK_IMPORTED_MODULE_0__["injec /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(1))) /***/ }), -/* 34 */ +/* 35 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -4438,7 +4789,7 @@ ErrorBoundary.defaultProps = { }; /***/ }), -/* 35 */ +/* 36 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -4446,12 +4797,12 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "_SectionMenu", function() { return _SectionMenu; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SectionMenu", function() { return SectionMenu; }); /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2); -/* harmony import */ var content_src_components_ContextMenu_ContextMenu__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(30); +/* harmony import */ var content_src_components_ContextMenu_ContextMenu__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(31); /* harmony import */ var react_intl__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4); /* harmony import */ var react_intl__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(react_intl__WEBPACK_IMPORTED_MODULE_2__); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(11); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_3__); -/* harmony import */ var content_src_lib_section_menu_options__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(36); +/* harmony import */ var content_src_lib_section_menu_options__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(37); @@ -4526,7 +4877,7 @@ class _SectionMenu extends react__WEBPACK_IMPORTED_MODULE_3___default.a.PureComp const SectionMenu = Object(react_intl__WEBPACK_IMPORTED_MODULE_2__["injectIntl"])(_SectionMenu); /***/ }), -/* 36 */ +/* 37 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -4653,7 +5004,7 @@ const SectionMenuOptions = { }; /***/ }), -/* 37 */ +/* 38 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -4661,19 +5012,19 @@ __webpack_require__.r(__webpack_exports__); /* WEBPACK VAR INJECTION */(function(global) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "_TopSites", function() { return _TopSites; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TopSites", function() { return TopSites; }); /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2); -/* harmony import */ var _TopSitesConstants__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(38); -/* harmony import */ var content_src_components_CollapsibleSection_CollapsibleSection__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(33); -/* harmony import */ var content_src_components_ComponentPerfTimer_ComponentPerfTimer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(39); +/* harmony import */ var _TopSitesConstants__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(39); +/* harmony import */ var content_src_components_CollapsibleSection_CollapsibleSection__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(34); +/* harmony import */ var content_src_components_ComponentPerfTimer_ComponentPerfTimer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(40); /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(26); /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(react_redux__WEBPACK_IMPORTED_MODULE_4__); /* harmony import */ var react_intl__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(4); /* harmony import */ var react_intl__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(react_intl__WEBPACK_IMPORTED_MODULE_5__); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(11); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_6__); -/* harmony import */ var _SearchShortcutsForm__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(41); -/* harmony import */ var common_Reducers_jsm__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(55); -/* harmony import */ var _TopSiteForm__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(57); -/* harmony import */ var _TopSite__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(42); +/* harmony import */ var _SearchShortcutsForm__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(42); +/* harmony import */ var common_Reducers_jsm__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(56); +/* harmony import */ var _TopSiteForm__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(58); +/* harmony import */ var _TopSite__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(43); function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); } @@ -4881,7 +5232,7 @@ const TopSites = Object(react_redux__WEBPACK_IMPORTED_MODULE_4__["connect"])(sta /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(1))) /***/ }), -/* 38 */ +/* 39 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -4901,14 +5252,14 @@ const MIN_RICH_FAVICON_SIZE = 96; // minimum size necessary to show any icon in const MIN_CORNER_FAVICON_SIZE = 16; /***/ }), -/* 39 */ +/* 40 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ComponentPerfTimer", function() { return ComponentPerfTimer; }); /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2); -/* harmony import */ var common_PerfService_jsm__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(40); +/* harmony import */ var common_PerfService_jsm__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(41); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(11); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_2__); @@ -5078,7 +5429,7 @@ class ComponentPerfTimer extends react__WEBPACK_IMPORTED_MODULE_2___default.a.Co } /***/ }), -/* 40 */ +/* 41 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -5216,7 +5567,7 @@ _PerfService.prototype = { var perfService = new _PerfService(); /***/ }), -/* 41 */ +/* 42 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -5228,7 +5579,7 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var react_intl__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react_intl__WEBPACK_IMPORTED_MODULE_1__); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(11); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_2__); -/* harmony import */ var _TopSitesConstants__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(38); +/* harmony import */ var _TopSitesConstants__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(39); @@ -5410,7 +5761,7 @@ class SearchShortcutsForm extends react__WEBPACK_IMPORTED_MODULE_2___default.a.P } /***/ }), -/* 42 */ +/* 43 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -5423,12 +5774,12 @@ __webpack_require__.r(__webpack_exports__); /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2); /* harmony import */ var react_intl__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4); /* harmony import */ var react_intl__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react_intl__WEBPACK_IMPORTED_MODULE_1__); -/* harmony import */ var _TopSitesConstants__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(38); -/* harmony import */ var content_src_components_LinkMenu_LinkMenu__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(29); +/* harmony import */ var _TopSitesConstants__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(39); +/* harmony import */ var content_src_components_LinkMenu_LinkMenu__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(30); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(11); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_4__); -/* harmony import */ var content_src_lib_screenshot_utils__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(43); -/* harmony import */ var common_Reducers_jsm__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(55); +/* harmony import */ var content_src_lib_screenshot_utils__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(44); +/* harmony import */ var common_Reducers_jsm__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(56); function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); } @@ -6068,7 +6419,7 @@ class _TopSiteList extends react__WEBPACK_IMPORTED_MODULE_4___default.a.PureComp const TopSiteList = Object(react_intl__WEBPACK_IMPORTED_MODULE_1__["injectIntl"])(_TopSiteList); /***/ }), -/* 43 */ +/* 44 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -6133,7 +6484,7 @@ const ScreenshotUtils = { /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(1))) /***/ }), -/* 44 */ +/* 45 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -6271,7 +6622,7 @@ var PrerenderData = new _PrerenderData({ }); /***/ }), -/* 45 */ +/* 46 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -6479,7 +6830,7 @@ class _Search extends react__WEBPACK_IMPORTED_MODULE_4___default.a.PureComponent const Search = Object(react_redux__WEBPACK_IMPORTED_MODULE_2__["connect"])()(Object(react_intl__WEBPACK_IMPORTED_MODULE_1__["injectIntl"])(_Search)); /***/ }), -/* 46 */ +/* 47 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -6489,19 +6840,19 @@ __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "_Sections", function() { return _Sections; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Sections", function() { return Sections; }); /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2); -/* harmony import */ var content_src_components_Card_Card__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(56); +/* harmony import */ var content_src_components_Card_Card__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(57); /* harmony import */ var react_intl__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4); /* harmony import */ var react_intl__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(react_intl__WEBPACK_IMPORTED_MODULE_2__); -/* harmony import */ var content_src_components_CollapsibleSection_CollapsibleSection__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(33); -/* harmony import */ var content_src_components_ComponentPerfTimer_ComponentPerfTimer__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(39); +/* harmony import */ var content_src_components_CollapsibleSection_CollapsibleSection__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(34); +/* harmony import */ var content_src_components_ComponentPerfTimer_ComponentPerfTimer__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(40); /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(26); /* harmony import */ var react_redux__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(react_redux__WEBPACK_IMPORTED_MODULE_5__); -/* harmony import */ var content_src_components_MoreRecommendations_MoreRecommendations__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(47); -/* harmony import */ var content_src_components_PocketLoggedInCta_PocketLoggedInCta__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(48); +/* harmony import */ var content_src_components_MoreRecommendations_MoreRecommendations__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(48); +/* harmony import */ var content_src_components_PocketLoggedInCta_PocketLoggedInCta__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(49); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(11); /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_8__); -/* harmony import */ var content_src_components_Topics_Topics__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(49); -/* harmony import */ var content_src_components_TopSites_TopSites__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(37); +/* harmony import */ var content_src_components_Topics_Topics__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(50); +/* harmony import */ var content_src_components_TopSites_TopSites__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(38); function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); } @@ -6850,7 +7201,7 @@ const Sections = Object(react_redux__WEBPACK_IMPORTED_MODULE_5__["connect"])(sta /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(1))) /***/ }), -/* 47 */ +/* 48 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -6883,7 +7234,7 @@ class MoreRecommendations extends react__WEBPACK_IMPORTED_MODULE_1___default.a.P } /***/ }), -/* 48 */ +/* 49 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -6926,7 +7277,7 @@ const PocketLoggedInCta = Object(react_redux__WEBPACK_IMPORTED_MODULE_0__["conne }))(_PocketLoggedInCta); /***/ }), -/* 49 */ +/* 50 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -6971,14 +7322,14 @@ class Topics extends react__WEBPACK_IMPORTED_MODULE_1___default.a.PureComponent } /***/ }), -/* 50 */ +/* 51 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; __webpack_require__.r(__webpack_exports__); /* WEBPACK VAR INJECTION */(function(global) {/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DetectUserSessionStart", function() { return DetectUserSessionStart; }); /* harmony import */ var common_Actions_jsm__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2); -/* harmony import */ var common_PerfService_jsm__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(40); +/* harmony import */ var common_PerfService_jsm__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(41); const VISIBLE = "visible"; @@ -7050,7 +7401,7 @@ class DetectUserSessionStart { /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(1))) /***/ }), -/* 51 */ +/* 52 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -7171,7 +7522,7 @@ DSImage_DSImage.defaultProps = { var external_ReactIntl_ = __webpack_require__(4); // EXTERNAL MODULE: ./content-src/components/LinkMenu/LinkMenu.jsx -var LinkMenu = __webpack_require__(29); +var LinkMenu = __webpack_require__(30); // CONCATENATED MODULE: ./content-src/components/DiscoveryStreamComponents/DSLinkMenu/DSLinkMenu.jsx @@ -7265,7 +7616,7 @@ class DSLinkMenu_DSLinkMenu extends external_React_default.a.PureComponent { } const DSLinkMenu = Object(external_ReactIntl_["injectIntl"])(DSLinkMenu_DSLinkMenu); // EXTERNAL MODULE: ./content-src/components/DiscoveryStreamImpressionStats/ImpressionStats.jsx -var ImpressionStats = __webpack_require__(32); +var ImpressionStats = __webpack_require__(33); // CONCATENATED MODULE: ./content-src/components/DiscoveryStreamComponents/SafeAnchor/SafeAnchor.jsx @@ -7508,7 +7859,7 @@ CardGrid_CardGrid.defaultProps = { }; // EXTERNAL MODULE: ./content-src/components/CollapsibleSection/CollapsibleSection.jsx -var CollapsibleSection = __webpack_require__(33); +var CollapsibleSection = __webpack_require__(34); // EXTERNAL MODULE: external "ReactRedux" var external_ReactRedux_ = __webpack_require__(26); @@ -7910,7 +8261,10 @@ const selectLayoutRender = (state, prefs, rickRollCache) => { spocs } = state; let spocIndex = 0; - let bufferRollCache = []; // rickRollCache stores random probability values for each spoc position. This cache is empty + let bufferRollCache = []; // Records the chosen and unchosen spocs by the probability selection. + + let chosenSpocs = new Set(); + let unchosenSpocs = new Set(); // rickRollCache stores random probability values for each spoc position. This cache is empty // on page refresh and gets filled with random values on first render inside maybeInjectSpocs. const isFirstRun = !rickRollCache.length; @@ -7920,7 +8274,13 @@ const selectLayoutRender = (state, prefs, rickRollCache) => { const recommendations = [...data.recommendations]; for (let position of spocsConfig.positions) { - // Cache random number for a position + const spoc = spocs.data.spocs[spocIndex]; + + if (!spoc) { + break; + } // Cache random number for a position + + let rickRoll; if (isFirstRun) { @@ -7931,8 +8291,12 @@ const selectLayoutRender = (state, prefs, rickRollCache) => { bufferRollCache.push(rickRoll); } - if (spocs.data.spocs[spocIndex] && rickRoll <= spocsConfig.probability) { - recommendations.splice(position.index, 0, spocs.data.spocs[spocIndex++]); + if (rickRoll <= spocsConfig.probability) { + spocIndex++; + recommendations.splice(position.index, 0, spoc); + chosenSpocs.add(spoc); + } else { + unchosenSpocs.add(spoc); } } @@ -7956,7 +8320,7 @@ const selectLayoutRender = (state, prefs, rickRollCache) => { filterArray.push(...DS_COMPONENTS); } - return layout.map(row => ({ ...row, + const layoutRender = layout.map(row => ({ ...row, // Loops through desired components and adds a .data property // containing data from feeds components: row.components.filter(c => !filterArray.includes(c.type)).map(component => { @@ -7998,10 +8362,42 @@ const selectLayoutRender = (state, prefs, rickRollCache) => { data }; }) - })).filter(row => row.components.length); + })).filter(row => row.components.length); // Generate the payload for the SPOCS Fill ping. Note that a SPOC could be rejected + // by the `probability_selection` first, then gets chosen for the next position. For + // all other SPOCS that never went through the probabilistic selection, its reason will + // be "out_of_position". + + let spocsFill = []; + + if (spocs.data && spocs.data.spocs) { + const chosenSpocsFill = [...chosenSpocs].map(spoc => ({ + id: spoc.id, + reason: "n/a", + displayed: 1, + full_recalc: 0 + })); + const unchosenSpocsFill = [...unchosenSpocs].filter(spoc => !chosenSpocs.has(spoc)).map(spoc => ({ + id: spoc.id, + reason: "probability_selection", + displayed: 0, + full_recalc: 0 + })); + const outOfPositionSpocsFill = spocs.data.spocs.slice(spocIndex).filter(spoc => !unchosenSpocs.has(spoc)).map(spoc => ({ + id: spoc.id, + reason: "out_of_position", + displayed: 0, + full_recalc: 0 + })); + spocsFill = [...chosenSpocsFill, ...unchosenSpocsFill, ...outOfPositionSpocsFill]; + } + + return { + spocsFill, + layoutRender + }; }; // EXTERNAL MODULE: ./content-src/components/TopSites/TopSites.jsx -var TopSites = __webpack_require__(37); +var TopSites = __webpack_require__(38); // CONCATENATED MODULE: ./content-src/components/DiscoveryStreamComponents/TopSites/TopSites.jsx @@ -8038,6 +8434,7 @@ const TopSites_TopSites_TopSites = Object(external_ReactRedux_["connect"])(state + const ALLOWED_CSS_URL_PREFIXES = ["chrome://", "resource://", "https://img-getpocket.cdn.mozilla.net/"]; const DUMMY_CSS_SELECTOR = "DUMMY#CSS.SELECTOR"; let rickRollCache = []; // Cache of random probability values for a spoc position @@ -8202,7 +8599,10 @@ class DiscoveryStreamBase_DiscoveryStreamBase extends external_React_default.a.P render() { // Select layout render data by adding spocs and position to recommendations - const layoutRender = selectLayoutRender(this.props.DiscoveryStream, this.props.Prefs.values, rickRollCache); + const { + layoutRender, + spocsFill + } = selectLayoutRender(this.props.DiscoveryStream, this.props.Prefs.values, rickRollCache); const { config, feeds, @@ -8211,6 +8611,15 @@ class DiscoveryStreamBase_DiscoveryStreamBase extends external_React_default.a.P if (!spocs.loaded || !feeds.loaded) { return null; + } // Send SPOCS Fill if any. Note that it should not send it again if the same + // page gets re-rendered by state changes. + + + if (spocsFill.length && !this._spocsFillSent) { + this.props.dispatch(Actions["actionCreators"].DiscoveryStreamSpocsFill({ + spoc_fills: spocsFill + })); + this._spocsFillSent = true; } // Allow rendering without extracting special components @@ -8297,7 +8706,7 @@ const DiscoveryStreamBase = Object(external_ReactRedux_["connect"])(state => ({ }))(DiscoveryStreamBase_DiscoveryStreamBase); /***/ }), -/* 52 */ +/* 53 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -9309,7 +9718,7 @@ const SnippetsTemplates = { }; /***/ }), -/* 53 */ +/* 54 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -11512,7 +11921,7 @@ function ftl(strings) { /***/ }), -/* 54 */ +/* 55 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -11526,7 +11935,7 @@ var external_PropTypes_ = __webpack_require__(12); var external_PropTypes_default = /*#__PURE__*/__webpack_require__.n(external_PropTypes_); // EXTERNAL MODULE: ./node_modules/fluent/src/index.js + 8 modules -var src = __webpack_require__(53); +var src = __webpack_require__(54); // CONCATENATED MODULE: ./node_modules/fluent-react/src/localization.js @@ -12040,7 +12449,7 @@ localized_Localized.propTypes = { /***/ }), -/* 55 */ +/* 56 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -12786,7 +13195,7 @@ function DiscoveryStream(prevState = INITIAL_STATE.DiscoveryStream, action) { return prevState; - case Actions["actionTypes"].PLACES_LINK_BLOCKED: + case Actions["actionTypes"].DISCOVERY_STREAM_LINK_BLOCKED: return isNotReady() ? prevState : nextState(items => items.filter(item => item.url !== action.data.url)); case Actions["actionTypes"].PLACES_SAVED_TO_POCKET: @@ -12884,7 +13293,7 @@ var reducers = { }; /***/ }), -/* 56 */ +/* 57 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -12927,17 +13336,17 @@ const cardContextTypes = { var external_ReactRedux_ = __webpack_require__(26); // EXTERNAL MODULE: ./content-src/lib/link-menu-options.js -var link_menu_options = __webpack_require__(31); +var link_menu_options = __webpack_require__(32); // EXTERNAL MODULE: ./content-src/components/LinkMenu/LinkMenu.jsx -var LinkMenu = __webpack_require__(29); +var LinkMenu = __webpack_require__(30); // EXTERNAL MODULE: external "React" var external_React_ = __webpack_require__(11); var external_React_default = /*#__PURE__*/__webpack_require__.n(external_React_); // EXTERNAL MODULE: ./content-src/lib/screenshot-utils.js -var screenshot_utils = __webpack_require__(43); +var screenshot_utils = __webpack_require__(44); // CONCATENATED MODULE: ./content-src/components/Card/Card.jsx /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "_Card", function() { return Card_Card; }); @@ -13276,7 +13685,7 @@ const PlaceholderCard = props => external_React_default.a.createElement(Card, { }); /***/ }), -/* 57 */ +/* 58 */ /***/ (function(module, __webpack_exports__, __webpack_require__) { "use strict"; @@ -13293,7 +13702,7 @@ var external_React_ = __webpack_require__(11); var external_React_default = /*#__PURE__*/__webpack_require__.n(external_React_); // EXTERNAL MODULE: ./content-src/components/TopSites/TopSitesConstants.js -var TopSitesConstants = __webpack_require__(38); +var TopSitesConstants = __webpack_require__(39); // CONCATENATED MODULE: ./content-src/components/TopSites/TopSiteFormInput.jsx @@ -13384,7 +13793,7 @@ TopSiteFormInput_TopSiteFormInput.defaultProps = { validationError: false }; // EXTERNAL MODULE: ./content-src/components/TopSites/TopSite.jsx -var TopSite = __webpack_require__(42); +var TopSite = __webpack_require__(43); // CONCATENATED MODULE: ./content-src/components/TopSites/TopSiteForm.jsx /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TopSiteForm", function() { return TopSiteForm_TopSiteForm; }); diff --git a/browser/components/newtab/data/content/assets/trailhead/accounts-form-bg.jpg b/browser/components/newtab/data/content/assets/trailhead/accounts-form-bg.jpg new file mode 100755 index 000000000000..cd9b5d513d0d Binary files /dev/null and b/browser/components/newtab/data/content/assets/trailhead/accounts-form-bg.jpg differ diff --git a/browser/components/newtab/data/content/assets/trailhead/benefit-knowledge.png b/browser/components/newtab/data/content/assets/trailhead/benefit-knowledge.png new file mode 100755 index 000000000000..7bf74839e81e Binary files /dev/null and b/browser/components/newtab/data/content/assets/trailhead/benefit-knowledge.png differ diff --git a/browser/components/newtab/data/content/assets/trailhead/benefit-privacy.png b/browser/components/newtab/data/content/assets/trailhead/benefit-privacy.png new file mode 100755 index 000000000000..943fe4c7d39f Binary files /dev/null and b/browser/components/newtab/data/content/assets/trailhead/benefit-privacy.png differ diff --git a/browser/components/newtab/data/content/assets/trailhead/benefit-products.png b/browser/components/newtab/data/content/assets/trailhead/benefit-products.png new file mode 100755 index 000000000000..08ee42b329e6 Binary files /dev/null and b/browser/components/newtab/data/content/assets/trailhead/benefit-products.png differ diff --git a/browser/components/newtab/data/content/assets/trailhead/card-illo-devices.png b/browser/components/newtab/data/content/assets/trailhead/card-illo-devices.png new file mode 100755 index 000000000000..1318a0237af5 Binary files /dev/null and b/browser/components/newtab/data/content/assets/trailhead/card-illo-devices.png differ diff --git a/browser/components/newtab/data/content/assets/trailhead/card-illo-fbcont.png b/browser/components/newtab/data/content/assets/trailhead/card-illo-fbcont.png new file mode 100755 index 000000000000..56dfe660c58c Binary files /dev/null and b/browser/components/newtab/data/content/assets/trailhead/card-illo-fbcont.png differ diff --git a/browser/components/newtab/data/content/assets/trailhead/card-illo-ffmonitor.png b/browser/components/newtab/data/content/assets/trailhead/card-illo-ffmonitor.png new file mode 100755 index 000000000000..af0a25a4fbe1 Binary files /dev/null and b/browser/components/newtab/data/content/assets/trailhead/card-illo-ffmonitor.png differ diff --git a/browser/components/newtab/data/content/assets/trailhead/card-illo-ffsend.png b/browser/components/newtab/data/content/assets/trailhead/card-illo-ffsend.png new file mode 100755 index 000000000000..e7c8ccb852c5 Binary files /dev/null and b/browser/components/newtab/data/content/assets/trailhead/card-illo-ffsend.png differ diff --git a/browser/components/newtab/data/content/assets/trailhead/card-illo-lockwise.png b/browser/components/newtab/data/content/assets/trailhead/card-illo-lockwise.png new file mode 100644 index 000000000000..5b07b1a0a4b6 Binary files /dev/null and b/browser/components/newtab/data/content/assets/trailhead/card-illo-lockwise.png differ diff --git a/browser/components/newtab/data/content/assets/trailhead/card-illo-mobile.png b/browser/components/newtab/data/content/assets/trailhead/card-illo-mobile.png new file mode 100644 index 000000000000..eff9628ed8fd Binary files /dev/null and b/browser/components/newtab/data/content/assets/trailhead/card-illo-mobile.png differ diff --git a/browser/components/newtab/data/content/assets/trailhead/card-illo-pledge.png b/browser/components/newtab/data/content/assets/trailhead/card-illo-pledge.png new file mode 100755 index 000000000000..3aaf0dd01b6e Binary files /dev/null and b/browser/components/newtab/data/content/assets/trailhead/card-illo-pledge.png differ diff --git a/browser/components/newtab/data/content/assets/trailhead/card-illo-pocket.png b/browser/components/newtab/data/content/assets/trailhead/card-illo-pocket.png new file mode 100755 index 000000000000..f3a47437bb07 Binary files /dev/null and b/browser/components/newtab/data/content/assets/trailhead/card-illo-pocket.png differ diff --git a/browser/components/newtab/data/content/assets/trailhead/card-illo-private.png b/browser/components/newtab/data/content/assets/trailhead/card-illo-private.png new file mode 100755 index 000000000000..2a5766fd5cd3 Binary files /dev/null and b/browser/components/newtab/data/content/assets/trailhead/card-illo-private.png differ diff --git a/browser/components/newtab/data/content/assets/trailhead/card-illo-sendtab.png b/browser/components/newtab/data/content/assets/trailhead/card-illo-sendtab.png new file mode 100755 index 000000000000..51ecedd0f040 Binary files /dev/null and b/browser/components/newtab/data/content/assets/trailhead/card-illo-sendtab.png differ diff --git a/browser/components/newtab/data/content/assets/trailhead/card-illo-tracking.png b/browser/components/newtab/data/content/assets/trailhead/card-illo-tracking.png new file mode 100755 index 000000000000..f2b7ea4e5f98 Binary files /dev/null and b/browser/components/newtab/data/content/assets/trailhead/card-illo-tracking.png differ diff --git a/browser/components/newtab/data/content/assets/trailhead/firefox-logo.png b/browser/components/newtab/data/content/assets/trailhead/firefox-logo.png new file mode 100755 index 000000000000..be46f177450c Binary files /dev/null and b/browser/components/newtab/data/content/assets/trailhead/firefox-logo.png differ diff --git a/browser/components/newtab/data/trailhead.wip b/browser/components/newtab/data/trailhead.wip new file mode 100644 index 000000000000..85979ff05406 --- /dev/null +++ b/browser/components/newtab/data/trailhead.wip @@ -0,0 +1,139 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +## The following feature names must be treated as a brand, and kept in English. +## They cannot be: +## - Declined to adapt to grammatical case. +## - Transliterated. +## - Translated. + +-facebook-container-brand-name = Facebook Container +-lockwise-brand-name = Firefox Lockwise +-monitor-brand-name = Firefox Monitor +-pocket-brand-name = Pocket +-send-brand-name = Firefox Send +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +## UI strings for the simplified onboarding modal + +onboarding-button-label-learn-more = Learn More +onboarding-button-label-try-now = Try It Now +onboarding-button-label-get-started = Get Started + +onboarding-welcome-header = Welcome to { -brand-short-name } +onboarding-welcome-body = You’ve got the browser.
Meet the rest of { -brand-product-name }. +onboarding-welcome-learn-more = Learn more about the benefits. + +onboarding-join-form-header = Join { -brand-product-name } +onboarding-join-form-body = Enter your email address to get started. +onboarding-join-form-email = + .placeholder = Enter email +onboarding-join-form-email-error = Valid email required +onboarding-join-form-legal = By proceeding, you agree to the Terms of Service and Privacy Notice. +onboarding-join-form-continue = Continue + +onboarding-start-browsing-button-label = Start Browsing + +## These are individual benefit messages shown with an image, title and +## description. + +onboarding-benefit-products-title = Useful Products +onboarding-benefit-products-text = Get things done with a family of tools that respects your privacy across your devices. + +onboarding-benefit-knowledge-title = Practical Knowledge +onboarding-benefit-knowledge-text = Learn everything you need to know to stay smarter and safer online. + +onboarding-benefit-privacy-title = True Privacy +# "Personal Data Promise" should be treated as a brand and refers to a concept +# shown elsewhere to the user: "The Firefox Personal Data Promise is the way we +# honor your data in everything we make and do. We take less data. We keep it +# safe. And we make sure that we are transparent about how we use it." +onboarding-benefit-privacy-text = Everything we do honors our Personal Data Promise: Take less. Keep it safe. No secrets. + + +## These strings belong to the individual onboarding messages. + +## Each message has a title and a description of what the browser feature is. +## Each message also has an associated button for the user to try the feature. +## The string for the button is found above, in the UI strings section +onboarding-private-browsing-title = Private Browsing +onboarding-private-browsing-text = Browse by yourself. Private Browsing with Content Blocking blocks online trackers that follow you around the web. + +onboarding-screenshots-title = Screenshots +onboarding-screenshots-text = Take, save and share screenshots - without leaving { -brand-short-name }. Capture a region or an entire page as you browse. Then save to the web for easy access and sharing. + +onboarding-addons-title = Add-ons +onboarding-addons-text = Add even more features that make { -brand-short-name } work harder for you. Compare prices, check the weather or express your personality with a custom theme. + +onboarding-ghostery-title = Ghostery +onboarding-ghostery-text = Browse faster, smarter, or safer with extensions like Ghostery, which lets you block annoying ads. + +# Note: "Sync" in this case is a generic verb, as in "to synchronize" +onboarding-fxa-title = Sync +onboarding-fxa-text = Sign up for a { -fxaccount-brand-name } and sync your bookmarks, passwords, and open tabs everywhere you use { -brand-short-name }. + +onboarding-tracking-protection-title = Control How You’re Tracked +onboarding-tracking-protection-text = Don’t like when ads follow you around? { -brand-short-name } helps you control how advertisers track your activity online. +onboarding-tracking-protection-button = Learn More + +onboarding-data-sync-title = Take Your Settings with You +# "Sync" is short for synchronize. +onboarding-data-sync-text = Sync your bookmarks and passwords everywhere you use { -brand-product-name }. +onboarding-data-sync-button = Turn on { -sync-brand-short-name } + +onboarding-firefox-monitor-title = Stay Alert to Data Breaches +onboarding-firefox-monitor-text = { -monitor-brand-name } monitors if your email has appeared in a data breach and alerts you if it appears in a new breach. +onboarding-firefox-monitor-button = Sign up for Alerts + +onboarding-private-browsing-title = Browse Privately +onboarding-private-browsing-text = Private Browsing clears your search and browsing history to keep it secret from anyone who uses your computer. +onboarding-private-browsing-button = Open a Private Window + +onboarding-firefox-send-title = Keep Your Shared Files Private +onboarding-firefox-send-text = { -send-brand-name } protects the files you share with end-to-end encryption and a link that automatically expires. +onboarding-firefox-send-button = Try { -send-brand-name } + +onboarding-mobile-phone-title = Get { -brand-product-name } on Your Phone +onboarding-mobile-phone-text = Download { -brand-product-name } for iOS or Android and sync your data across devices. +# "Mobile" is short for mobile/cellular phone, "Browser" is short for web +# browser. +onboarding-mobile-phone-button = Download Mobile Browser + +onboarding-privacy-right-title = Privacy is Your Right +onboarding-privacy-right-text = { -brand-short-name } treats your data with respect by taking less, protecting it, and being clear about how we use it. +onboarding-privacy-right-button = Learn More + +onboarding-send-tabs-title = Instantly Send Yourself Tabs +# "Send Tabs" refers to "Send Tab to Device" feature that appears when opening a +# tab's context menu. +onboarding-send-tabs-text = Send Tabs instantly shares pages between your devices without having to copy, paste, or leave the browser. +onboarding-send-tabs-button = Start Using Send Tabs + +onboarding-pocket-anywhere-title = Read and Listen Anywhere +# "downtime" refers to the user's free/spare time. +onboarding-pocket-anywhere-text = { -pocket-brand-name } saves your favorite stories so you can read, listen, and watch during your downtime, even if you’re offline. +onboarding-pocket-anywhere-button = Try { -pocket-brand-name } + +onboarding-lockwise-passwords-title = Take Your Passwords Everywhere +# "many places" conveys that Lockwise is available outside of Firefox. +onboarding-lockwise-passwords-text = { -lockwise-brand-name } saves your passwords in a secure place so you can easily log into your accounts. +onboarding-lockwise-passwords-button = Get { -lockwise-brand-name } + +onboarding-facebook-container-title = Set Boundaries with Facebook +onboarding-facebook-container-text = { -facebook-container-brand-name } keeps your Facebook identity separate from everything else, making it harder to track you across the web. +onboarding-facebook-container-button = Add the Extension + + +## Message strings belonging to the Return to AMO flow +return-to-amo-sub-header = Great, you’ve got { -brand-short-name } + +# will be replaced with the icon belonging to the extension +# +# Variables: +# $addon-name (String) - Name of the add-on +return-to-amo-addon-header = Now let’s get you { $addon-name }. +return-to-amo-extension-button = Add the Extension +return-to-amo-get-started-button = Get Started with { -brand-short-name } diff --git a/browser/components/newtab/docs/v2-system-addon/data_dictionary.md b/browser/components/newtab/docs/v2-system-addon/data_dictionary.md index 58d19c1db9bb..119eb8a903cf 100644 --- a/browser/components/newtab/docs/v2-system-addon/data_dictionary.md +++ b/browser/components/newtab/docs/v2-system-addon/data_dictionary.md @@ -161,6 +161,30 @@ Schema definitions/validations that can be used for tests can be found in `syste } ``` +# Example Discovery Stream `SPOCS Fill` log + +```js +{ + // both "client_id" and "session_id" are set to "n/a" in this ping. + "client_id": "n/a", + "session_id": "n/a", + "impression_id": "{005deed0-e3e4-4c02-a041-17405fd703f6}", + "addon_version": "20180710100040", + "locale": "en-US", + "version": "68", + "release_channel": "release", + "spoc_fills": [ + {"id": 10000, displayed: 0, reason: "frequency_cap", full_recalc: 1}, + {"id": 10001, displayed: 0, reason: "blocked_by_user", full_recalc: 1}, + {"id": 10002, displayed: 0, reason: "below_min_score", full_recalc: 1}, + {"id": 10003, displayed: 0, reason: "campaign_duplicate", full_recalc: 1}, + {"id": 10004, displayed: 0, reason: "probability_selection", full_recalc: 0}, + {"id": 10004, displayed: 0, reason: "out_of_position", full_recalc: 0}, + {"id": 10005, displayed: 1, reason: "n/a", full_recalc: 0} + ] +} +``` + # Example Activity Stream `Router` Pings ```js @@ -237,6 +261,9 @@ and losing focus. | :one: | `profile_creation_date` | [Optional] An integer to record the age of the Firefox profile as the total number of days since the UNIX epoch. | :one: | `message_id` | [required] A string identifier of the message in Activity Stream Router. | :one: | `has_flow_params` | [required] One of [true, false]. A boolean identifier that indicates if Firefox Accounts flow parameters are set or unset. | :one: +| `displayed` | [required] 1: a SPOC is displayed; 0: non-displayed | :one: +| `reason` | [required] The reason if a SPOC is not displayed, "n/a" for the displayed, one of ("frequency_cap", "blocked_by_user", "campaign_duplicate", "probability_selection", "below_min_score", "out_of_position", "n/a") | :one: +| `full_recalc` | [required] Is it a full SPOCS recalculation: 0: false; 1: true. Recalculation case: 1). fetch SPOCS from Pocket endpoint. Non-recalculation cases: 1). An impression updates the SPOCS; 2). Any action that triggers the `selectLayoutRender ` | :one: **Where:** diff --git a/browser/components/newtab/docs/v2-system-addon/data_events.md b/browser/components/newtab/docs/v2-system-addon/data_events.md index 79973c2d292f..343ee48b8dbd 100644 --- a/browser/components/newtab/docs/v2-system-addon/data_events.md +++ b/browser/components/newtab/docs/v2-system-addon/data_events.md @@ -855,6 +855,32 @@ This reports all the loaded content (a list of `id`s and positions) when the use } ``` +### Discovery Stream SPOCS Fill ping + +This reports the internal status of Pocket SPOCS (Sponsored Contents). + +```js +{ + // both "client_id" and "session_id" are set to "n/a" in this ping. + "client_id": "n/a", + "session_id": "n/a", + "impression_id": "{005deed0-e3e4-4c02-a041-17405fd703f6}", + "addon_version": "20180710100040", + "locale": "en-US", + "version": "68", + "release_channel": "release", + "spoc_fills": [ + {"id": 10000, displayed: 0, reason: "frequency_cap", full_recalc: 1}, + {"id": 10001, displayed: 0, reason: "blocked_by_user", full_recalc: 1}, + {"id": 10002, displayed: 0, reason: "below_min_score", full_recalc: 1}, + {"id": 10003, displayed: 0, reason: "campaign_duplicate", full_recalc: 1}, + {"id": 10004, displayed: 0, reason: "probability_selection", full_recalc: 0}, + {"id": 10004, displayed: 0, reason: "out_of_position", full_recalc: 0}, + {"id": 10005, displayed: 1, reason: "n/a", full_recalc: 0} + ] +} +``` + ## Undesired event pings These pings record the undesired events happen in the addon for further investigation. diff --git a/browser/components/newtab/jar.mn b/browser/components/newtab/jar.mn index d3381ea7ab6b..58f1ea429494 100644 --- a/browser/components/newtab/jar.mn +++ b/browser/components/newtab/jar.mn @@ -2,6 +2,9 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +[localization] en-US.jar: + trailhead.ftl (./data/trailhead.wip) + browser.jar: % resource activity-stream %res/activity-stream/ contentaccessible=yes res/activity-stream/lib/ (./lib/*) diff --git a/browser/components/newtab/lib/ASRouter.jsm b/browser/components/newtab/lib/ASRouter.jsm index e691a2d20fa3..12dc6491a37f 100644 --- a/browser/components/newtab/lib/ASRouter.jsm +++ b/browser/components/newtab/lib/ASRouter.jsm @@ -695,18 +695,34 @@ class _ASRouter { } async _getBundledMessages(originalMessage, target, trigger, force = false) { - let result = [{content: originalMessage.content, id: originalMessage.id, order: originalMessage.order || 0}]; + let result = []; + let bundleLength; + let bundleTemplate; + let originalId; + + if (originalMessage.includeBundle) { + // The original message is not part of the bundle, so don't include it + bundleLength = originalMessage.includeBundle.length; + bundleTemplate = originalMessage.includeBundle.template; + } else { + // The original message is part of the bundle + bundleLength = originalMessage.bundled; + bundleTemplate = originalMessage.template; + originalId = originalMessage.id; + // Add in a copy of the first message + result.push({content: originalMessage.content, id: originalMessage.id, order: originalMessage.order || 0}); + } // First, find all messages of same template. These are potential matching targeting candidates let bundledMessagesOfSameTemplate = this._getUnblockedMessages() - .filter(msg => msg.bundled && msg.template === originalMessage.template && msg.id !== originalMessage.id); + .filter(msg => msg.bundled && msg.template === bundleTemplate && msg.id !== originalId); if (force) { // Forcefully show the messages without targeting matching - this is for about:newtab#asrouter to show the messages for (const message of bundledMessagesOfSameTemplate) { result.push({content: message.content, id: message.id}); // Stop once we have enough messages to fill a bundle - if (result.length === originalMessage.bundled) { + if (result.length === bundleLength) { break; } } @@ -723,14 +739,14 @@ class _ASRouter { result.push({content: message.content, id: message.id, order: message.order || 0}); bundledMessagesOfSameTemplate.splice(bundledMessagesOfSameTemplate.findIndex(msg => msg.id === message.id), 1); // Stop once we have enough messages to fill a bundle - if (result.length === originalMessage.bundled) { + if (result.length === bundleLength) { break; } } } // If we did not find enough messages to fill the bundle, do not send the bundle down - if (result.length < originalMessage.bundled) { + if (result.length < bundleLength) { return null; } @@ -739,7 +755,12 @@ class _ASRouter { // handle finding these strings on its own. See bug 1488973 const extraTemplateStrings = await this._extraTemplateStrings(originalMessage); - return {bundle: this._orderBundle(result), ...(extraTemplateStrings && {extraTemplateStrings}), provider: originalMessage.provider, template: originalMessage.template}; + return { + bundle: this._orderBundle(result), + ...(extraTemplateStrings && {extraTemplateStrings}), + provider: originalMessage.provider, + template: originalMessage.template, + }; } async _extraTemplateStrings(originalMessage) { @@ -776,7 +797,16 @@ class _ASRouter { } else if (message.bundled) { const bundledMessages = await this._getBundledMessages(message, target, trigger, force); const action = bundledMessages ? {type: "SET_BUNDLED_MESSAGES", data: bundledMessages} : {type: "CLEAR_ALL"}; - target.sendAsyncMessage(OUTGOING_MESSAGE_NAME, action); + try { + target.sendAsyncMessage(OUTGOING_MESSAGE_NAME, action); + } catch (e) {} + + // For nested bundled messages, look for the desired bundle + } else if (message.includeBundle) { + const bundledMessages = await this._getBundledMessages(message, target, message.includeBundle.trigger, force); + try { + target.sendAsyncMessage(OUTGOING_MESSAGE_NAME, {type: "SET_MESSAGE", data: {...message, bundle: bundledMessages && bundledMessages.bundle}}); + } catch (e) {} // CFR doorhanger } else if (message.template === "cfr_doorhanger") { @@ -788,7 +818,9 @@ class _ASRouter { // New tab single messages } else { - target.sendAsyncMessage(OUTGOING_MESSAGE_NAME, {type: "SET_MESSAGE", data: message}); + try { + target.sendAsyncMessage(OUTGOING_MESSAGE_NAME, {type: "SET_MESSAGE", data: message}); + } catch (e) {} } } diff --git a/browser/components/newtab/lib/ASRouterTargeting.jsm b/browser/components/newtab/lib/ASRouterTargeting.jsm index 42cbb0009b1f..bcd351148266 100644 --- a/browser/components/newtab/lib/ASRouterTargeting.jsm +++ b/browser/components/newtab/lib/ASRouterTargeting.jsm @@ -172,6 +172,9 @@ function sortMessagesByTargeting(messages) { } const TargetingGetters = { + get trailheadCohort() { + return Services.prefs.getIntPref("trailhead.firstrun.cohort", 0); + }, get locale() { return Services.locale.appLocaleAsLangTag; }, diff --git a/browser/components/newtab/lib/DiscoveryStreamFeed.jsm b/browser/components/newtab/lib/DiscoveryStreamFeed.jsm index 4a695791b653..ca0c278fe60f 100644 --- a/browser/components/newtab/lib/DiscoveryStreamFeed.jsm +++ b/browser/components/newtab/lib/DiscoveryStreamFeed.jsm @@ -42,6 +42,32 @@ this.DiscoveryStreamFeed = class DiscoveryStreamFeed { this._prefCache = {}; } + /** + * Send SPOCS Fill telemetry. + * @param {object} filteredItems An object keyed on filter reasons, and the value + * is a list of SPOCS. + * @param {boolean} fullRecalc A boolean indicating if it's a full recalculation. + * Calling `loadSpocs` will be treated as a full recalculation. + * Whereas responding the action "DISCOVERY_STREAM_SPOC_IMPRESSION" + * is not a full recalculation. + */ + _sendSpocsFill(filteredItems, fullRecalc) { + const full_recalc = fullRecalc ? 1 : 0; + const spocsFill = []; + for (const [reason, items] of Object.entries(filteredItems)) { + items.forEach(item => { + // Only send SPOCS (i.e. it has a campaign_id) + if (item.campaign_id) { + spocsFill.push({reason, full_recalc, id: item.id, displayed: 0}); + } + }); + } + + if (spocsFill.length) { + this.store.dispatch(ac.DiscoveryStreamSpocsFill({spoc_fills: spocsFill})); + } + } + finalLayoutEndpoint(url, apiKey) { if (url.includes("$apiKey") && !apiKey) { throw new Error(`Layout Endpoint - An API key was specified but none configured: ${url}`); @@ -266,9 +292,10 @@ this.DiscoveryStreamFeed = class DiscoveryStreamFeed { filterRecommendations(feed) { if (feed && feed.data && feed.data.recommendations && feed.data.recommendations.length) { + const {data} = this.filterBlocked(feed.data, "recommendations"); return { ...feed, - data: this.filterBlocked(feed.data, "recommendations"), + data, }; } return feed; @@ -366,13 +393,17 @@ this.DiscoveryStreamFeed = class DiscoveryStreamFeed { data: {}, }; + let {data, filtered: frequencyCapped} = this.frequencyCapSpocs(spocs.data); + let {data: newSpocs, filtered} = this.transform(data); + sendUpdate({ type: at.DISCOVERY_STREAM_SPOCS_UPDATE, data: { lastUpdated: spocs.lastUpdated, - spocs: this.transform(this.frequencyCapSpocs(spocs.data)), + spocs: newSpocs, }, }); + this._sendSpocsFill({...filtered, frequency_cap: frequencyCapped}, true); } async loadAffinityScoresCache() { @@ -418,11 +449,19 @@ this.DiscoveryStreamFeed = class DiscoveryStreamFeed { } scoreItems(items) { - return items.map(item => this.scoreItem(item)) + const filtered = []; + const data = items.map(item => this.scoreItem(item)) // Remove spocs that are scored too low. - .filter(s => s.score >= s.min_score) + .filter(s => { + if (s.score >= s.min_score) { + return true; + } + filtered.push(s); + return false; + }) // Sort by highest scores. .sort((a, b) => b.score - a.score); + return {data, filtered}; } scoreItem(item) { @@ -441,45 +480,67 @@ this.DiscoveryStreamFeed = class DiscoveryStreamFeed { } filterBlocked(data, type) { + const filtered = []; if (data && data[type] && data[type].length) { - const filteredItems = data[type].filter(item => !NewTabUtils.blockedLinks.isBlocked({"url": item.url})); + const filteredItems = data[type].filter(item => { + const blocked = NewTabUtils.blockedLinks.isBlocked({"url": item.url}); + if (blocked) { + filtered.push(item); + } + return !blocked; + }); return { - ...data, - [type]: filteredItems, + data: { + ...data, + [type]: filteredItems, + }, + filtered, }; } - return data; + return {data, filtered}; } transform(spocs) { - const data = this.filterBlocked(spocs, "spocs"); + const {data, filtered: blockedItems} = this.filterBlocked(spocs, "spocs"); if (data && data.spocs && data.spocs.length) { const spocsPerDomain = this.store.getState().DiscoveryStream.spocs.spocs_per_domain || 1; const campaignMap = {}; + const campaignDuplicates = []; + + // This order of operations is intended. + // scoreItems must be first because it creates this.score. + const {data: items, filtered: belowMinScoreItems} = this.scoreItems(data.spocs); + // This removes campaign dupes. + // We do this only after scoring and sorting because that way + // we can keep the first item we see, and end up keeping the highest scored. + const newSpocs = items.filter(s => { + if (!campaignMap[s.campaign_id]) { + campaignMap[s.campaign_id] = 1; + return true; + } else if (campaignMap[s.campaign_id] < spocsPerDomain) { + campaignMap[s.campaign_id]++; + return true; + } + campaignDuplicates.push(s); + return false; + }); return { - ...data, - // This order of operations is intended. - // scoreItems must be first because it creates this.score. - spocs: this.scoreItems(data.spocs) - // This removes campaign dupes. - // We do this only after scoring and sorting because that way - // we can keep the first item we see, and end up keeping the highest scored. - .filter(s => { - if (!campaignMap[s.campaign_id]) { - campaignMap[s.campaign_id] = 1; - return true; - } else if (campaignMap[s.campaign_id] < spocsPerDomain) { - campaignMap[s.campaign_id]++; - return true; - } - return false; - }), + data: {...data, spocs: newSpocs}, + filtered: { + blocked_by_user: blockedItems, + below_min_score: belowMinScoreItems, + campaign_duplicate: campaignDuplicates, + }, }; } - return data; + return {data, filtered: {blocked: blockedItems}}; } // Filter spocs based on frequency caps + // + // @param {Object} data An object that might have a SPOCS array. + // @returns {Object} An object with a property `data` as the result, and a property + // `filterItems` as the frequency capped items. frequencyCapSpocs(data) { if (data && data.spocs && data.spocs.length) { const {spocs} = data; @@ -499,9 +560,9 @@ this.DiscoveryStreamFeed = class DiscoveryStreamFeed { if (caps.length) { this.store.dispatch({type: at.DISCOVERY_STREAM_SPOCS_CAPS, data: caps}); } - return result; + return {data: result, filtered: caps}; } - return data; + return {data, filtered: []}; } // Frequency caps are based on campaigns, which may include multiple spocs. @@ -549,7 +610,7 @@ this.DiscoveryStreamFeed = class DiscoveryStreamFeed { if (this.isExpired({cachedData, key: "feed", url: feedUrl, isStartup})) { const feedResponse = await this.fetchFromEndpoint(feedUrl); if (feedResponse) { - const scoredItems = this.scoreItems(feedResponse.recommendations); + const {data: scoredItems} = this.scoreItems(feedResponse.recommendations); const {recsExpireTime} = feedResponse.settings; const recommendations = this.rotate(scoredItems, recsExpireTime); this.componentFeedFetched = true; @@ -867,10 +928,8 @@ this.DiscoveryStreamFeed = class DiscoveryStreamFeed { // Apply frequency capping to SPOCs in the redux store, only update the // store if the SPOCs are changed. const {spocs} = this.store.getState().DiscoveryStream; - const newSpocs = this.frequencyCapSpocs(spocs.data); - const prevSpocs = spocs.data.spocs || []; - const currentSpocs = newSpocs.spocs || []; - if (prevSpocs.length !== currentSpocs.length) { + const {data: newSpocs, filtered} = this.frequencyCapSpocs(spocs.data); + if (filtered.length) { this.store.dispatch(ac.AlsoToPreloaded({ type: at.DISCOVERY_STREAM_SPOCS_UPDATE, data: { @@ -878,9 +937,24 @@ this.DiscoveryStreamFeed = class DiscoveryStreamFeed { spocs: newSpocs, }, })); + this._sendSpocsFill({frequency_cap: filtered}, false); } } break; + case at.PLACES_LINK_BLOCKED: + if (this.showSpocs) { + const {spocs} = this.store.getState().DiscoveryStream; + const spocsList = spocs.data.spocs || []; + const filtered = spocsList.filter(s => s.url === action.data.url); + if (filtered.length) { + this._sendSpocsFill({blocked_by_user: filtered}, false); + } + } + this.store.dispatch(ac.BroadcastToContent({ + type: at.DISCOVERY_STREAM_LINK_BLOCKED, + data: action.data, + })); + break; case at.UNINIT: // When this feed is shutting down: this.uninitPrefs(); diff --git a/browser/components/newtab/lib/OnboardingMessageProvider.jsm b/browser/components/newtab/lib/OnboardingMessageProvider.jsm index 0929c512f94b..d5b69fc40d64 100644 --- a/browser/components/newtab/lib/OnboardingMessageProvider.jsm +++ b/browser/components/newtab/lib/OnboardingMessageProvider.jsm @@ -99,7 +99,7 @@ const ONBOARDING_MESSAGES = async () => ([ }, }, }, - targeting: "attributionData.campaign != 'non-fx-button' && attributionData.source != 'addons.mozilla.org'", + targeting: "trailheadCohort == 0 && attributionData.campaign != 'non-fx-button' && attributionData.source != 'addons.mozilla.org'", trigger: {id: "showOnboarding"}, }, { @@ -119,7 +119,7 @@ const ONBOARDING_MESSAGES = async () => ([ }, }, }, - targeting: "providerCohorts.onboarding == 'ghostery'", + targeting: "trailheadCohort == 0 && providerCohorts.onboarding == 'ghostery'", trigger: {id: "showOnboarding"}, }, { @@ -139,7 +139,279 @@ const ONBOARDING_MESSAGES = async () => ([ }, }, }, - targeting: "attributionData.campaign == 'non-fx-button' && attributionData.source == 'addons.mozilla.org'", + targeting: "trailheadCohort == 0 && attributionData.campaign == 'non-fx-button' && attributionData.source == 'addons.mozilla.org'", + trigger: {id: "showOnboarding"}, + }, + { + id: "TRAILHEAD_1", + template: "trailhead", + targeting: "trailheadCohort == 1", + trigger: {id: "firstRun"}, + includeBundle: {length: 3, template: "onboarding", trigger: {id: "showOnboarding"}}, + content: { + className: "joinCohort", + title: {string_id: "onboarding-welcome-body"}, + benefits: ["products", "knowledge", "privacy"].map(id => ( + { + id, + title: {string_id: `onboarding-benefit-${id}-title`}, + text: {string_id: `onboarding-benefit-${id}-text`}, + } + )), + learn: { + text: {string_id: "onboarding-welcome-learn-more"}, + url: "https://www.mozilla.org/firefox/accounts/", + }, + form: { + title: {string_id: "onboarding-join-form-header"}, + text: {string_id: "onboarding-join-form-body"}, + email: {string_id: "onboarding-join-form-email"}, + button: {string_id: "onboarding-join-form-continue"}, + }, + skipButton: {string_id: "onboarding-start-browsing-button-label"}, + }, + }, + { + id: "TRAILHEAD_2", + template: "trailhead", + targeting: "trailheadCohort == 2", + trigger: {id: "firstRun"}, + includeBundle: {length: 3, template: "onboarding", trigger: {id: "showOnboarding"}}, + content: { + className: "syncCohort", + title: {value: "Take Firefox with You"}, + subtitle: {value: "Get your bookmarks, history, passwords and other settings on all your devices."}, + benefits: [], + learn: { + text: {string_id: "onboarding-welcome-learn-more"}, + url: "https://www.mozilla.org/firefox/accounts/", + }, + form: { + title: {value: "Enter your email"}, + text: {value: "to continue to Firefox Sync"}, + email: {placeholder: "Email"}, + button: {string_id: "onboarding-join-form-continue"}, + }, + skipButton: {value: "Skip this step"}, + }, + }, + { + id: "TRAILHEAD_3", + template: "trailhead", + targeting: "trailheadCohort == 3", + trigger: {id: "firstRun"}, + includeBundle: {length: 3, template: "onboarding", trigger: {id: "showOnboarding"}}, + }, + { + id: "TRAILHEAD_4", + template: "trailhead", + targeting: "trailheadCohort == 4", + trigger: {id: "firstRun"}, + }, + { + id: "TRAILHEAD_CARD_1", + template: "onboarding", + bundled: 3, + content: { + title: {string_id: "onboarding-tracking-protection-title"}, + text: {string_id: "onboarding-tracking-protection-text"}, + icon: "tracking", + primary_button: { + label: {string_id: "onboarding-tracking-protection-button"}, + action: { + type: "OPEN_PREFERENCES_PAGE", + data: {category: "privacy-trackingprotection"}, + }, + }, + }, + targeting: "trailheadCohort > 0", + trigger: {id: "showOnboarding"}, + }, + { + id: "TRAILHEAD_CARD_2", + template: "onboarding", + bundled: 3, + content: { + title: {string_id: "onboarding-data-sync-title"}, + text: {string_id: "onboarding-data-sync-text"}, + icon: "devices", + primary_button: { + label: {string_id: "onboarding-data-sync-button"}, + action: { + type: "OPEN_URL", + data: {args: "https://accounts.firefox.com/?service=sync&action=email&context=fx_desktop_v3&entrypoint=activity-stream-firstrun&utm_source=activity-stream&utm_campaign=firstrun", where: "tabshifted"}, + }, + }, + }, + targeting: "trailheadCohort > 0", + trigger: {id: "showOnboarding"}, + }, + { + id: "TRAILHEAD_CARD_3", + template: "onboarding", + bundled: 3, + content: { + title: {string_id: "onboarding-firefox-monitor-title"}, + text: {string_id: "onboarding-firefox-monitor-text"}, + icon: "ffmonitor", + primary_button: { + label: {string_id: "onboarding-firefox-monitor-button"}, + action: { + type: "OPEN_URL", + data: {args: "https://monitor.firefox.com/", where: "tabshifted"}, + }, + }, + }, + targeting: "trailheadCohort > 0", + trigger: {id: "showOnboarding"}, + }, + { + id: "TRAILHEAD_CARD_4", + template: "onboarding", + bundled: 3, + content: { + title: {string_id: "onboarding-private-browsing-title"}, + text: {string_id: "onboarding-private-browsing-text"}, + icon: "private", + primary_button: { + label: {string_id: "onboarding-private-browsing-button"}, + action: {type: "OPEN_PRIVATE_BROWSER_WINDOW"}, + }, + }, + targeting: "trailheadCohort > 0", + trigger: {id: "showOnboarding"}, + }, + { + id: "TRAILHEAD_CARD_5", + template: "onboarding", + bundled: 3, + content: { + title: {string_id: "onboarding-firefox-send-title"}, + text: {string_id: "onboarding-firefox-send-text"}, + icon: "ffsend", + primary_button: { + label: {string_id: "onboarding-firefox-send-button"}, + action: { + type: "OPEN_URL", + data: {args: "https://send.firefox.com/?utm_source=activity-stream?utm_medium=referral?utm_campaign=firstrun", where: "tabshifted"}, + }, + }, + }, + targeting: "trailheadCohort > 0", + trigger: {id: "showOnboarding"}, + }, + { + id: "TRAILHEAD_CARD_6", + template: "onboarding", + bundled: 3, + content: { + title: {string_id: "onboarding-mobile-phone-title"}, + text: {string_id: "onboarding-mobile-phone-text"}, + icon: "mobile", + primary_button: { + label: {string_id: "onboarding-mobile-phone-button"}, + action: { + type: "OPEN_URL", + data: {args: "https://www.mozilla.org/firefox/mobile/", where: "tabshifted"}, + }, + }, + }, + targeting: "trailheadCohort > 0", + trigger: {id: "showOnboarding"}, + }, + { + id: "TRAILHEAD_CARD_7", + template: "onboarding", + bundled: 3, + content: { + title: {string_id: "onboarding-privacy-right-title"}, + text: {string_id: "onboarding-privacy-right-text"}, + icon: "pledge", + primary_button: { + label: {string_id: "onboarding-privacy-right-button"}, + action: { + type: "OPEN_URL", + data: {args: "https://www.mozilla.org/?privacy-right", where: "tabshifted"}, + }, + }, + }, + targeting: "trailheadCohort > 0", + trigger: {id: "showOnboarding"}, + }, + { + id: "TRAILHEAD_CARD_8", + template: "onboarding", + bundled: 3, + content: { + title: {string_id: "onboarding-send-tabs-title"}, + text: {string_id: "onboarding-send-tabs-text"}, + icon: "sendtab", + primary_button: { + label: {string_id: "onboarding-send-tabs-button"}, + action: { + type: "OPEN_URL", + data: {args: "https://blog.mozilla.org/firefox/send-tabs-a-better-way/", where: "tabshifted"}, + }, + }, + }, + targeting: "trailheadCohort > 0", + trigger: {id: "showOnboarding"}, + }, + { + id: "TRAILHEAD_CARD_9", + template: "onboarding", + bundled: 3, + content: { + title: {string_id: "onboarding-pocket-anywhere-title"}, + text: {string_id: "onboarding-pocket-anywhere-text"}, + icon: "pocket", + primary_button: { + label: {string_id: "onboarding-pocket-anywhere-button"}, + action: { + type: "OPEN_URL", + data: {args: "https://getpocket.com/firefox_learnmore", where: "tabshifted"}, + }, + }, + }, + targeting: "trailheadCohort > 0", + trigger: {id: "showOnboarding"}, + }, + { + id: "TRAILHEAD_CARD_10", + template: "onboarding", + bundled: 3, + content: { + title: {string_id: "onboarding-lockwise-passwords-title"}, + text: {string_id: "onboarding-lockwise-passwords-text"}, + icon: "lockwise", + primary_button: { + label: {string_id: "onboarding-lockwise-passwords-button"}, + action: { + type: "OPEN_URL", + data: {args: "https://lockwise.firefox.com/", where: "tabshifted"}, + }, + }, + }, + targeting: "trailheadCohort > 0", + trigger: {id: "showOnboarding"}, + }, + { + id: "TRAILHEAD_CARD_11", + template: "onboarding", + bundled: 3, + content: { + title: {string_id: "onboarding-facebook-container-title"}, + text: {string_id: "onboarding-facebook-container-text"}, + icon: "fbcont", + primary_button: { + label: {string_id: "onboarding-facebook-container-button"}, + action: { + type: "OPEN_URL", + data: {args: "https://addons.mozilla.org/firefox/addon/facebook-container/", where: "tabshifted"}, + }, + }, + }, + targeting: "trailheadCohort > 0", trigger: {id: "showOnboarding"}, }, { @@ -219,15 +491,6 @@ const OnboardingMessageProvider = { } } - const [primary_button_string, title_string, text_string] = await L10N.formatMessages([ - {id: msg.content.primary_button.label.string_id}, - {id: msg.content.title.string_id}, - {id: msg.content.text.string_id, args: msg.content.text.args}, - ]); - translatedMessage.content.primary_button.label = primary_button_string.value; - translatedMessage.content.title = title_string.value; - translatedMessage.content.text = text_string.value; - // Translate any secondary buttons separately if (msg.content.secondary_button) { const [secondary_button_string] = await L10N.formatMessages([{id: msg.content.secondary_button.label.string_id}]); diff --git a/browser/components/newtab/lib/TelemetryFeed.jsm b/browser/components/newtab/lib/TelemetryFeed.jsm index 6b9bf7d8e914..ba2fe0be7dd2 100644 --- a/browser/components/newtab/lib/TelemetryFeed.jsm +++ b/browser/components/newtab/lib/TelemetryFeed.jsm @@ -477,6 +477,18 @@ this.TelemetryFeed = class TelemetryFeed { ); } + createSpocsFillPing(data) { + return Object.assign( + this.createPing(null), + data, + { + impression_id: this._impressionId, + client_id: "n/a", + session_id: "n/a", + } + ); + } + createUserEvent(action) { return Object.assign( this.createPing(au.getPortIdOfSender(action)), @@ -733,6 +745,9 @@ this.TelemetryFeed = class TelemetryFeed { case at.DISCOVERY_STREAM_LOADED_CONTENT: this.handleDiscoveryStreamLoadedContent(au.getPortIdOfSender(action), action.data); break; + case at.DISCOVERY_STREAM_SPOCS_FILL: + this.handleDiscoveryStreamSpocsFill(action.data); + break; case at.TELEMETRY_UNDESIRED_EVENT: this.handleUndesiredEvent(action); break; @@ -805,6 +820,33 @@ this.TelemetryFeed = class TelemetryFeed { session.loadedContentSets = loadedContentSets; } + /** + * Handl SPOCS Fill actions from Discovery Stream. + * + * @param {Object} data + * The SPOCS Fill event structured as: + * { + * spoc_fills: [ + * { + * id: 123, + * displayed: 0, + * reason: "frequency_cap", + * full_recalc: 1 + * }, + * { + * id: 124, + * displayed: 1, + * reason: "n/a", + * full_recalc: 1 + * } + * ] + * } + */ + handleDiscoveryStreamSpocsFill(data) { + const payload = this.createSpocsFillPing(data); + this.sendStructuredIngestionEvent(payload, "spocs-fills", "1"); + } + /** * Take all enumerable members of the data object and merge them into * the session.perf object for the given port, so that it is sent to the diff --git a/browser/components/newtab/locales-src/eu/strings.properties b/browser/components/newtab/locales-src/eu/strings.properties index b75683a32b10..c03bbccabbbf 100644 --- a/browser/components/newtab/locales-src/eu/strings.properties +++ b/browser/components/newtab/locales-src/eu/strings.properties @@ -93,6 +93,7 @@ prefs_home_header=Firefoxen hasiera-orriko edukia prefs_home_description=Aukeratu zein eduki nahi duzun Firefoxen hasiera-orriko pantailan. prefs_content_discovery_header=Firefoxen hasiera + prefs_content_discovery_description=Firefoxen hasierako edukien aurkikuntzaren bidez kalitate altuko artikulu esanguratsuak aurki ditzakezu webean. prefs_content_discovery_button=Desgaitu edukien aurkikuntza @@ -190,7 +191,7 @@ section_menu_action_privacy_notice=Pribatutasun-oharra # LOCALIZATION NOTE (firstrun_*). These strings are displayed only once, on the # firstrun of the browser, they give an introduction to Firefox and Sync. firstrun_title=Eraman Firefox aldean -firstrun_content=Izan laster-markak, historia, pasahitzak eta beste ezarpenak eskura zure gailu guztietatik. +firstrun_content=Izan laster-markak, historia, pasahitzak eta beste ezarpenak eskura zure gailu guztietan. firstrun_learn_more_link=Firefox kontuei buruzko argibide gehiago # LOCALIZATION NOTE (firstrun_form_header and firstrun_form_sub_header): diff --git a/browser/components/newtab/locales-src/pa-IN/strings.properties b/browser/components/newtab/locales-src/pa-IN/strings.properties index afd13d0831ec..4c7a194d30a8 100644 --- a/browser/components/newtab/locales-src/pa-IN/strings.properties +++ b/browser/components/newtab/locales-src/pa-IN/strings.properties @@ -93,6 +93,8 @@ prefs_home_description=ਉਹ ਸਮੱਗਰੀ ਚੁਣੋ ਜੋ ਤੁਸ prefs_content_discovery_header=ਫਾਇਰਫਾਕਸ ਮੁੱਖ ਸਫ਼ਾ +prefs_content_discovery_button=ਸਮੱਗਰੀ ਖੋਜ ਬੰਦ ਕਰੋ + # LOCALIZATION NOTE (prefs_section_rows_option): This is a semi-colon list of # plural forms used in a drop down of multiple row options (1 row, 2 rows). # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals diff --git a/browser/components/newtab/mochitest.sh b/browser/components/newtab/mochitest.sh index 62095ac542b8..6f5907e27b33 100644 --- a/browser/components/newtab/mochitest.sh +++ b/browser/components/newtab/mochitest.sh @@ -20,6 +20,7 @@ cd /mozilla-central && ./mach build \ && ./mach test --log-tbpl test_run_log \ browser/base/content/test/about/browser_aboutHome_search_telemetry.js \ browser/base/content/test/static/browser_parsable_css.js \ + browser/base/content/test/tabs/browser_new_tab_in_privileged_process_pref.js \ browser/components/enterprisepolicies/tests/browser/browser_policy_set_homepage.js \ browser/components/preferences/in-content/tests/browser_hometab_restore_defaults.js \ browser/components/preferences/in-content/tests/browser_newtab_menu.js \ diff --git a/browser/components/newtab/package-lock.json b/browser/components/newtab/package-lock.json index 2278eb675f23..93e0e85f8369 100644 --- a/browser/components/newtab/package-lock.json +++ b/browser/components/newtab/package-lock.json @@ -708,6 +708,16 @@ "sprintf-js": "~1.0.2" } }, + "aria-query": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz", + "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=", + "dev": true, + "requires": { + "ast-types-flow": "0.0.7", + "commander": "^2.11.0" + } + }, "arr-diff": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", @@ -856,6 +866,12 @@ "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", "dev": true }, + "ast-types-flow": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz", + "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=", + "dev": true + }, "astral-regex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", @@ -913,6 +929,15 @@ "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==", "dev": true }, + "axobject-query": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz", + "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==", + "dev": true, + "requires": { + "ast-types-flow": "0.0.7" + } + }, "babel-code-frame": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", @@ -2222,6 +2247,12 @@ "es5-ext": "^0.10.9" } }, + "damerau-levenshtein": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz", + "integrity": "sha1-AxkcQyy27qFou3fzpV/9zLiXhRQ=", + "dev": true + }, "dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", @@ -3085,6 +3116,22 @@ "vscode-json-languageservice": "^3.2.1" } }, + "eslint-plugin-jsx-a11y": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.1.tgz", + "integrity": "sha512-cjN2ObWrRz0TTw7vEcGQrx+YltMvZoOEx4hWU8eEERDnBIU00OTq7Vr+jA7DFKxiwLNv4tTh5Pq2GUNEa8b6+w==", + "dev": true, + "requires": { + "aria-query": "^3.0.0", + "array-includes": "^3.0.3", + "ast-types-flow": "^0.0.7", + "axobject-query": "^2.0.2", + "damerau-levenshtein": "^1.0.4", + "emoji-regex": "^7.0.2", + "has": "^1.0.3", + "jsx-ast-utils": "^2.0.1" + } + }, "eslint-plugin-mozilla": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/eslint-plugin-mozilla/-/eslint-plugin-mozilla-1.1.1.tgz", diff --git a/browser/components/newtab/package.json b/browser/components/newtab/package.json index 753d12d57ce2..4b7bd987201f 100644 --- a/browser/components/newtab/package.json +++ b/browser/components/newtab/package.json @@ -36,6 +36,7 @@ "eslint-plugin-fetch-options": "0.0.4", "eslint-plugin-import": "2.16.0", "eslint-plugin-json": "1.4.0", + "eslint-plugin-jsx-a11y": "6.2.1", "eslint-plugin-mozilla": "1.1.1", "eslint-plugin-no-unsanitized": "3.0.2", "eslint-plugin-promise": "4.0.1", @@ -135,6 +136,7 @@ "debugcoverage": "open logs/coverage/index.html", "lint": "npm-run-all lint:*", "lint:eslint": "esw --ext=.js,.jsm,.json,.jsx .", + "lint:jsx-a11y": "esw --config=.eslintrc.jsx-a11y.js --ext=.jsx content-src/asrouter/components/ModalOverlay content-src/asrouter/templates/OnboardingMessage content-src/asrouter/templates/Trailhead", "lint:sasslint": "sass-lint -v -q", "strings-import": "node ./bin/strings-import.js", "test": "npm run testmc", diff --git a/browser/components/newtab/prerendered/locales/ach/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/ach/activity-stream-noscripts.html index d492da6c92a9..3ffefe74bab2 100644 --- a/browser/components/newtab/prerendered/locales/ach/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ach/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
- + diff --git a/browser/components/newtab/prerendered/locales/ach/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/ach/activity-stream-prerendered-noscripts.html index 45d8c67ea665..8e5c83977e9b 100644 --- a/browser/components/newtab/prerendered/locales/ach/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ach/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

Kakube maloyo

Lami tam obedo Pocket

    Wiye madito

      - + diff --git a/browser/components/newtab/prerendered/locales/ach/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/ach/activity-stream-prerendered.html index 7efd71716b30..a8aac9791cc4 100644 --- a/browser/components/newtab/prerendered/locales/ach/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/ach/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

      Kakube maloyo

      Lami tam obedo Pocket

        Wiye madito

          - + diff --git a/browser/components/newtab/prerendered/locales/ach/activity-stream.html b/browser/components/newtab/prerendered/locales/ach/activity-stream.html index 6bee7d93bf4e..86330e0e03c1 100644 --- a/browser/components/newtab/prerendered/locales/ach/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/ach/activity-stream.html @@ -9,8 +9,9 @@ +
          - + diff --git a/browser/components/newtab/prerendered/locales/an/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/an/activity-stream-noscripts.html index 7c197a37352a..645daa69b76a 100644 --- a/browser/components/newtab/prerendered/locales/an/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/an/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
          - + diff --git a/browser/components/newtab/prerendered/locales/an/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/an/activity-stream-prerendered-noscripts.html index 2eac91ce73e9..198f669d0ef6 100644 --- a/browser/components/newtab/prerendered/locales/an/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/an/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

          Mas freqüents

          Recomendau per Pocket

            Destacaus

              - + diff --git a/browser/components/newtab/prerendered/locales/an/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/an/activity-stream-prerendered.html index ce20be15a68a..ac63708ad7bf 100644 --- a/browser/components/newtab/prerendered/locales/an/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/an/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

              Mas freqüents

              Recomendau per Pocket

                Destacaus

                  - + diff --git a/browser/components/newtab/prerendered/locales/an/activity-stream.html b/browser/components/newtab/prerendered/locales/an/activity-stream.html index 71b9d11ff0ed..545424a218bd 100644 --- a/browser/components/newtab/prerendered/locales/an/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/an/activity-stream.html @@ -9,8 +9,9 @@ +
                  - + diff --git a/browser/components/newtab/prerendered/locales/ar/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/ar/activity-stream-noscripts.html index 6738f5d1f5a3..d932ba708be7 100644 --- a/browser/components/newtab/prerendered/locales/ar/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ar/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                  - + diff --git a/browser/components/newtab/prerendered/locales/ar/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/ar/activity-stream-prerendered-noscripts.html index 7990d2547423..68a8d6e9d059 100644 --- a/browser/components/newtab/prerendered/locales/ar/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ar/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                  المواقع الأكثر زيارة

                  ينصح به Pocket

                    أهم الأحداث

                      - + diff --git a/browser/components/newtab/prerendered/locales/ar/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/ar/activity-stream-prerendered.html index ce6446d5cade..339e04943ce9 100644 --- a/browser/components/newtab/prerendered/locales/ar/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/ar/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                      المواقع الأكثر زيارة

                      ينصح به Pocket

                        أهم الأحداث

                          - + diff --git a/browser/components/newtab/prerendered/locales/ar/activity-stream.html b/browser/components/newtab/prerendered/locales/ar/activity-stream.html index dd06eff25fad..99e6650e79f2 100644 --- a/browser/components/newtab/prerendered/locales/ar/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/ar/activity-stream.html @@ -9,8 +9,9 @@ +
                          - + diff --git a/browser/components/newtab/prerendered/locales/ast/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/ast/activity-stream-noscripts.html index 9b128f7f0473..95bc1e173346 100644 --- a/browser/components/newtab/prerendered/locales/ast/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ast/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                          - + diff --git a/browser/components/newtab/prerendered/locales/ast/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/ast/activity-stream-prerendered-noscripts.html index ed9921ba1a94..9cc535241cda 100644 --- a/browser/components/newtab/prerendered/locales/ast/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ast/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                          Más visitaos

                          Recomendáu por Pocket

                            Destacaos

                              - + diff --git a/browser/components/newtab/prerendered/locales/ast/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/ast/activity-stream-prerendered.html index 3693ecd7551f..13ebae6b4e25 100644 --- a/browser/components/newtab/prerendered/locales/ast/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/ast/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                              Más visitaos

                              Recomendáu por Pocket

                                Destacaos

                                  - + diff --git a/browser/components/newtab/prerendered/locales/ast/activity-stream.html b/browser/components/newtab/prerendered/locales/ast/activity-stream.html index 2bc5e03bff7f..baa1a900d9b6 100644 --- a/browser/components/newtab/prerendered/locales/ast/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/ast/activity-stream.html @@ -9,8 +9,9 @@ +
                                  - + diff --git a/browser/components/newtab/prerendered/locales/az/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/az/activity-stream-noscripts.html index 2d839719bf61..966bd9daa456 100644 --- a/browser/components/newtab/prerendered/locales/az/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/az/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                  - + diff --git a/browser/components/newtab/prerendered/locales/az/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/az/activity-stream-prerendered-noscripts.html index 464ffb088be5..d4a79a174944 100644 --- a/browser/components/newtab/prerendered/locales/az/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/az/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                  Qabaqcıl Saytlar

                                  Pocket məsləhət görür

                                    Seçilmişlər

                                      - + diff --git a/browser/components/newtab/prerendered/locales/az/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/az/activity-stream-prerendered.html index 2ddec71bdc38..3a6a7b4d51f1 100644 --- a/browser/components/newtab/prerendered/locales/az/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/az/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                      Qabaqcıl Saytlar

                                      Pocket məsləhət görür

                                        Seçilmişlər

                                          - + diff --git a/browser/components/newtab/prerendered/locales/az/activity-stream.html b/browser/components/newtab/prerendered/locales/az/activity-stream.html index ad9a0f6c034b..3b64d2fe699b 100644 --- a/browser/components/newtab/prerendered/locales/az/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/az/activity-stream.html @@ -9,8 +9,9 @@ +
                                          - + diff --git a/browser/components/newtab/prerendered/locales/be/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/be/activity-stream-noscripts.html index edebbd6689f8..ccd2ca5740a7 100644 --- a/browser/components/newtab/prerendered/locales/be/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/be/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                          - + diff --git a/browser/components/newtab/prerendered/locales/be/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/be/activity-stream-prerendered-noscripts.html index 28e15d417d9f..558bc83b0d59 100644 --- a/browser/components/newtab/prerendered/locales/be/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/be/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                          Папулярныя сайты

                                          Рэкамендавана Pocket

                                            Выбранае

                                              - + diff --git a/browser/components/newtab/prerendered/locales/be/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/be/activity-stream-prerendered.html index 8aaf9ce975d9..4d77142945dc 100644 --- a/browser/components/newtab/prerendered/locales/be/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/be/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                              Папулярныя сайты

                                              Рэкамендавана Pocket

                                                Выбранае

                                                  - + diff --git a/browser/components/newtab/prerendered/locales/be/activity-stream.html b/browser/components/newtab/prerendered/locales/be/activity-stream.html index 18f41a8d0c13..edaa29156236 100644 --- a/browser/components/newtab/prerendered/locales/be/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/be/activity-stream.html @@ -9,8 +9,9 @@ +
                                                  - + diff --git a/browser/components/newtab/prerendered/locales/bg/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/bg/activity-stream-noscripts.html index 218cecf23ffa..293231ad89ef 100644 --- a/browser/components/newtab/prerendered/locales/bg/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/bg/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                  - + diff --git a/browser/components/newtab/prerendered/locales/bg/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/bg/activity-stream-prerendered-noscripts.html index c2bd26017f6d..2c3dcb0ae7a2 100644 --- a/browser/components/newtab/prerendered/locales/bg/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/bg/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                  Често посещавани страници

                                                  Препоръчано от Pocket

                                                    Акценти

                                                      - + diff --git a/browser/components/newtab/prerendered/locales/bg/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/bg/activity-stream-prerendered.html index f2c4bc3a81c0..0bddb76106c5 100644 --- a/browser/components/newtab/prerendered/locales/bg/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/bg/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                      Често посещавани страници

                                                      Препоръчано от Pocket

                                                        Акценти

                                                          - + diff --git a/browser/components/newtab/prerendered/locales/bg/activity-stream.html b/browser/components/newtab/prerendered/locales/bg/activity-stream.html index 791e2a6c9bf2..ce705df0eb8e 100644 --- a/browser/components/newtab/prerendered/locales/bg/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/bg/activity-stream.html @@ -9,8 +9,9 @@ +
                                                          - + diff --git a/browser/components/newtab/prerendered/locales/bn/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/bn/activity-stream-noscripts.html index 4c98ed946222..6c88dbf6f234 100644 --- a/browser/components/newtab/prerendered/locales/bn/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/bn/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                          - + diff --git a/browser/components/newtab/prerendered/locales/bn/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/bn/activity-stream-prerendered-noscripts.html index 0323f67e3d3a..88c8bb9c8d30 100644 --- a/browser/components/newtab/prerendered/locales/bn/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/bn/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                          শীর্ঘ সাইট

                                                          Pocket দ্বারা সুপারিশকৃত

                                                            হাইলাইটস

                                                              - + diff --git a/browser/components/newtab/prerendered/locales/bn/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/bn/activity-stream-prerendered.html index bcf941c390a4..79c7556087a1 100644 --- a/browser/components/newtab/prerendered/locales/bn/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/bn/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                              শীর্ঘ সাইট

                                                              Pocket দ্বারা সুপারিশকৃত

                                                                হাইলাইটস

                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/bn/activity-stream.html b/browser/components/newtab/prerendered/locales/bn/activity-stream.html index 3d6be9ca2248..20c3bf815f9d 100644 --- a/browser/components/newtab/prerendered/locales/bn/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/bn/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/br/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/br/activity-stream-noscripts.html index 7cd1c267570c..e0335e8517f5 100644 --- a/browser/components/newtab/prerendered/locales/br/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/br/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/br/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/br/activity-stream-prerendered-noscripts.html index ccdcbe8deea7..45c7fe111df8 100644 --- a/browser/components/newtab/prerendered/locales/br/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/br/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                  Lec'hiennoù pennañ

                                                                  Erbedet gant Pocket

                                                                    Mareoù pouezus

                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/br/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/br/activity-stream-prerendered.html index 8301aeebd981..69e56b6fe705 100644 --- a/browser/components/newtab/prerendered/locales/br/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/br/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                      Lec'hiennoù pennañ

                                                                      Erbedet gant Pocket

                                                                        Mareoù pouezus

                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/br/activity-stream.html b/browser/components/newtab/prerendered/locales/br/activity-stream.html index 88a0caa55de8..231b1df2534f 100644 --- a/browser/components/newtab/prerendered/locales/br/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/br/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/bs/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/bs/activity-stream-noscripts.html index d11415a8a681..759476deac31 100644 --- a/browser/components/newtab/prerendered/locales/bs/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/bs/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/bs/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/bs/activity-stream-prerendered-noscripts.html index 21a09fc6723a..c6ce9011130a 100644 --- a/browser/components/newtab/prerendered/locales/bs/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/bs/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                          Najposjećenije stranice

                                                                          Preporučeno od Pocket

                                                                            Istaknuto

                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/bs/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/bs/activity-stream-prerendered.html index 921ba5fc7d39..bd56c726a343 100644 --- a/browser/components/newtab/prerendered/locales/bs/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/bs/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                              Najposjećenije stranice

                                                                              Preporučeno od Pocket

                                                                                Istaknuto

                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/bs/activity-stream.html b/browser/components/newtab/prerendered/locales/bs/activity-stream.html index d6a90328d97d..4e34ad43dbc7 100644 --- a/browser/components/newtab/prerendered/locales/bs/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/bs/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/ca/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/ca/activity-stream-noscripts.html index 4020b7b7deba..de233a9eb856 100644 --- a/browser/components/newtab/prerendered/locales/ca/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ca/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/ca/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/ca/activity-stream-prerendered-noscripts.html index eef99ea9922b..44104ef303d7 100644 --- a/browser/components/newtab/prerendered/locales/ca/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ca/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                  Llocs principals

                                                                                  Recomanat per Pocket

                                                                                    Destacats

                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/ca/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/ca/activity-stream-prerendered.html index f615539e023f..6383717495c8 100644 --- a/browser/components/newtab/prerendered/locales/ca/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/ca/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                      Llocs principals

                                                                                      Recomanat per Pocket

                                                                                        Destacats

                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/ca/activity-stream.html b/browser/components/newtab/prerendered/locales/ca/activity-stream.html index 68a7581f2bac..25491c1f3723 100644 --- a/browser/components/newtab/prerendered/locales/ca/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/ca/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/cak/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/cak/activity-stream-noscripts.html index 432ed7995a54..121eeec29e05 100644 --- a/browser/components/newtab/prerendered/locales/cak/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/cak/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/cak/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/cak/activity-stream-prerendered-noscripts.html index 7dead48a8cc9..276410f1d3eb 100644 --- a/browser/components/newtab/prerendered/locales/cak/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/cak/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                          Jeb'ël Taq Ruxaq

                                                                                          Chilab'en ruma Pocket

                                                                                            Ya'on kiq'ij

                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/cak/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/cak/activity-stream-prerendered.html index c83a5c822d78..a295b8084713 100644 --- a/browser/components/newtab/prerendered/locales/cak/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/cak/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                              Jeb'ël Taq Ruxaq

                                                                                              Chilab'en ruma Pocket

                                                                                                Ya'on kiq'ij

                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/cak/activity-stream.html b/browser/components/newtab/prerendered/locales/cak/activity-stream.html index da7b23106ae3..5ebe2477962e 100644 --- a/browser/components/newtab/prerendered/locales/cak/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/cak/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/crh/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/crh/activity-stream-noscripts.html index e0bdbbc834a3..0c41abeb4a11 100644 --- a/browser/components/newtab/prerendered/locales/crh/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/crh/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/crh/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/crh/activity-stream-prerendered-noscripts.html index a60db3a384f6..b0797a87683e 100644 --- a/browser/components/newtab/prerendered/locales/crh/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/crh/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                  Zirvedeki Saytlar

                                                                                                  Pocket tevsiyeli

                                                                                                    Yüksek-ışıtmalar

                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/crh/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/crh/activity-stream-prerendered.html index 7ba61f54696e..ef219f3af3b1 100644 --- a/browser/components/newtab/prerendered/locales/crh/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/crh/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                      Zirvedeki Saytlar

                                                                                                      Pocket tevsiyeli

                                                                                                        Yüksek-ışıtmalar

                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/crh/activity-stream.html b/browser/components/newtab/prerendered/locales/crh/activity-stream.html index 5f920d416e8a..ab7e57d01899 100644 --- a/browser/components/newtab/prerendered/locales/crh/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/crh/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/cs/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/cs/activity-stream-noscripts.html index 82214b6c6e2c..fe51eb36da26 100644 --- a/browser/components/newtab/prerendered/locales/cs/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/cs/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/cs/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/cs/activity-stream-prerendered-noscripts.html index 73f918251981..3dc9b09fd16c 100644 --- a/browser/components/newtab/prerendered/locales/cs/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/cs/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                          Top stránky

                                                                                                          Doporučení ze služby Pocket

                                                                                                            Vybrané

                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/cs/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/cs/activity-stream-prerendered.html index 6821f345868c..15fbaabe01ef 100644 --- a/browser/components/newtab/prerendered/locales/cs/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/cs/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                              Top stránky

                                                                                                              Doporučení ze služby Pocket

                                                                                                                Vybrané

                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/cs/activity-stream.html b/browser/components/newtab/prerendered/locales/cs/activity-stream.html index b7db81f22b91..c5be5669c1b5 100644 --- a/browser/components/newtab/prerendered/locales/cs/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/cs/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/cy/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/cy/activity-stream-noscripts.html index 2c2abedf8b22..f80ebc3adc95 100644 --- a/browser/components/newtab/prerendered/locales/cy/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/cy/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/cy/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/cy/activity-stream-prerendered-noscripts.html index 52774d5387bc..44f868de7eed 100644 --- a/browser/components/newtab/prerendered/locales/cy/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/cy/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                  Hoff Wefannau

                                                                                                                  Argymhellwyd gan Pocket

                                                                                                                    Goreuon

                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/cy/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/cy/activity-stream-prerendered.html index f7102beffa70..f351c7332cc0 100644 --- a/browser/components/newtab/prerendered/locales/cy/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/cy/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                      Hoff Wefannau

                                                                                                                      Argymhellwyd gan Pocket

                                                                                                                        Goreuon

                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/cy/activity-stream.html b/browser/components/newtab/prerendered/locales/cy/activity-stream.html index 01c7be20ccfa..7a00f06c0567 100644 --- a/browser/components/newtab/prerendered/locales/cy/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/cy/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/da/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/da/activity-stream-noscripts.html index 584c49d75926..21e591eab480 100644 --- a/browser/components/newtab/prerendered/locales/da/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/da/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/da/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/da/activity-stream-prerendered-noscripts.html index 1d0473fff42a..a43ae815b3f6 100644 --- a/browser/components/newtab/prerendered/locales/da/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/da/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                          Mest besøgte websider

                                                                                                                          Anbefalet af Pocket

                                                                                                                            Fremhævede

                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/da/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/da/activity-stream-prerendered.html index 945ebbb8dc09..b2ab2fe1b927 100644 --- a/browser/components/newtab/prerendered/locales/da/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/da/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                              Mest besøgte websider

                                                                                                                              Anbefalet af Pocket

                                                                                                                                Fremhævede

                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/da/activity-stream.html b/browser/components/newtab/prerendered/locales/da/activity-stream.html index cca34f298bbf..c1ce64e96e44 100644 --- a/browser/components/newtab/prerendered/locales/da/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/da/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/de/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/de/activity-stream-noscripts.html index 70e8d4d834e3..b5ba1bebf3c5 100644 --- a/browser/components/newtab/prerendered/locales/de/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/de/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/de/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/de/activity-stream-prerendered-noscripts.html index d4f709e1a6e8..417e58dc081b 100644 --- a/browser/components/newtab/prerendered/locales/de/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/de/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                  Wichtige Seiten

                                                                                                                                  Empfohlen von Pocket

                                                                                                                                    Überblick

                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/de/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/de/activity-stream-prerendered.html index a287b50632fd..a2c5f1727620 100644 --- a/browser/components/newtab/prerendered/locales/de/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/de/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                      Wichtige Seiten

                                                                                                                                      Empfohlen von Pocket

                                                                                                                                        Überblick

                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/de/activity-stream.html b/browser/components/newtab/prerendered/locales/de/activity-stream.html index 961f079c7727..304131d67a96 100644 --- a/browser/components/newtab/prerendered/locales/de/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/de/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/dsb/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/dsb/activity-stream-noscripts.html index 445ab189e0ce..cffdc7d5f97f 100644 --- a/browser/components/newtab/prerendered/locales/dsb/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/dsb/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/dsb/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/dsb/activity-stream-prerendered-noscripts.html index f5f4f7f5e43a..3d4f8c09883e 100644 --- a/browser/components/newtab/prerendered/locales/dsb/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/dsb/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                          Nejcesćej woglědane sedła

                                                                                                                                          Wót Pocket dopórucony

                                                                                                                                            Wjerški

                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/dsb/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/dsb/activity-stream-prerendered.html index 5dc9ad1be3c8..419df349541c 100644 --- a/browser/components/newtab/prerendered/locales/dsb/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/dsb/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                              Nejcesćej woglědane sedła

                                                                                                                                              Wót Pocket dopórucony

                                                                                                                                                Wjerški

                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/dsb/activity-stream.html b/browser/components/newtab/prerendered/locales/dsb/activity-stream.html index 080c354d012a..0f3017054d2c 100644 --- a/browser/components/newtab/prerendered/locales/dsb/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/dsb/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/el/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/el/activity-stream-noscripts.html index 1c27e773043e..869393eb7672 100644 --- a/browser/components/newtab/prerendered/locales/el/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/el/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/el/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/el/activity-stream-prerendered-noscripts.html index b80adc2e03d7..49bad9bbcaad 100644 --- a/browser/components/newtab/prerendered/locales/el/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/el/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                  Κορυφαίες ιστοσελίδες

                                                                                                                                                  Προτεινόμενο από τον πάροχο Pocket

                                                                                                                                                    Κορυφαίες στιγμές

                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/el/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/el/activity-stream-prerendered.html index 3d05b887efab..a65f972c5405 100644 --- a/browser/components/newtab/prerendered/locales/el/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/el/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                      Κορυφαίες ιστοσελίδες

                                                                                                                                                      Προτεινόμενο από τον πάροχο Pocket

                                                                                                                                                        Κορυφαίες στιγμές

                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/el/activity-stream.html b/browser/components/newtab/prerendered/locales/el/activity-stream.html index 19cf92030006..97627bc32fda 100644 --- a/browser/components/newtab/prerendered/locales/el/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/el/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/en-CA/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/en-CA/activity-stream-noscripts.html index bf51a9cc9de2..a814f39d1354 100644 --- a/browser/components/newtab/prerendered/locales/en-CA/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/en-CA/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/en-CA/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/en-CA/activity-stream-prerendered-noscripts.html index 0f14b32b1485..f19c02a2ad81 100644 --- a/browser/components/newtab/prerendered/locales/en-CA/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/en-CA/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                          Top Sites

                                                                                                                                                          Recommended by Pocket

                                                                                                                                                            Highlights

                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/en-CA/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/en-CA/activity-stream-prerendered.html index 9edd6c70f3bc..2302e1743a7b 100644 --- a/browser/components/newtab/prerendered/locales/en-CA/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/en-CA/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                              Top Sites

                                                                                                                                                              Recommended by Pocket

                                                                                                                                                                Highlights

                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/en-CA/activity-stream.html b/browser/components/newtab/prerendered/locales/en-CA/activity-stream.html index 69360a1c652a..6d9555380c6d 100644 --- a/browser/components/newtab/prerendered/locales/en-CA/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/en-CA/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/en-GB/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/en-GB/activity-stream-noscripts.html index 7097eedd9e16..1639cbcbf491 100644 --- a/browser/components/newtab/prerendered/locales/en-GB/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/en-GB/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/en-GB/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/en-GB/activity-stream-prerendered-noscripts.html index 58ccac2de11f..87c0940aff8a 100644 --- a/browser/components/newtab/prerendered/locales/en-GB/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/en-GB/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                  Top Sites

                                                                                                                                                                  Recommended by Pocket

                                                                                                                                                                    Highlights

                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/en-GB/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/en-GB/activity-stream-prerendered.html index b4acd00bd2e9..e79ece834bfd 100644 --- a/browser/components/newtab/prerendered/locales/en-GB/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/en-GB/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                      Top Sites

                                                                                                                                                                      Recommended by Pocket

                                                                                                                                                                        Highlights

                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/en-GB/activity-stream.html b/browser/components/newtab/prerendered/locales/en-GB/activity-stream.html index 7309d49febe7..1cb8b6e2344e 100644 --- a/browser/components/newtab/prerendered/locales/en-GB/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/en-GB/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/en-US/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/en-US/activity-stream-noscripts.html index 5e1dbd7ecf44..974119a4b53b 100644 --- a/browser/components/newtab/prerendered/locales/en-US/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/en-US/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/en-US/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/en-US/activity-stream-prerendered-noscripts.html index 5fc909827150..653ea5d24102 100644 --- a/browser/components/newtab/prerendered/locales/en-US/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/en-US/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                          Top Sites

                                                                                                                                                                          Recommended by Pocket

                                                                                                                                                                            Highlights

                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/en-US/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/en-US/activity-stream-prerendered.html index 47f714c99e2e..ed9c442fd016 100644 --- a/browser/components/newtab/prerendered/locales/en-US/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/en-US/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                              Top Sites

                                                                                                                                                                              Recommended by Pocket

                                                                                                                                                                                Highlights

                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/en-US/activity-stream.html b/browser/components/newtab/prerendered/locales/en-US/activity-stream.html index 74c1eaaea550..79a5e5203b61 100644 --- a/browser/components/newtab/prerendered/locales/en-US/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/en-US/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/eo/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/eo/activity-stream-noscripts.html index 758a65203fad..5c0d6e9e8557 100644 --- a/browser/components/newtab/prerendered/locales/eo/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/eo/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/eo/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/eo/activity-stream-prerendered-noscripts.html index 048fbfbd77e2..a503a0e2704e 100644 --- a/browser/components/newtab/prerendered/locales/eo/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/eo/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                  Plej vizititaj

                                                                                                                                                                                  Rekomendita de Pocket

                                                                                                                                                                                    Elstaraĵoj

                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/eo/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/eo/activity-stream-prerendered.html index fa7ef68bc403..5aa4732cec4e 100644 --- a/browser/components/newtab/prerendered/locales/eo/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/eo/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                      Plej vizititaj

                                                                                                                                                                                      Rekomendita de Pocket

                                                                                                                                                                                        Elstaraĵoj

                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/eo/activity-stream.html b/browser/components/newtab/prerendered/locales/eo/activity-stream.html index c456323189aa..93ee224a8d31 100644 --- a/browser/components/newtab/prerendered/locales/eo/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/eo/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/es-AR/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/es-AR/activity-stream-noscripts.html index f80a47d57903..ba15ac0ba0b2 100644 --- a/browser/components/newtab/prerendered/locales/es-AR/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/es-AR/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/es-AR/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/es-AR/activity-stream-prerendered-noscripts.html index 31ecd71fa857..afe50a68f62f 100644 --- a/browser/components/newtab/prerendered/locales/es-AR/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/es-AR/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                          Más visitados

                                                                                                                                                                                          Recomendado por Pocket

                                                                                                                                                                                            Destacados

                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/es-AR/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/es-AR/activity-stream-prerendered.html index 1f3418ef94b3..cae890285076 100644 --- a/browser/components/newtab/prerendered/locales/es-AR/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/es-AR/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                              Más visitados

                                                                                                                                                                                              Recomendado por Pocket

                                                                                                                                                                                                Destacados

                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/es-AR/activity-stream.html b/browser/components/newtab/prerendered/locales/es-AR/activity-stream.html index a82023a88984..cca93deb5a92 100644 --- a/browser/components/newtab/prerendered/locales/es-AR/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/es-AR/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/es-CL/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/es-CL/activity-stream-noscripts.html index ece9b4bf42dd..b61ae01e4c5d 100644 --- a/browser/components/newtab/prerendered/locales/es-CL/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/es-CL/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/es-CL/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/es-CL/activity-stream-prerendered-noscripts.html index be4f6512c72e..e5ff1e2c34b0 100644 --- a/browser/components/newtab/prerendered/locales/es-CL/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/es-CL/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                  Sitios frecuentes

                                                                                                                                                                                                  Recomendado por Pocket

                                                                                                                                                                                                    Destacados

                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/es-CL/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/es-CL/activity-stream-prerendered.html index 68591b40aecc..7d0e2a9273e2 100644 --- a/browser/components/newtab/prerendered/locales/es-CL/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/es-CL/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                      Sitios frecuentes

                                                                                                                                                                                                      Recomendado por Pocket

                                                                                                                                                                                                        Destacados

                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/es-CL/activity-stream.html b/browser/components/newtab/prerendered/locales/es-CL/activity-stream.html index b3806df78509..e95b74340187 100644 --- a/browser/components/newtab/prerendered/locales/es-CL/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/es-CL/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/es-ES/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/es-ES/activity-stream-noscripts.html index 6a220eb2a9bc..6b2972fb4443 100644 --- a/browser/components/newtab/prerendered/locales/es-ES/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/es-ES/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/es-ES/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/es-ES/activity-stream-prerendered-noscripts.html index 21e5a934eab0..8d8d30fed253 100644 --- a/browser/components/newtab/prerendered/locales/es-ES/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/es-ES/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                          Sitios favoritos

                                                                                                                                                                                                          Recomendado por Pocket

                                                                                                                                                                                                            Destacados

                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/es-ES/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/es-ES/activity-stream-prerendered.html index c1341184b3f1..2feaca4a1f23 100644 --- a/browser/components/newtab/prerendered/locales/es-ES/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/es-ES/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                              Sitios favoritos

                                                                                                                                                                                                              Recomendado por Pocket

                                                                                                                                                                                                                Destacados

                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/es-ES/activity-stream.html b/browser/components/newtab/prerendered/locales/es-ES/activity-stream.html index 8d58c4a4c90e..d3beae4321a8 100644 --- a/browser/components/newtab/prerendered/locales/es-ES/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/es-ES/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/es-MX/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/es-MX/activity-stream-noscripts.html index a46ce47cc67d..4fafc39054be 100644 --- a/browser/components/newtab/prerendered/locales/es-MX/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/es-MX/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/es-MX/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/es-MX/activity-stream-prerendered-noscripts.html index d6ef83fd753e..387a19d991a2 100644 --- a/browser/components/newtab/prerendered/locales/es-MX/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/es-MX/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                  Sitios favoritos

                                                                                                                                                                                                                  Recomendado por Pocket

                                                                                                                                                                                                                    Destacados

                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/es-MX/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/es-MX/activity-stream-prerendered.html index 19f3d9ac8f0e..521e500e00f2 100644 --- a/browser/components/newtab/prerendered/locales/es-MX/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/es-MX/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                      Sitios favoritos

                                                                                                                                                                                                                      Recomendado por Pocket

                                                                                                                                                                                                                        Destacados

                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/es-MX/activity-stream.html b/browser/components/newtab/prerendered/locales/es-MX/activity-stream.html index d1efb8ac6198..3a63852c46e5 100644 --- a/browser/components/newtab/prerendered/locales/es-MX/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/es-MX/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/et/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/et/activity-stream-noscripts.html index b2afaad61c9e..4e07628f2b2c 100644 --- a/browser/components/newtab/prerendered/locales/et/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/et/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/et/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/et/activity-stream-prerendered-noscripts.html index 7f36c2de511a..df061c5cfa69 100644 --- a/browser/components/newtab/prerendered/locales/et/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/et/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                          Top saidid

                                                                                                                                                                                                                          Pocket soovitab

                                                                                                                                                                                                                            Esiletõstetud

                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/et/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/et/activity-stream-prerendered.html index 59ff3c290783..f36c6c76fe74 100644 --- a/browser/components/newtab/prerendered/locales/et/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/et/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                              Top saidid

                                                                                                                                                                                                                              Pocket soovitab

                                                                                                                                                                                                                                Esiletõstetud

                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/et/activity-stream.html b/browser/components/newtab/prerendered/locales/et/activity-stream.html index 643afd199447..462c7a72cbb5 100644 --- a/browser/components/newtab/prerendered/locales/et/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/et/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/eu/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/eu/activity-stream-noscripts.html index 892765bb0a4c..f70ba6623831 100644 --- a/browser/components/newtab/prerendered/locales/eu/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/eu/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/eu/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/eu/activity-stream-prerendered-noscripts.html index 34a08b619f8f..6e7496728e1d 100644 --- a/browser/components/newtab/prerendered/locales/eu/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/eu/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                  Gune erabilienak

                                                                                                                                                                                                                                  Pocket hornitzaileak gomendatuta

                                                                                                                                                                                                                                    Nabarmendutakoak

                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/eu/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/eu/activity-stream-prerendered.html index f0de67539e72..3b13ae1220bd 100644 --- a/browser/components/newtab/prerendered/locales/eu/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/eu/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                      Gune erabilienak

                                                                                                                                                                                                                                      Pocket hornitzaileak gomendatuta

                                                                                                                                                                                                                                        Nabarmendutakoak

                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/eu/activity-stream-strings.js b/browser/components/newtab/prerendered/locales/eu/activity-stream-strings.js index 3103459a0324..ad0a3600710f 100644 --- a/browser/components/newtab/prerendered/locales/eu/activity-stream-strings.js +++ b/browser/components/newtab/prerendered/locales/eu/activity-stream-strings.js @@ -94,7 +94,7 @@ window.gActivityStreamStrings = { "section_menu_action_move_down": "Eraman behera", "section_menu_action_privacy_notice": "Pribatutasun-oharra", "firstrun_title": "Eraman Firefox aldean", - "firstrun_content": "Izan laster-markak, historia, pasahitzak eta beste ezarpenak eskura zure gailu guztietatik.", + "firstrun_content": "Izan laster-markak, historia, pasahitzak eta beste ezarpenak eskura zure gailu guztietan.", "firstrun_learn_more_link": "Firefox kontuei buruzko argibide gehiago", "firstrun_form_header": "Idatzi zure helbide elektronikoa", "firstrun_form_sub_header": "Firefox Sync-ekin jarraitzeko.", diff --git a/browser/components/newtab/prerendered/locales/eu/activity-stream.html b/browser/components/newtab/prerendered/locales/eu/activity-stream.html index 93661a34c98b..3df5dee79329 100644 --- a/browser/components/newtab/prerendered/locales/eu/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/eu/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/fa/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/fa/activity-stream-noscripts.html index ffb0631daade..08333b2901b3 100644 --- a/browser/components/newtab/prerendered/locales/fa/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/fa/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/fa/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/fa/activity-stream-prerendered-noscripts.html index d895f0688998..e7f622fedfdd 100644 --- a/browser/components/newtab/prerendered/locales/fa/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/fa/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                          سایت‌های برتر

                                                                                                                                                                                                                                          پیشنهاد شده توسط Pocket

                                                                                                                                                                                                                                            برجسته‌ها

                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/fa/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/fa/activity-stream-prerendered.html index 00b1688a6b13..bff712dda6c8 100644 --- a/browser/components/newtab/prerendered/locales/fa/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/fa/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                              سایت‌های برتر

                                                                                                                                                                                                                                              پیشنهاد شده توسط Pocket

                                                                                                                                                                                                                                                برجسته‌ها

                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/fa/activity-stream.html b/browser/components/newtab/prerendered/locales/fa/activity-stream.html index 85eb46b35213..c5314a581f59 100644 --- a/browser/components/newtab/prerendered/locales/fa/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/fa/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/ff/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/ff/activity-stream-noscripts.html index 601a5048c7e4..72ce807554d1 100644 --- a/browser/components/newtab/prerendered/locales/ff/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ff/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/ff/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/ff/activity-stream-prerendered-noscripts.html index 7907c10bc15b..9c4497505450 100644 --- a/browser/components/newtab/prerendered/locales/ff/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ff/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                  Lowe dowrowe

                                                                                                                                                                                                                                                  Waggini ɗum ko Pocket

                                                                                                                                                                                                                                                    Jalbine

                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/ff/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/ff/activity-stream-prerendered.html index 2f0cf2637ec4..92d6f9db7f3c 100644 --- a/browser/components/newtab/prerendered/locales/ff/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/ff/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                      Lowe dowrowe

                                                                                                                                                                                                                                                      Waggini ɗum ko Pocket

                                                                                                                                                                                                                                                        Jalbine

                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/ff/activity-stream.html b/browser/components/newtab/prerendered/locales/ff/activity-stream.html index d4a10cd04d56..57cc165959e6 100644 --- a/browser/components/newtab/prerendered/locales/ff/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/ff/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/fi/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/fi/activity-stream-noscripts.html index 4850d255e14b..c1b1039e6da6 100644 --- a/browser/components/newtab/prerendered/locales/fi/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/fi/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/fi/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/fi/activity-stream-prerendered-noscripts.html index 8d72940729d2..0d6a9ce7528e 100644 --- a/browser/components/newtab/prerendered/locales/fi/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/fi/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                          Ykkössivustot

                                                                                                                                                                                                                                                          Suositukset lähteestä Pocket

                                                                                                                                                                                                                                                            Nostot

                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/fi/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/fi/activity-stream-prerendered.html index 05a1f862c5a8..0870c09b2365 100644 --- a/browser/components/newtab/prerendered/locales/fi/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/fi/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                              Ykkössivustot

                                                                                                                                                                                                                                                              Suositukset lähteestä Pocket

                                                                                                                                                                                                                                                                Nostot

                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/fi/activity-stream.html b/browser/components/newtab/prerendered/locales/fi/activity-stream.html index 0c358feec82d..d7a27833c249 100644 --- a/browser/components/newtab/prerendered/locales/fi/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/fi/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/fr/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/fr/activity-stream-noscripts.html index 128407c8b775..b566ecfe7168 100644 --- a/browser/components/newtab/prerendered/locales/fr/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/fr/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/fr/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/fr/activity-stream-prerendered-noscripts.html index 946fafa4c7ce..a004811f060d 100644 --- a/browser/components/newtab/prerendered/locales/fr/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/fr/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                  Sites les plus visités

                                                                                                                                                                                                                                                                  Recommandations par Pocket

                                                                                                                                                                                                                                                                    Éléments-clés

                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/fr/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/fr/activity-stream-prerendered.html index 350c49edd7c8..e4f106545879 100644 --- a/browser/components/newtab/prerendered/locales/fr/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/fr/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                      Sites les plus visités

                                                                                                                                                                                                                                                                      Recommandations par Pocket

                                                                                                                                                                                                                                                                        Éléments-clés

                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/fr/activity-stream.html b/browser/components/newtab/prerendered/locales/fr/activity-stream.html index fc6af5e89c17..fce95e5097c6 100644 --- a/browser/components/newtab/prerendered/locales/fr/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/fr/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/fy-NL/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/fy-NL/activity-stream-noscripts.html index e0bf26fb56f9..1b8ad807f7a2 100644 --- a/browser/components/newtab/prerendered/locales/fy-NL/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/fy-NL/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/fy-NL/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/fy-NL/activity-stream-prerendered-noscripts.html index b51667618843..29cd9f2d3df0 100644 --- a/browser/components/newtab/prerendered/locales/fy-NL/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/fy-NL/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                          Topwebsites

                                                                                                                                                                                                                                                                          Oanrekommandearre troch Pocket

                                                                                                                                                                                                                                                                            Hichtepunten

                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/fy-NL/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/fy-NL/activity-stream-prerendered.html index bd164ff9d9ef..8f7760aa181e 100644 --- a/browser/components/newtab/prerendered/locales/fy-NL/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/fy-NL/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                              Topwebsites

                                                                                                                                                                                                                                                                              Oanrekommandearre troch Pocket

                                                                                                                                                                                                                                                                                Hichtepunten

                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/fy-NL/activity-stream.html b/browser/components/newtab/prerendered/locales/fy-NL/activity-stream.html index 9a9398dcfe98..1412b734476d 100644 --- a/browser/components/newtab/prerendered/locales/fy-NL/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/fy-NL/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/ga-IE/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/ga-IE/activity-stream-noscripts.html index 6dcfa09283f8..67ed7b7c5eb6 100644 --- a/browser/components/newtab/prerendered/locales/ga-IE/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ga-IE/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/ga-IE/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/ga-IE/activity-stream-prerendered-noscripts.html index afe1c84992b4..937eedf67f34 100644 --- a/browser/components/newtab/prerendered/locales/ga-IE/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ga-IE/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                  Barrshuímh

                                                                                                                                                                                                                                                                                  Recommended by Pocket

                                                                                                                                                                                                                                                                                    Highlights

                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/ga-IE/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/ga-IE/activity-stream-prerendered.html index 8405de9da286..46a34a10dfea 100644 --- a/browser/components/newtab/prerendered/locales/ga-IE/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/ga-IE/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                      Barrshuímh

                                                                                                                                                                                                                                                                                      Recommended by Pocket

                                                                                                                                                                                                                                                                                        Highlights

                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/ga-IE/activity-stream.html b/browser/components/newtab/prerendered/locales/ga-IE/activity-stream.html index 8e80ec836336..88e058ed2b27 100644 --- a/browser/components/newtab/prerendered/locales/ga-IE/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/ga-IE/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/gd/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/gd/activity-stream-noscripts.html index e35e3514f5ac..499533407e37 100644 --- a/browser/components/newtab/prerendered/locales/gd/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/gd/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/gd/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/gd/activity-stream-prerendered-noscripts.html index 59b53b8ccd19..9cb2f80232c8 100644 --- a/browser/components/newtab/prerendered/locales/gd/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/gd/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                          Brod nan làrach

                                                                                                                                                                                                                                                                                          ’Ga mholadh le Pocket

                                                                                                                                                                                                                                                                                            Sàr-roghainn

                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/gd/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/gd/activity-stream-prerendered.html index 187bca73e70d..ec17d9836e44 100644 --- a/browser/components/newtab/prerendered/locales/gd/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/gd/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                              Brod nan làrach

                                                                                                                                                                                                                                                                                              ’Ga mholadh le Pocket

                                                                                                                                                                                                                                                                                                Sàr-roghainn

                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/gd/activity-stream.html b/browser/components/newtab/prerendered/locales/gd/activity-stream.html index 0d189b4d44dd..034ab25f7627 100644 --- a/browser/components/newtab/prerendered/locales/gd/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/gd/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/gl/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/gl/activity-stream-noscripts.html index 0fc0a2ebcd1d..148e999d6676 100644 --- a/browser/components/newtab/prerendered/locales/gl/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/gl/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/gl/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/gl/activity-stream-prerendered-noscripts.html index 77b8de8871a8..11a0204f2d9f 100644 --- a/browser/components/newtab/prerendered/locales/gl/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/gl/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                  Sitios favoritos

                                                                                                                                                                                                                                                                                                  Recomendado por Pocket

                                                                                                                                                                                                                                                                                                    Destacados

                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/gl/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/gl/activity-stream-prerendered.html index 3b747dfae0bc..2fbb9ee21287 100644 --- a/browser/components/newtab/prerendered/locales/gl/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/gl/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                      Sitios favoritos

                                                                                                                                                                                                                                                                                                      Recomendado por Pocket

                                                                                                                                                                                                                                                                                                        Destacados

                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/gl/activity-stream.html b/browser/components/newtab/prerendered/locales/gl/activity-stream.html index c8e96bcf51bf..3b7536fe2c7e 100644 --- a/browser/components/newtab/prerendered/locales/gl/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/gl/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/gn/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/gn/activity-stream-noscripts.html index 9e928f92cc86..e378e6b30a15 100644 --- a/browser/components/newtab/prerendered/locales/gn/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/gn/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/gn/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/gn/activity-stream-prerendered-noscripts.html index 384ab6690c42..f365bd7a2bf2 100644 --- a/browser/components/newtab/prerendered/locales/gn/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/gn/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                          Tenda Ojehechavéva

                                                                                                                                                                                                                                                                                                          Pocket he'i ndéve reike hag̃ua

                                                                                                                                                                                                                                                                                                            Mba'eporãitéva

                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/gn/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/gn/activity-stream-prerendered.html index a53e6a89961b..bd1bbe65b511 100644 --- a/browser/components/newtab/prerendered/locales/gn/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/gn/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                              Tenda Ojehechavéva

                                                                                                                                                                                                                                                                                                              Pocket he'i ndéve reike hag̃ua

                                                                                                                                                                                                                                                                                                                Mba'eporãitéva

                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/gn/activity-stream.html b/browser/components/newtab/prerendered/locales/gn/activity-stream.html index 71daac2fb60a..598acc5b07fa 100644 --- a/browser/components/newtab/prerendered/locales/gn/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/gn/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/gu-IN/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/gu-IN/activity-stream-noscripts.html index dd9c2feee740..f4b2c9ba8275 100644 --- a/browser/components/newtab/prerendered/locales/gu-IN/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/gu-IN/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/gu-IN/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/gu-IN/activity-stream-prerendered-noscripts.html index 1cbf1dbe11d2..5bd8936f1121 100644 --- a/browser/components/newtab/prerendered/locales/gu-IN/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/gu-IN/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                  ટોચની સાઇટ્સ

                                                                                                                                                                                                                                                                                                                  Pocket દ્વારા ભલામણ

                                                                                                                                                                                                                                                                                                                    હાઇલાઇટ્સ

                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/gu-IN/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/gu-IN/activity-stream-prerendered.html index 2499591fbb25..d601138b6b81 100644 --- a/browser/components/newtab/prerendered/locales/gu-IN/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/gu-IN/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                      ટોચની સાઇટ્સ

                                                                                                                                                                                                                                                                                                                      Pocket દ્વારા ભલામણ

                                                                                                                                                                                                                                                                                                                        હાઇલાઇટ્સ

                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/gu-IN/activity-stream.html b/browser/components/newtab/prerendered/locales/gu-IN/activity-stream.html index c6c64894301d..954fc7fe7b7b 100644 --- a/browser/components/newtab/prerendered/locales/gu-IN/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/gu-IN/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/he/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/he/activity-stream-noscripts.html index d3e15251418e..4a4b3556e288 100644 --- a/browser/components/newtab/prerendered/locales/he/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/he/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/he/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/he/activity-stream-prerendered-noscripts.html index f4ff61d1ff67..6f7d48ab2459 100644 --- a/browser/components/newtab/prerendered/locales/he/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/he/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                          אתרים מובילים

                                                                                                                                                                                                                                                                                                                          מומלץ על ידי Pocket

                                                                                                                                                                                                                                                                                                                            מומלצים

                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/he/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/he/activity-stream-prerendered.html index 8d4ac9672bf5..f8b170104ab3 100644 --- a/browser/components/newtab/prerendered/locales/he/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/he/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                              אתרים מובילים

                                                                                                                                                                                                                                                                                                                              מומלץ על ידי Pocket

                                                                                                                                                                                                                                                                                                                                מומלצים

                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/he/activity-stream.html b/browser/components/newtab/prerendered/locales/he/activity-stream.html index 527b60b1663c..a9ceb0858ff4 100644 --- a/browser/components/newtab/prerendered/locales/he/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/he/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/hi-IN/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/hi-IN/activity-stream-noscripts.html index affa31c3e5b9..bcfd4a723cd7 100644 --- a/browser/components/newtab/prerendered/locales/hi-IN/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/hi-IN/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/hi-IN/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/hi-IN/activity-stream-prerendered-noscripts.html index ed1925263cb3..298c9324b696 100644 --- a/browser/components/newtab/prerendered/locales/hi-IN/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/hi-IN/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                  सर्वोच्च साइटें

                                                                                                                                                                                                                                                                                                                                  Pocket द्वारा अनुशंसित

                                                                                                                                                                                                                                                                                                                                    प्रमुखताएँ

                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/hi-IN/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/hi-IN/activity-stream-prerendered.html index 78a917295491..cefeaa515d42 100644 --- a/browser/components/newtab/prerendered/locales/hi-IN/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/hi-IN/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                      सर्वोच्च साइटें

                                                                                                                                                                                                                                                                                                                                      Pocket द्वारा अनुशंसित

                                                                                                                                                                                                                                                                                                                                        प्रमुखताएँ

                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/hi-IN/activity-stream.html b/browser/components/newtab/prerendered/locales/hi-IN/activity-stream.html index 4f4d31f36cd6..a37719f4ea10 100644 --- a/browser/components/newtab/prerendered/locales/hi-IN/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/hi-IN/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/hr/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/hr/activity-stream-noscripts.html index 6217bbfceda1..92925deb30b2 100644 --- a/browser/components/newtab/prerendered/locales/hr/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/hr/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/hr/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/hr/activity-stream-prerendered-noscripts.html index 8de2888abc9a..42a9a0e1d7d1 100644 --- a/browser/components/newtab/prerendered/locales/hr/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/hr/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                          Najbolje stranice

                                                                                                                                                                                                                                                                                                                                          Preporučeno od Pocket

                                                                                                                                                                                                                                                                                                                                            Istaknuto

                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/hr/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/hr/activity-stream-prerendered.html index 15e0ad77b186..2120a0f7a04f 100644 --- a/browser/components/newtab/prerendered/locales/hr/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/hr/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                              Najbolje stranice

                                                                                                                                                                                                                                                                                                                                              Preporučeno od Pocket

                                                                                                                                                                                                                                                                                                                                                Istaknuto

                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/hr/activity-stream.html b/browser/components/newtab/prerendered/locales/hr/activity-stream.html index 617d00fb6ae7..52996bdd72a5 100644 --- a/browser/components/newtab/prerendered/locales/hr/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/hr/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/hsb/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/hsb/activity-stream-noscripts.html index 06c70c15d078..5f762de9636f 100644 --- a/browser/components/newtab/prerendered/locales/hsb/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/hsb/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/hsb/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/hsb/activity-stream-prerendered-noscripts.html index 0af7753027ce..e00238d41945 100644 --- a/browser/components/newtab/prerendered/locales/hsb/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/hsb/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                  Najhusćišo wopytane sydła

                                                                                                                                                                                                                                                                                                                                                  Wot Pocket doporučeny

                                                                                                                                                                                                                                                                                                                                                    Wjerški

                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/hsb/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/hsb/activity-stream-prerendered.html index f06e3334a9cf..66aca87394f7 100644 --- a/browser/components/newtab/prerendered/locales/hsb/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/hsb/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                      Najhusćišo wopytane sydła

                                                                                                                                                                                                                                                                                                                                                      Wot Pocket doporučeny

                                                                                                                                                                                                                                                                                                                                                        Wjerški

                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/hsb/activity-stream.html b/browser/components/newtab/prerendered/locales/hsb/activity-stream.html index 55fffefc9048..8bf3e9cdd707 100644 --- a/browser/components/newtab/prerendered/locales/hsb/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/hsb/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/hu/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/hu/activity-stream-noscripts.html index e0a7e7960de0..4827da97d2f3 100644 --- a/browser/components/newtab/prerendered/locales/hu/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/hu/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/hu/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/hu/activity-stream-prerendered-noscripts.html index 4a66c5cf122b..d26132ef94b6 100644 --- a/browser/components/newtab/prerendered/locales/hu/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/hu/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                          Népszerű oldalak

                                                                                                                                                                                                                                                                                                                                                          A(z) Pocket ajánlásával

                                                                                                                                                                                                                                                                                                                                                            Kiemelések

                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/hu/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/hu/activity-stream-prerendered.html index eba2c076b99d..64dd9fcaf8c1 100644 --- a/browser/components/newtab/prerendered/locales/hu/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/hu/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                              Népszerű oldalak

                                                                                                                                                                                                                                                                                                                                                              A(z) Pocket ajánlásával

                                                                                                                                                                                                                                                                                                                                                                Kiemelések

                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/hu/activity-stream.html b/browser/components/newtab/prerendered/locales/hu/activity-stream.html index f7a928653ace..cf3d17fb5f61 100644 --- a/browser/components/newtab/prerendered/locales/hu/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/hu/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/hy-AM/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/hy-AM/activity-stream-noscripts.html index 4d2559ab3b35..7f5e9af3a2d4 100644 --- a/browser/components/newtab/prerendered/locales/hy-AM/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/hy-AM/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/hy-AM/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/hy-AM/activity-stream-prerendered-noscripts.html index 3ff89e767649..77d713a45b39 100644 --- a/browser/components/newtab/prerendered/locales/hy-AM/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/hy-AM/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                  Լավագույն կայքեր

                                                                                                                                                                                                                                                                                                                                                                  Առաջարկվում է Pocket

                                                                                                                                                                                                                                                                                                                                                                    Գունանշումներ

                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/hy-AM/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/hy-AM/activity-stream-prerendered.html index 0f7366774fd3..5e9eaa3734c8 100644 --- a/browser/components/newtab/prerendered/locales/hy-AM/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/hy-AM/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                      Լավագույն կայքեր

                                                                                                                                                                                                                                                                                                                                                                      Առաջարկվում է Pocket

                                                                                                                                                                                                                                                                                                                                                                        Գունանշումներ

                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/hy-AM/activity-stream.html b/browser/components/newtab/prerendered/locales/hy-AM/activity-stream.html index 8b660a544d54..fefbdf098257 100644 --- a/browser/components/newtab/prerendered/locales/hy-AM/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/hy-AM/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/ia/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/ia/activity-stream-noscripts.html index 1cb3970e8451..9c67c92493e8 100644 --- a/browser/components/newtab/prerendered/locales/ia/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ia/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/ia/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/ia/activity-stream-prerendered-noscripts.html index 522de4c276f2..38ac85b9409b 100644 --- a/browser/components/newtab/prerendered/locales/ia/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ia/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                          Sitos popular

                                                                                                                                                                                                                                                                                                                                                                          Recommendate per Pocket

                                                                                                                                                                                                                                                                                                                                                                            In evidentia

                                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/ia/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/ia/activity-stream-prerendered.html index 6c7ccce1ecf0..95f7e77e1ecd 100644 --- a/browser/components/newtab/prerendered/locales/ia/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/ia/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                              Sitos popular

                                                                                                                                                                                                                                                                                                                                                                              Recommendate per Pocket

                                                                                                                                                                                                                                                                                                                                                                                In evidentia

                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/ia/activity-stream.html b/browser/components/newtab/prerendered/locales/ia/activity-stream.html index 18621c3e9316..9c33290b6065 100644 --- a/browser/components/newtab/prerendered/locales/ia/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/ia/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/id/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/id/activity-stream-noscripts.html index ebb7ede15823..0a8df0222c26 100644 --- a/browser/components/newtab/prerendered/locales/id/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/id/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/id/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/id/activity-stream-prerendered-noscripts.html index ac967ddcf213..97f3ff861c2e 100644 --- a/browser/components/newtab/prerendered/locales/id/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/id/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                  Situs Teratas

                                                                                                                                                                                                                                                                                                                                                                                  Disarankan oleh Pocket

                                                                                                                                                                                                                                                                                                                                                                                    Sorotan

                                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/id/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/id/activity-stream-prerendered.html index 56549ac1b436..6eb9052fc023 100644 --- a/browser/components/newtab/prerendered/locales/id/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/id/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                      Situs Teratas

                                                                                                                                                                                                                                                                                                                                                                                      Disarankan oleh Pocket

                                                                                                                                                                                                                                                                                                                                                                                        Sorotan

                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/id/activity-stream.html b/browser/components/newtab/prerendered/locales/id/activity-stream.html index cdd242aeb1ac..9257998c87e4 100644 --- a/browser/components/newtab/prerendered/locales/id/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/id/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/is/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/is/activity-stream-noscripts.html index 2c8a4c128a2a..8b934f3fc26c 100644 --- a/browser/components/newtab/prerendered/locales/is/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/is/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/is/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/is/activity-stream-prerendered-noscripts.html index 95b40a516714..b52d4b94b371 100644 --- a/browser/components/newtab/prerendered/locales/is/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/is/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                          Efstu vefsvæðin

                                                                                                                                                                                                                                                                                                                                                                                          Með þessu mælir Pocket

                                                                                                                                                                                                                                                                                                                                                                                            Hápunktar

                                                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/is/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/is/activity-stream-prerendered.html index a71708a81397..357658573af4 100644 --- a/browser/components/newtab/prerendered/locales/is/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/is/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                              Efstu vefsvæðin

                                                                                                                                                                                                                                                                                                                                                                                              Með þessu mælir Pocket

                                                                                                                                                                                                                                                                                                                                                                                                Hápunktar

                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/is/activity-stream.html b/browser/components/newtab/prerendered/locales/is/activity-stream.html index 71dee58401db..1c3f9add51d7 100644 --- a/browser/components/newtab/prerendered/locales/is/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/is/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/it/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/it/activity-stream-noscripts.html index 3b2919e271ce..b55bb31ec303 100644 --- a/browser/components/newtab/prerendered/locales/it/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/it/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/it/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/it/activity-stream-prerendered-noscripts.html index 5795ef791e45..47bb9dabaf91 100644 --- a/browser/components/newtab/prerendered/locales/it/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/it/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                  Siti principali

                                                                                                                                                                                                                                                                                                                                                                                                  Consigliati da Pocket

                                                                                                                                                                                                                                                                                                                                                                                                    In evidenza

                                                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/it/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/it/activity-stream-prerendered.html index fe4c712cabab..3891558c25b3 100644 --- a/browser/components/newtab/prerendered/locales/it/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/it/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                      Siti principali

                                                                                                                                                                                                                                                                                                                                                                                                      Consigliati da Pocket

                                                                                                                                                                                                                                                                                                                                                                                                        In evidenza

                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/it/activity-stream.html b/browser/components/newtab/prerendered/locales/it/activity-stream.html index d7e359627b02..3b17545d2cdf 100644 --- a/browser/components/newtab/prerendered/locales/it/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/it/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/ja-JP-mac/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/ja-JP-mac/activity-stream-noscripts.html index 3f390c9a6fa9..ed1d413895b1 100644 --- a/browser/components/newtab/prerendered/locales/ja-JP-mac/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ja-JP-mac/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/ja-JP-mac/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/ja-JP-mac/activity-stream-prerendered-noscripts.html index a7b075af37ea..2941105570d1 100644 --- a/browser/components/newtab/prerendered/locales/ja-JP-mac/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ja-JP-mac/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                          トップサイト

                                                                                                                                                                                                                                                                                                                                                                                                          Pocket のおすすめ

                                                                                                                                                                                                                                                                                                                                                                                                            ハイライト

                                                                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/ja-JP-mac/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/ja-JP-mac/activity-stream-prerendered.html index c1935c60769c..f62107297688 100644 --- a/browser/components/newtab/prerendered/locales/ja-JP-mac/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/ja-JP-mac/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                              トップサイト

                                                                                                                                                                                                                                                                                                                                                                                                              Pocket のおすすめ

                                                                                                                                                                                                                                                                                                                                                                                                                ハイライト

                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/ja-JP-mac/activity-stream.html b/browser/components/newtab/prerendered/locales/ja-JP-mac/activity-stream.html index 575042cc2e22..bf751658f87c 100644 --- a/browser/components/newtab/prerendered/locales/ja-JP-mac/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/ja-JP-mac/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/ja/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/ja/activity-stream-noscripts.html index 98b791341361..44dc3f5a2fe7 100644 --- a/browser/components/newtab/prerendered/locales/ja/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ja/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/ja/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/ja/activity-stream-prerendered-noscripts.html index bc27d02bcf0a..fcbea2ba49ca 100644 --- a/browser/components/newtab/prerendered/locales/ja/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ja/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                  トップサイト

                                                                                                                                                                                                                                                                                                                                                                                                                  Pocket のおすすめ

                                                                                                                                                                                                                                                                                                                                                                                                                    ハイライト

                                                                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/ja/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/ja/activity-stream-prerendered.html index 739b449bf316..18335cae19cc 100644 --- a/browser/components/newtab/prerendered/locales/ja/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/ja/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                      トップサイト

                                                                                                                                                                                                                                                                                                                                                                                                                      Pocket のおすすめ

                                                                                                                                                                                                                                                                                                                                                                                                                        ハイライト

                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/ja/activity-stream.html b/browser/components/newtab/prerendered/locales/ja/activity-stream.html index 999f98832a19..89d53ef87e5d 100644 --- a/browser/components/newtab/prerendered/locales/ja/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/ja/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/ka/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/ka/activity-stream-noscripts.html index 75dab4963c33..b8ddce4bd4ba 100644 --- a/browser/components/newtab/prerendered/locales/ka/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ka/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/ka/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/ka/activity-stream-prerendered-noscripts.html index 5cf8860293e0..b1f6e4a2533f 100644 --- a/browser/components/newtab/prerendered/locales/ka/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ka/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                          რჩეული საიტები

                                                                                                                                                                                                                                                                                                                                                                                                                          Pocket-ის შემოთავაზებული

                                                                                                                                                                                                                                                                                                                                                                                                                            მნიშვნელოვანი

                                                                                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/ka/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/ka/activity-stream-prerendered.html index 07eea5266c47..73eaf7e85446 100644 --- a/browser/components/newtab/prerendered/locales/ka/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/ka/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                              რჩეული საიტები

                                                                                                                                                                                                                                                                                                                                                                                                                              Pocket-ის შემოთავაზებული

                                                                                                                                                                                                                                                                                                                                                                                                                                მნიშვნელოვანი

                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/ka/activity-stream.html b/browser/components/newtab/prerendered/locales/ka/activity-stream.html index bbe5e4726fd0..aa0bbcd23aa6 100644 --- a/browser/components/newtab/prerendered/locales/ka/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/ka/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/kab/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/kab/activity-stream-noscripts.html index 135ac4df147b..46c7809d6b8e 100644 --- a/browser/components/newtab/prerendered/locales/kab/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/kab/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/kab/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/kab/activity-stream-prerendered-noscripts.html index 64d842d5f30b..f6f63cde9ce6 100644 --- a/browser/components/newtab/prerendered/locales/kab/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/kab/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                  Ismal ifazen

                                                                                                                                                                                                                                                                                                                                                                                                                                  Iwelleh-it-id Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                    Asebrureq

                                                                                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/kab/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/kab/activity-stream-prerendered.html index 4a919595e068..740606ba7242 100644 --- a/browser/components/newtab/prerendered/locales/kab/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/kab/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                      Ismal ifazen

                                                                                                                                                                                                                                                                                                                                                                                                                                      Iwelleh-it-id Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                        Asebrureq

                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/kab/activity-stream.html b/browser/components/newtab/prerendered/locales/kab/activity-stream.html index 2d7ee923d395..8ba122f5418e 100644 --- a/browser/components/newtab/prerendered/locales/kab/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/kab/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/kk/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/kk/activity-stream-noscripts.html index b17877b3f8f6..4e8c19d5f8ab 100644 --- a/browser/components/newtab/prerendered/locales/kk/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/kk/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/kk/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/kk/activity-stream-prerendered-noscripts.html index d915e3aee61f..93665970262b 100644 --- a/browser/components/newtab/prerendered/locales/kk/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/kk/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                          Үздік сайттар

                                                                                                                                                                                                                                                                                                                                                                                                                                          Ұсынушы Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                            Ерекше жаңалықтар

                                                                                                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/kk/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/kk/activity-stream-prerendered.html index 6873e4f89005..6e1024ef1d33 100644 --- a/browser/components/newtab/prerendered/locales/kk/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/kk/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                              Үздік сайттар

                                                                                                                                                                                                                                                                                                                                                                                                                                              Ұсынушы Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                Ерекше жаңалықтар

                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/kk/activity-stream.html b/browser/components/newtab/prerendered/locales/kk/activity-stream.html index 790b53dfbd98..f9545681a669 100644 --- a/browser/components/newtab/prerendered/locales/kk/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/kk/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/km/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/km/activity-stream-noscripts.html index 05356c5ac413..0cba3eec25e9 100644 --- a/browser/components/newtab/prerendered/locales/km/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/km/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/km/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/km/activity-stream-prerendered-noscripts.html index 55c279aa0286..08c98ced8928 100644 --- a/browser/components/newtab/prerendered/locales/km/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/km/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                  វិបសាយ​លើ​គេ

                                                                                                                                                                                                                                                                                                                                                                                                                                                  បានណែនាំដោយ Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                    រឿងសំខាន់ៗ

                                                                                                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/km/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/km/activity-stream-prerendered.html index 0f33f12bcbd8..afd56abf1db0 100644 --- a/browser/components/newtab/prerendered/locales/km/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/km/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                      វិបសាយ​លើ​គេ

                                                                                                                                                                                                                                                                                                                                                                                                                                                      បានណែនាំដោយ Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                        រឿងសំខាន់ៗ

                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/km/activity-stream.html b/browser/components/newtab/prerendered/locales/km/activity-stream.html index d1790c975e6c..a2d815842f46 100644 --- a/browser/components/newtab/prerendered/locales/km/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/km/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/kn/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/kn/activity-stream-noscripts.html index ba7c6d2ad6fe..285ee69b1020 100644 --- a/browser/components/newtab/prerendered/locales/kn/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/kn/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/kn/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/kn/activity-stream-prerendered-noscripts.html index ede06f5abdaa..4b3507ed0226 100644 --- a/browser/components/newtab/prerendered/locales/kn/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/kn/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                          ಪ್ರಮುಖ ತಾಣಗಳು

                                                                                                                                                                                                                                                                                                                                                                                                                                                          Pocket ರಿಂದ ಶಿಫಾರಸುಮಾಡುಲಾಗಿದೆ

                                                                                                                                                                                                                                                                                                                                                                                                                                                            ಮುಖ್ಯಾಂಶಗಳು

                                                                                                                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/kn/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/kn/activity-stream-prerendered.html index 4f0cca089a6d..b18a5463969a 100644 --- a/browser/components/newtab/prerendered/locales/kn/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/kn/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                              ಪ್ರಮುಖ ತಾಣಗಳು

                                                                                                                                                                                                                                                                                                                                                                                                                                                              Pocket ರಿಂದ ಶಿಫಾರಸುಮಾಡುಲಾಗಿದೆ

                                                                                                                                                                                                                                                                                                                                                                                                                                                                ಮುಖ್ಯಾಂಶಗಳು

                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/kn/activity-stream.html b/browser/components/newtab/prerendered/locales/kn/activity-stream.html index 55d5c1e399a9..6ca5a18aee27 100644 --- a/browser/components/newtab/prerendered/locales/kn/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/kn/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/ko/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/ko/activity-stream-noscripts.html index 016e3bf42335..ce272f658200 100644 --- a/browser/components/newtab/prerendered/locales/ko/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ko/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/ko/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/ko/activity-stream-prerendered-noscripts.html index f2211cfc03be..6aa63f21a35b 100644 --- a/browser/components/newtab/prerendered/locales/ko/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ko/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                  상위 사이트

                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Pocket 추천

                                                                                                                                                                                                                                                                                                                                                                                                                                                                    하이라이트

                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/ko/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/ko/activity-stream-prerendered.html index 188e09ed056c..3ff2cb5a1992 100644 --- a/browser/components/newtab/prerendered/locales/ko/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/ko/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                      상위 사이트

                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Pocket 추천

                                                                                                                                                                                                                                                                                                                                                                                                                                                                        하이라이트

                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/ko/activity-stream.html b/browser/components/newtab/prerendered/locales/ko/activity-stream.html index 22c51e59f3fd..a9ff181b949c 100644 --- a/browser/components/newtab/prerendered/locales/ko/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/ko/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/lij/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/lij/activity-stream-noscripts.html index 2b136f89f619..e23381e895d4 100644 --- a/browser/components/newtab/prerendered/locales/lij/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/lij/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/lij/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/lij/activity-stream-prerendered-noscripts.html index 5942f5108611..e9a4050c83e5 100644 --- a/browser/components/newtab/prerendered/locales/lij/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/lij/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                          I megio sciti

                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Consegiou da Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                            In evidensa

                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/lij/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/lij/activity-stream-prerendered.html index aad791407e84..af74f8922d17 100644 --- a/browser/components/newtab/prerendered/locales/lij/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/lij/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                              I megio sciti

                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Consegiou da Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                In evidensa

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/lij/activity-stream.html b/browser/components/newtab/prerendered/locales/lij/activity-stream.html index 8d16c365d25c..51c23018a94e 100644 --- a/browser/components/newtab/prerendered/locales/lij/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/lij/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/lo/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/lo/activity-stream-noscripts.html index 73e6bbf089b8..8a4fe3943e70 100644 --- a/browser/components/newtab/prerendered/locales/lo/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/lo/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/lo/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/lo/activity-stream-prerendered-noscripts.html index d737b56e9575..fa2bc9f6d48b 100644 --- a/browser/components/newtab/prerendered/locales/lo/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/lo/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  ເວັບໄຊຕ໌ຍອດນິຍົມ

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  ແນະນຳໂດຍ Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ລາຍການເດັ່ນ

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/lo/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/lo/activity-stream-prerendered.html index d8e62eb1ed8b..bdf199322628 100644 --- a/browser/components/newtab/prerendered/locales/lo/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/lo/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      ເວັບໄຊຕ໌ຍອດນິຍົມ

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      ແນະນຳໂດຍ Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ລາຍການເດັ່ນ

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/lo/activity-stream.html b/browser/components/newtab/prerendered/locales/lo/activity-stream.html index 824de422160e..59dfb805fb25 100644 --- a/browser/components/newtab/prerendered/locales/lo/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/lo/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/lt/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/lt/activity-stream-noscripts.html index 4fabbcf991d6..53ef33c0d0c3 100644 --- a/browser/components/newtab/prerendered/locales/lt/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/lt/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/lt/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/lt/activity-stream-prerendered-noscripts.html index 45dbc4fe5a55..e156c3da92b1 100644 --- a/browser/components/newtab/prerendered/locales/lt/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/lt/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Lankomiausios svetainės

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Rekomendavo „Pocket“

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Akcentai

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/lt/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/lt/activity-stream-prerendered.html index 3be0c7a4f1d7..2a8edd22f4ce 100644 --- a/browser/components/newtab/prerendered/locales/lt/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/lt/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Lankomiausios svetainės

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Rekomendavo „Pocket“

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Akcentai

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/lt/activity-stream.html b/browser/components/newtab/prerendered/locales/lt/activity-stream.html index a42c68e18ae4..9581e964f5ef 100644 --- a/browser/components/newtab/prerendered/locales/lt/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/lt/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/ltg/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/ltg/activity-stream-noscripts.html index 3f1292f9d9ad..64a055c25458 100644 --- a/browser/components/newtab/prerendered/locales/ltg/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ltg/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/ltg/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/ltg/activity-stream-prerendered-noscripts.html index 58aa73dee0c8..0a8e8a3ca516 100644 --- a/browser/components/newtab/prerendered/locales/ltg/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ltg/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Popularōkōs lopys

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Pocket īsaceitōs

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Izraudzeitī

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/ltg/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/ltg/activity-stream-prerendered.html index fae43a048221..0c30579d665d 100644 --- a/browser/components/newtab/prerendered/locales/ltg/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/ltg/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Popularōkōs lopys

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Pocket īsaceitōs

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Izraudzeitī

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/ltg/activity-stream.html b/browser/components/newtab/prerendered/locales/ltg/activity-stream.html index 5c921b52315a..33b96cbd82d5 100644 --- a/browser/components/newtab/prerendered/locales/ltg/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/ltg/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/lv/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/lv/activity-stream-noscripts.html index 9bf9a5d94d3a..cef1245060cd 100644 --- a/browser/components/newtab/prerendered/locales/lv/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/lv/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/lv/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/lv/activity-stream-prerendered-noscripts.html index d2eede1916a4..77d218964466 100644 --- a/browser/components/newtab/prerendered/locales/lv/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/lv/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Populārākās lapas

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Iesaka Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Aktualitātes

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/lv/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/lv/activity-stream-prerendered.html index a0938eb0b47b..4c3f4e83f7c9 100644 --- a/browser/components/newtab/prerendered/locales/lv/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/lv/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Populārākās lapas

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Iesaka Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Aktualitātes

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/lv/activity-stream.html b/browser/components/newtab/prerendered/locales/lv/activity-stream.html index b97e26af6f49..5431527eda6e 100644 --- a/browser/components/newtab/prerendered/locales/lv/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/lv/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/mk/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/mk/activity-stream-noscripts.html index 7279724b887e..47fb230d1853 100644 --- a/browser/components/newtab/prerendered/locales/mk/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/mk/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/mk/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/mk/activity-stream-prerendered-noscripts.html index 5706a66923b9..f0a9b22fd621 100644 --- a/browser/components/newtab/prerendered/locales/mk/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/mk/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Популарни мрежни места

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Препорачано од Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Интереси

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/mk/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/mk/activity-stream-prerendered.html index 7cfe0cb5b916..f7b2d8fe45b7 100644 --- a/browser/components/newtab/prerendered/locales/mk/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/mk/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Популарни мрежни места

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Препорачано од Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Интереси

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/mk/activity-stream.html b/browser/components/newtab/prerendered/locales/mk/activity-stream.html index 430ab800ab88..368f665101e1 100644 --- a/browser/components/newtab/prerendered/locales/mk/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/mk/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/mr/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/mr/activity-stream-noscripts.html index bff3ed98f6ed..21308fa1f7d7 100644 --- a/browser/components/newtab/prerendered/locales/mr/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/mr/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/mr/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/mr/activity-stream-prerendered-noscripts.html index f4400d68a357..30538e01f48b 100644 --- a/browser/components/newtab/prerendered/locales/mr/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/mr/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          खास साईट

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Pocket तर्फे शिफारस

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ठळक

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/mr/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/mr/activity-stream-prerendered.html index 08c4229be2b5..817e6daa04fb 100644 --- a/browser/components/newtab/prerendered/locales/mr/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/mr/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              खास साईट

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Pocket तर्फे शिफारस

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ठळक

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/mr/activity-stream.html b/browser/components/newtab/prerendered/locales/mr/activity-stream.html index f9fed629bf1f..0206bc394a1f 100644 --- a/browser/components/newtab/prerendered/locales/mr/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/mr/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/ms/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/ms/activity-stream-noscripts.html index df3b34f6b944..dad75d34f4a7 100644 --- a/browser/components/newtab/prerendered/locales/ms/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ms/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/ms/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/ms/activity-stream-prerendered-noscripts.html index ee240cbf0160..abefb67c87a8 100644 --- a/browser/components/newtab/prerendered/locales/ms/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ms/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Laman Teratas

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Disyorkan oleh Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Serlahan

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/ms/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/ms/activity-stream-prerendered.html index 56ce5da5df52..e064e22f096a 100644 --- a/browser/components/newtab/prerendered/locales/ms/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/ms/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Laman Teratas

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Disyorkan oleh Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Serlahan

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/ms/activity-stream.html b/browser/components/newtab/prerendered/locales/ms/activity-stream.html index 8205fa728c1e..700f8dd61ede 100644 --- a/browser/components/newtab/prerendered/locales/ms/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/ms/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/my/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/my/activity-stream-noscripts.html index 4baef2b8a7fb..8bdcc51ea01f 100644 --- a/browser/components/newtab/prerendered/locales/my/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/my/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/my/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/my/activity-stream-prerendered-noscripts.html index de68e3af6052..b430666ef61b 100644 --- a/browser/components/newtab/prerendered/locales/my/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/my/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          အများဆုံးသုံးဆိုက်များ

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Pocket က အကြံပြုထားသည်

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ဦးစားပေးအကြောင်းအရာများ

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/my/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/my/activity-stream-prerendered.html index e6a86024443f..1207442b5df4 100644 --- a/browser/components/newtab/prerendered/locales/my/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/my/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              အများဆုံးသုံးဆိုက်များ

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Pocket က အကြံပြုထားသည်

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ဦးစားပေးအကြောင်းအရာများ

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/my/activity-stream.html b/browser/components/newtab/prerendered/locales/my/activity-stream.html index ecd0790deb51..a67fd2eb874c 100644 --- a/browser/components/newtab/prerendered/locales/my/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/my/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/nb-NO/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/nb-NO/activity-stream-noscripts.html index f304cf811e4e..67561b97ef04 100644 --- a/browser/components/newtab/prerendered/locales/nb-NO/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/nb-NO/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/nb-NO/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/nb-NO/activity-stream-prerendered-noscripts.html index f678c37c21ec..fa258fdb4224 100644 --- a/browser/components/newtab/prerendered/locales/nb-NO/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/nb-NO/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Mest besøkte nettsider

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Anbefalt av Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Høydepunkter

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/nb-NO/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/nb-NO/activity-stream-prerendered.html index dced6c320240..d965f12d16bf 100644 --- a/browser/components/newtab/prerendered/locales/nb-NO/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/nb-NO/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Mest besøkte nettsider

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Anbefalt av Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Høydepunkter

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/nb-NO/activity-stream.html b/browser/components/newtab/prerendered/locales/nb-NO/activity-stream.html index ffa78518044a..412d04176cbf 100644 --- a/browser/components/newtab/prerendered/locales/nb-NO/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/nb-NO/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/ne-NP/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/ne-NP/activity-stream-noscripts.html index af56e50b6eab..545e8d4bec55 100644 --- a/browser/components/newtab/prerendered/locales/ne-NP/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ne-NP/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/ne-NP/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/ne-NP/activity-stream-prerendered-noscripts.html index 34833b92105c..ac473c40c8e3 100644 --- a/browser/components/newtab/prerendered/locales/ne-NP/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ne-NP/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          शीर्ष साइटहरु

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Pocket द्वारा सिफारिस गरिएको

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            विशेषताहरू

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/ne-NP/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/ne-NP/activity-stream-prerendered.html index 5ded778d5af6..b14315a8d8a5 100644 --- a/browser/components/newtab/prerendered/locales/ne-NP/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/ne-NP/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              शीर्ष साइटहरु

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Pocket द्वारा सिफारिस गरिएको

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                विशेषताहरू

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/ne-NP/activity-stream.html b/browser/components/newtab/prerendered/locales/ne-NP/activity-stream.html index 7aa8c55ed974..38812d44f625 100644 --- a/browser/components/newtab/prerendered/locales/ne-NP/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/ne-NP/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/nl/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/nl/activity-stream-noscripts.html index 9b7914b8c5cf..18e19838f94d 100644 --- a/browser/components/newtab/prerendered/locales/nl/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/nl/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/nl/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/nl/activity-stream-prerendered-noscripts.html index f29c9133a6ae..d3ac454098a8 100644 --- a/browser/components/newtab/prerendered/locales/nl/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/nl/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Topwebsites

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Aanbevolen door Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Highlights

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/nl/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/nl/activity-stream-prerendered.html index 69f2cd9ffd1f..bfd49cfcc1dd 100644 --- a/browser/components/newtab/prerendered/locales/nl/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/nl/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Topwebsites

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Aanbevolen door Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Highlights

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/nl/activity-stream.html b/browser/components/newtab/prerendered/locales/nl/activity-stream.html index ae1026f06adf..ac92d1e228d8 100644 --- a/browser/components/newtab/prerendered/locales/nl/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/nl/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/nn-NO/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/nn-NO/activity-stream-noscripts.html index c804571699c9..3bc55246fba0 100644 --- a/browser/components/newtab/prerendered/locales/nn-NO/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/nn-NO/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/nn-NO/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/nn-NO/activity-stream-prerendered-noscripts.html index f1870358ffec..7513b980ef44 100644 --- a/browser/components/newtab/prerendered/locales/nn-NO/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/nn-NO/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Mest besøkte nettsider

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Tilrådd av Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Høgdepunkt

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/nn-NO/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/nn-NO/activity-stream-prerendered.html index 02da94534012..cf482a738107 100644 --- a/browser/components/newtab/prerendered/locales/nn-NO/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/nn-NO/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Mest besøkte nettsider

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Tilrådd av Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Høgdepunkt

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/nn-NO/activity-stream.html b/browser/components/newtab/prerendered/locales/nn-NO/activity-stream.html index 8df27c306dbf..d616b6411b45 100644 --- a/browser/components/newtab/prerendered/locales/nn-NO/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/nn-NO/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/oc/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/oc/activity-stream-noscripts.html index fde12f66eb96..4226ca742b09 100644 --- a/browser/components/newtab/prerendered/locales/oc/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/oc/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/oc/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/oc/activity-stream-prerendered-noscripts.html index b02209b5c902..2d59113cadd1 100644 --- a/browser/components/newtab/prerendered/locales/oc/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/oc/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sites favorits

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Recomandat per Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Notables

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/oc/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/oc/activity-stream-prerendered.html index 3cc84358c2e8..28f8c3aa6127 100644 --- a/browser/components/newtab/prerendered/locales/oc/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/oc/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sites favorits

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Recomandat per Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Notables

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/oc/activity-stream.html b/browser/components/newtab/prerendered/locales/oc/activity-stream.html index 0654c88f4fef..64d8e0432c40 100644 --- a/browser/components/newtab/prerendered/locales/oc/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/oc/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/pa-IN/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/pa-IN/activity-stream-noscripts.html index 93ebd0bd9b7f..fcb929c89137 100644 --- a/browser/components/newtab/prerendered/locales/pa-IN/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/pa-IN/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/pa-IN/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/pa-IN/activity-stream-prerendered-noscripts.html index d5ac79fb7c35..41eff75f5033 100644 --- a/browser/components/newtab/prerendered/locales/pa-IN/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/pa-IN/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          ਸਿਖਰਲੀਆਂ ਸਾਈਟਾਂ

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Pocket ਵਲੋਂ ਸਿਫਾਰਸ਼ੀ

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            ਸੁਰਖੀਆਂ

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/pa-IN/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/pa-IN/activity-stream-prerendered.html index 9050c90f4c53..a713aada5a05 100644 --- a/browser/components/newtab/prerendered/locales/pa-IN/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/pa-IN/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              ਸਿਖਰਲੀਆਂ ਸਾਈਟਾਂ

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Pocket ਵਲੋਂ ਸਿਫਾਰਸ਼ੀ

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ਸੁਰਖੀਆਂ

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/pa-IN/activity-stream.html b/browser/components/newtab/prerendered/locales/pa-IN/activity-stream.html index 48353e5ba763..7f6d106e90e0 100644 --- a/browser/components/newtab/prerendered/locales/pa-IN/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/pa-IN/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/pl/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/pl/activity-stream-noscripts.html index ef28c1cc5411..23b8cfc706fe 100644 --- a/browser/components/newtab/prerendered/locales/pl/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/pl/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/pl/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/pl/activity-stream-prerendered-noscripts.html index 17d6301ef42d..3e4239c71ee8 100644 --- a/browser/components/newtab/prerendered/locales/pl/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/pl/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Popularne

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Polecane przez Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Wyróżnione

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/pl/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/pl/activity-stream-prerendered.html index 668d730b7d40..a4b79c4280c7 100644 --- a/browser/components/newtab/prerendered/locales/pl/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/pl/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Popularne

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Polecane przez Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Wyróżnione

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/pl/activity-stream.html b/browser/components/newtab/prerendered/locales/pl/activity-stream.html index 3d0d282f55e7..ac2a2d3068a4 100644 --- a/browser/components/newtab/prerendered/locales/pl/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/pl/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/pt-BR/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/pt-BR/activity-stream-noscripts.html index 2ed03135d9f2..f6395e8f25cc 100644 --- a/browser/components/newtab/prerendered/locales/pt-BR/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/pt-BR/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/pt-BR/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/pt-BR/activity-stream-prerendered-noscripts.html index b1b8a23025cf..72df3c5d8de2 100644 --- a/browser/components/newtab/prerendered/locales/pt-BR/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/pt-BR/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sites preferidos

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Recomendado pelo Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Destaques

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/pt-BR/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/pt-BR/activity-stream-prerendered.html index e99ef5e0537a..f176b1732df5 100644 --- a/browser/components/newtab/prerendered/locales/pt-BR/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/pt-BR/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sites preferidos

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Recomendado pelo Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Destaques

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/pt-BR/activity-stream.html b/browser/components/newtab/prerendered/locales/pt-BR/activity-stream.html index 2cd0b5d7fabb..6aad1a2fd5ea 100644 --- a/browser/components/newtab/prerendered/locales/pt-BR/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/pt-BR/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/pt-PT/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/pt-PT/activity-stream-noscripts.html index 556337056d41..0046bc7c25a0 100644 --- a/browser/components/newtab/prerendered/locales/pt-PT/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/pt-PT/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/pt-PT/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/pt-PT/activity-stream-prerendered-noscripts.html index 72a9db8b77bf..2c43465d4bc4 100644 --- a/browser/components/newtab/prerendered/locales/pt-PT/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/pt-PT/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sites mais visitados

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Recomendado por Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Destaques

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/pt-PT/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/pt-PT/activity-stream-prerendered.html index c8393c0e0e7d..ed1f8dc0101e 100644 --- a/browser/components/newtab/prerendered/locales/pt-PT/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/pt-PT/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sites mais visitados

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Recomendado por Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Destaques

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/pt-PT/activity-stream.html b/browser/components/newtab/prerendered/locales/pt-PT/activity-stream.html index e0ac25d04905..fac53ba113e1 100644 --- a/browser/components/newtab/prerendered/locales/pt-PT/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/pt-PT/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/rm/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/rm/activity-stream-noscripts.html index 2d7b1172b35e..8ccca90bae99 100644 --- a/browser/components/newtab/prerendered/locales/rm/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/rm/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/rm/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/rm/activity-stream-prerendered-noscripts.html index 5aa22cb32436..3342510100cd 100644 --- a/browser/components/newtab/prerendered/locales/rm/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/rm/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Paginas preferidas

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Recumandà da Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Accents

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/rm/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/rm/activity-stream-prerendered.html index 62117aeda595..474678cfb020 100644 --- a/browser/components/newtab/prerendered/locales/rm/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/rm/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Paginas preferidas

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Recumandà da Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Accents

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/rm/activity-stream.html b/browser/components/newtab/prerendered/locales/rm/activity-stream.html index d6baccdda445..34a71cb7b9d4 100644 --- a/browser/components/newtab/prerendered/locales/rm/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/rm/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/ro/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/ro/activity-stream-noscripts.html index a410d4bcffbb..45f1ebb2b5e1 100644 --- a/browser/components/newtab/prerendered/locales/ro/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ro/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/ro/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/ro/activity-stream-prerendered-noscripts.html index c54a1218b6fd..cfef900ff420 100644 --- a/browser/components/newtab/prerendered/locales/ro/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ro/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Site-uri de top

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Recomandat de Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Evidențieri

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/ro/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/ro/activity-stream-prerendered.html index 94a75be2eadd..61bbad585b9a 100644 --- a/browser/components/newtab/prerendered/locales/ro/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/ro/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Site-uri de top

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Recomandat de Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Evidențieri

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/ro/activity-stream.html b/browser/components/newtab/prerendered/locales/ro/activity-stream.html index f84a23df8a8b..c17fb81dee08 100644 --- a/browser/components/newtab/prerendered/locales/ro/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/ro/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/ru/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/ru/activity-stream-noscripts.html index 803b3dee5fc2..dc00a20472ef 100644 --- a/browser/components/newtab/prerendered/locales/ru/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ru/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/ru/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/ru/activity-stream-prerendered-noscripts.html index 131283772103..5cb892246992 100644 --- a/browser/components/newtab/prerendered/locales/ru/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ru/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Топ сайтов

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Рекомендовано Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Избранное

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/ru/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/ru/activity-stream-prerendered.html index 9bf29747149d..d8ce533f6950 100644 --- a/browser/components/newtab/prerendered/locales/ru/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/ru/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Топ сайтов

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Рекомендовано Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Избранное

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/ru/activity-stream.html b/browser/components/newtab/prerendered/locales/ru/activity-stream.html index 6c2c2ffc6f19..2270c3f3a766 100644 --- a/browser/components/newtab/prerendered/locales/ru/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/ru/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/si/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/si/activity-stream-noscripts.html index c886f13ec1a4..de1cf9963df0 100644 --- a/browser/components/newtab/prerendered/locales/si/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/si/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/si/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/si/activity-stream-prerendered-noscripts.html index d91c9ed1ddbe..5561e9cf5504 100644 --- a/browser/components/newtab/prerendered/locales/si/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/si/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  ප්‍රමුඛ අඩවි

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Pocket විසින් නිර්දේශිතයි

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ඉස්මතු කිරීම්

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/si/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/si/activity-stream-prerendered.html index ef16365c429e..80e47cdf3f89 100644 --- a/browser/components/newtab/prerendered/locales/si/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/si/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      ප්‍රමුඛ අඩවි

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Pocket විසින් නිර්දේශිතයි

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ඉස්මතු කිරීම්

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/si/activity-stream.html b/browser/components/newtab/prerendered/locales/si/activity-stream.html index 9478f4303202..608be3ca62a2 100644 --- a/browser/components/newtab/prerendered/locales/si/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/si/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/sk/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/sk/activity-stream-noscripts.html index 7e6a2d96130a..38a742a63d3f 100644 --- a/browser/components/newtab/prerendered/locales/sk/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/sk/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/sk/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/sk/activity-stream-prerendered-noscripts.html index fb1ece6f4df0..c86061a4ea73 100644 --- a/browser/components/newtab/prerendered/locales/sk/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/sk/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Top stránky

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Odporúča Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Vybrané stránky

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/sk/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/sk/activity-stream-prerendered.html index 2ffd55d66a20..c5d2c9941bcc 100644 --- a/browser/components/newtab/prerendered/locales/sk/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/sk/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Top stránky

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Odporúča Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Vybrané stránky

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/sk/activity-stream.html b/browser/components/newtab/prerendered/locales/sk/activity-stream.html index 7305e28ccddc..10c0ce45571b 100644 --- a/browser/components/newtab/prerendered/locales/sk/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/sk/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/sl/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/sl/activity-stream-noscripts.html index 7f04f0baec00..db49f1e91a5f 100644 --- a/browser/components/newtab/prerendered/locales/sl/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/sl/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/sl/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/sl/activity-stream-prerendered-noscripts.html index c63e1335e8d8..a6dd3a8d8d97 100644 --- a/browser/components/newtab/prerendered/locales/sl/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/sl/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Glavne strani

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Priporoča Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Poudarki

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/sl/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/sl/activity-stream-prerendered.html index e14c2d42458f..f87072fa6265 100644 --- a/browser/components/newtab/prerendered/locales/sl/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/sl/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Glavne strani

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Priporoča Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Poudarki

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/sl/activity-stream.html b/browser/components/newtab/prerendered/locales/sl/activity-stream.html index 7c2deaa70ea8..a024349127ce 100644 --- a/browser/components/newtab/prerendered/locales/sl/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/sl/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/sq/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/sq/activity-stream-noscripts.html index afd236156b8f..893e85f354f0 100644 --- a/browser/components/newtab/prerendered/locales/sq/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/sq/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/sq/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/sq/activity-stream-prerendered-noscripts.html index 3021c619da3a..f99a66d3b478 100644 --- a/browser/components/newtab/prerendered/locales/sq/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/sq/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sajte Kryesues

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Rekomanduar nga Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Highlights

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/sq/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/sq/activity-stream-prerendered.html index db475d0e5927..7be215812aa1 100644 --- a/browser/components/newtab/prerendered/locales/sq/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/sq/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sajte Kryesues

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Rekomanduar nga Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Highlights

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/sq/activity-stream.html b/browser/components/newtab/prerendered/locales/sq/activity-stream.html index 0a505a590d0e..5b9c3818e4ad 100644 --- a/browser/components/newtab/prerendered/locales/sq/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/sq/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/sr/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/sr/activity-stream-noscripts.html index 8e7de6951671..2374023514dd 100644 --- a/browser/components/newtab/prerendered/locales/sr/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/sr/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/sr/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/sr/activity-stream-prerendered-noscripts.html index 803888b66939..26161e4a8926 100644 --- a/browser/components/newtab/prerendered/locales/sr/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/sr/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Омиљени сајтови

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Предложио Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Истакнуто

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/sr/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/sr/activity-stream-prerendered.html index 370329f5a45d..0e90c92de546 100644 --- a/browser/components/newtab/prerendered/locales/sr/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/sr/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Омиљени сајтови

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Предложио Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Истакнуто

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/sr/activity-stream.html b/browser/components/newtab/prerendered/locales/sr/activity-stream.html index bd0cb59e3c93..7507c592cccc 100644 --- a/browser/components/newtab/prerendered/locales/sr/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/sr/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/sv-SE/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/sv-SE/activity-stream-noscripts.html index b47a968b569f..c2bcafb34bbf 100644 --- a/browser/components/newtab/prerendered/locales/sv-SE/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/sv-SE/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/sv-SE/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/sv-SE/activity-stream-prerendered-noscripts.html index 10e0f56bc61a..3c01f25fe5fd 100644 --- a/browser/components/newtab/prerendered/locales/sv-SE/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/sv-SE/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Mest besökta

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Rekommenderas av Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Höjdpunkter

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/sv-SE/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/sv-SE/activity-stream-prerendered.html index d892fa17084a..aa04a4d918b1 100644 --- a/browser/components/newtab/prerendered/locales/sv-SE/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/sv-SE/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Mest besökta

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Rekommenderas av Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Höjdpunkter

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/sv-SE/activity-stream.html b/browser/components/newtab/prerendered/locales/sv-SE/activity-stream.html index bdc0d1ac2118..378e7c8a3a0e 100644 --- a/browser/components/newtab/prerendered/locales/sv-SE/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/sv-SE/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/ta/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/ta/activity-stream-noscripts.html index b7c681d7b0d4..d753e433fe07 100644 --- a/browser/components/newtab/prerendered/locales/ta/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ta/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/ta/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/ta/activity-stream-prerendered-noscripts.html index ce80203e8b9f..fc73d6835444 100644 --- a/browser/components/newtab/prerendered/locales/ta/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ta/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  சிறந்த தளங்கள்

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Pocket என்பவரால் பரிந்துரைக்கப்பட்டது

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    மிளிர்ப்புகள்

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/ta/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/ta/activity-stream-prerendered.html index 039b29b40453..b9c0235127a4 100644 --- a/browser/components/newtab/prerendered/locales/ta/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/ta/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      சிறந்த தளங்கள்

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Pocket என்பவரால் பரிந்துரைக்கப்பட்டது

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        மிளிர்ப்புகள்

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/ta/activity-stream.html b/browser/components/newtab/prerendered/locales/ta/activity-stream.html index 6d4096092826..65cce339e265 100644 --- a/browser/components/newtab/prerendered/locales/ta/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/ta/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/te/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/te/activity-stream-noscripts.html index e3caa8f900a8..e62f1eef96cc 100644 --- a/browser/components/newtab/prerendered/locales/te/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/te/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/te/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/te/activity-stream-prerendered-noscripts.html index 005f86296841..6322888d65d8 100644 --- a/browser/components/newtab/prerendered/locales/te/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/te/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          మేటి సైట్లు

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Pocketచే సిఫార్సు చేయబడినది

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            విశేషాలు

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/te/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/te/activity-stream-prerendered.html index 2d6158b8502a..efaae533cc12 100644 --- a/browser/components/newtab/prerendered/locales/te/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/te/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              మేటి సైట్లు

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Pocketచే సిఫార్సు చేయబడినది

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                విశేషాలు

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/te/activity-stream.html b/browser/components/newtab/prerendered/locales/te/activity-stream.html index 779dece6ae54..7c2afb86f0e8 100644 --- a/browser/components/newtab/prerendered/locales/te/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/te/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/th/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/th/activity-stream-noscripts.html index 51ef505412b0..a203228c6b91 100644 --- a/browser/components/newtab/prerendered/locales/th/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/th/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/th/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/th/activity-stream-prerendered-noscripts.html index c65f96147016..eb7612900ccf 100644 --- a/browser/components/newtab/prerendered/locales/th/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/th/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  ไซต์เด่น

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  แนะนำโดย Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    รายการเด่น

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/th/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/th/activity-stream-prerendered.html index 8526c7d331a0..7af620e561aa 100644 --- a/browser/components/newtab/prerendered/locales/th/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/th/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      ไซต์เด่น

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      แนะนำโดย Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        รายการเด่น

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/th/activity-stream.html b/browser/components/newtab/prerendered/locales/th/activity-stream.html index 56a3f5269e9f..81b973f9b15e 100644 --- a/browser/components/newtab/prerendered/locales/th/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/th/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/tl/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/tl/activity-stream-noscripts.html index fdb1b6029b89..2c78cf255449 100644 --- a/browser/components/newtab/prerendered/locales/tl/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/tl/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/tl/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/tl/activity-stream-prerendered-noscripts.html index ff5e1f4fe332..14b952556058 100644 --- a/browser/components/newtab/prerendered/locales/tl/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/tl/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Tuktok na mga Site

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Inirekomenda ni Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Naka-highlight

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/tl/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/tl/activity-stream-prerendered.html index 3355364aff4f..03ace9b607d0 100644 --- a/browser/components/newtab/prerendered/locales/tl/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/tl/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Tuktok na mga Site

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Inirekomenda ni Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Naka-highlight

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/tl/activity-stream.html b/browser/components/newtab/prerendered/locales/tl/activity-stream.html index d0f1764139c6..6fe8a693d390 100644 --- a/browser/components/newtab/prerendered/locales/tl/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/tl/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/tr/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/tr/activity-stream-noscripts.html index c2a7d42d3e7d..8524d014959e 100644 --- a/browser/components/newtab/prerendered/locales/tr/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/tr/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/tr/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/tr/activity-stream-prerendered-noscripts.html index 81aa31835114..5f5419497838 100644 --- a/browser/components/newtab/prerendered/locales/tr/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/tr/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Sık Kullanılan Siteler

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Pocket öneriyor

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Öne Çıkanlar

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/tr/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/tr/activity-stream-prerendered.html index 6eb555bc60a5..25174d030c25 100644 --- a/browser/components/newtab/prerendered/locales/tr/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/tr/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Sık Kullanılan Siteler

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Pocket öneriyor

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Öne Çıkanlar

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/tr/activity-stream.html b/browser/components/newtab/prerendered/locales/tr/activity-stream.html index a69a5b9443e7..310b29df4c1d 100644 --- a/browser/components/newtab/prerendered/locales/tr/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/tr/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/trs/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/trs/activity-stream-noscripts.html index 589c7bab1aa4..8545ac20d1d3 100644 --- a/browser/components/newtab/prerendered/locales/trs/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/trs/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/trs/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/trs/activity-stream-prerendered-noscripts.html index 5efd37a8cafe..eb334b90d183 100644 --- a/browser/components/newtab/prerendered/locales/trs/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/trs/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Hiuj ni'iaj yitïnj rè'

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Sa hua hue'e taj Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Sa ña'an

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/trs/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/trs/activity-stream-prerendered.html index 4edfc9de2231..f6d6645244dc 100644 --- a/browser/components/newtab/prerendered/locales/trs/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/trs/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Hiuj ni'iaj yitïnj rè'

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Sa hua hue'e taj Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Sa ña'an

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/trs/activity-stream.html b/browser/components/newtab/prerendered/locales/trs/activity-stream.html index cc7f494864f6..0b226d48b9fc 100644 --- a/browser/components/newtab/prerendered/locales/trs/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/trs/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/uk/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/uk/activity-stream-noscripts.html index 2f7e1aa36f16..10dc9908e8b4 100644 --- a/browser/components/newtab/prerendered/locales/uk/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/uk/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/uk/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/uk/activity-stream-prerendered-noscripts.html index 742512c5fdb8..459f258389c1 100644 --- a/browser/components/newtab/prerendered/locales/uk/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/uk/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Популярні сайти

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Рекомендовано Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Обране

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/uk/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/uk/activity-stream-prerendered.html index 6896c14dcd4f..5ba6de0e4751 100644 --- a/browser/components/newtab/prerendered/locales/uk/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/uk/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Популярні сайти

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Рекомендовано Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Обране

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/uk/activity-stream.html b/browser/components/newtab/prerendered/locales/uk/activity-stream.html index c68aab276fcc..08fc55099954 100644 --- a/browser/components/newtab/prerendered/locales/uk/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/uk/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/ur/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/ur/activity-stream-noscripts.html index e8960206ef80..9584282ac00f 100644 --- a/browser/components/newtab/prerendered/locales/ur/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ur/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/ur/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/ur/activity-stream-prerendered-noscripts.html index d53bdcbd6614..4f8a02fe8dfd 100644 --- a/browser/components/newtab/prerendered/locales/ur/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/ur/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          بہترین سائٹیں

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Pocket کی جانب سے تجویز کردہ

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            شہ سرخياں

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/ur/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/ur/activity-stream-prerendered.html index b159941824b8..07a60dd77a7c 100644 --- a/browser/components/newtab/prerendered/locales/ur/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/ur/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              بہترین سائٹیں

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Pocket کی جانب سے تجویز کردہ

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                شہ سرخياں

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/ur/activity-stream.html b/browser/components/newtab/prerendered/locales/ur/activity-stream.html index 72838afb70bf..ce3597d50ad0 100644 --- a/browser/components/newtab/prerendered/locales/ur/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/ur/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/uz/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/uz/activity-stream-noscripts.html index 90af616896a2..f52007bdc078 100644 --- a/browser/components/newtab/prerendered/locales/uz/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/uz/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/uz/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/uz/activity-stream-prerendered-noscripts.html index e0a318e0c660..f98bab4bf70d 100644 --- a/browser/components/newtab/prerendered/locales/uz/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/uz/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Ommabop saytlar

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Pocket tomonidan tavsiya qilingan

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Saralangan saytlar

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/uz/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/uz/activity-stream-prerendered.html index 2130216b772d..48a04171250b 100644 --- a/browser/components/newtab/prerendered/locales/uz/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/uz/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Ommabop saytlar

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Pocket tomonidan tavsiya qilingan

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        Saralangan saytlar

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/uz/activity-stream.html b/browser/components/newtab/prerendered/locales/uz/activity-stream.html index 99e9099efae7..9360252a974e 100644 --- a/browser/components/newtab/prerendered/locales/uz/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/uz/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/vi/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/vi/activity-stream-noscripts.html index 04511437c75f..94993f4ea1b8 100644 --- a/browser/components/newtab/prerendered/locales/vi/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/vi/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/vi/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/vi/activity-stream-prerendered-noscripts.html index c8eaf9cc2502..676fb79dd6cc 100644 --- a/browser/components/newtab/prerendered/locales/vi/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/vi/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Trang web hàng đầu

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Được đề xuất bởi Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            Nổi bật

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/vi/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/vi/activity-stream-prerendered.html index 4292df2c4d0b..33f287a4102f 100644 --- a/browser/components/newtab/prerendered/locales/vi/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/vi/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Trang web hàng đầu

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Được đề xuất bởi Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                Nổi bật

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/vi/activity-stream.html b/browser/components/newtab/prerendered/locales/vi/activity-stream.html index 3a2f64e0362b..1f9185176c41 100644 --- a/browser/components/newtab/prerendered/locales/vi/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/vi/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/zh-CN/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/zh-CN/activity-stream-noscripts.html index 944fb8bcbfb0..dbe6eeb9eaae 100644 --- a/browser/components/newtab/prerendered/locales/zh-CN/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/zh-CN/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/zh-CN/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/zh-CN/activity-stream-prerendered-noscripts.html index b03aed8f38f1..0c29d13fdcf0 100644 --- a/browser/components/newtab/prerendered/locales/zh-CN/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/zh-CN/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  常用网站

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Pocket 推荐

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    集锦

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/prerendered/locales/zh-CN/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/zh-CN/activity-stream-prerendered.html index 772837f86570..2d6158952296 100644 --- a/browser/components/newtab/prerendered/locales/zh-CN/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/zh-CN/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      常用网站

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      Pocket 推荐

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        集锦

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/zh-CN/activity-stream.html b/browser/components/newtab/prerendered/locales/zh-CN/activity-stream.html index f8fbff7f1e75..f2d907fc5d12 100644 --- a/browser/components/newtab/prerendered/locales/zh-CN/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/zh-CN/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/zh-TW/activity-stream-noscripts.html b/browser/components/newtab/prerendered/locales/zh-TW/activity-stream-noscripts.html index 41f02564fd8c..cfa1cb122363 100644 --- a/browser/components/newtab/prerendered/locales/zh-TW/activity-stream-noscripts.html +++ b/browser/components/newtab/prerendered/locales/zh-TW/activity-stream-noscripts.html @@ -9,7 +9,8 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          - + diff --git a/browser/components/newtab/prerendered/locales/zh-TW/activity-stream-prerendered-noscripts.html b/browser/components/newtab/prerendered/locales/zh-TW/activity-stream-prerendered-noscripts.html index 2e86c630eff5..9a6ae6f94ec8 100644 --- a/browser/components/newtab/prerendered/locales/zh-TW/activity-stream-prerendered-noscripts.html +++ b/browser/components/newtab/prerendered/locales/zh-TW/activity-stream-prerendered-noscripts.html @@ -9,7 +9,8 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          熱門網站

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          Pocket 推薦

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            精選網站

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              - + diff --git a/browser/components/newtab/prerendered/locales/zh-TW/activity-stream-prerendered.html b/browser/components/newtab/prerendered/locales/zh-TW/activity-stream-prerendered.html index 93365ee35696..0bbe75d80412 100644 --- a/browser/components/newtab/prerendered/locales/zh-TW/activity-stream-prerendered.html +++ b/browser/components/newtab/prerendered/locales/zh-TW/activity-stream-prerendered.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              熱門網站

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Pocket 推薦

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                精選網站

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/locales/zh-TW/activity-stream.html b/browser/components/newtab/prerendered/locales/zh-TW/activity-stream.html index 410697cedefe..631d4b7966bf 100644 --- a/browser/components/newtab/prerendered/locales/zh-TW/activity-stream.html +++ b/browser/components/newtab/prerendered/locales/zh-TW/activity-stream.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/static/activity-stream-debug.html b/browser/components/newtab/prerendered/static/activity-stream-debug.html index 7eb7235e9dfe..ef1283694915 100644 --- a/browser/components/newtab/prerendered/static/activity-stream-debug.html +++ b/browser/components/newtab/prerendered/static/activity-stream-debug.html @@ -9,8 +9,9 @@ +
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  - + diff --git a/browser/components/newtab/prerendered/static/activity-stream-prerendered-debug.html b/browser/components/newtab/prerendered/static/activity-stream-prerendered-debug.html index 5a6218a931aa..449d8bd5a4b2 100644 --- a/browser/components/newtab/prerendered/static/activity-stream-prerendered-debug.html +++ b/browser/components/newtab/prerendered/static/activity-stream-prerendered-debug.html @@ -9,8 +9,9 @@ +

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Top Sites

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  Recommended by Pocket

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    Highlights

                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      - + diff --git a/browser/components/newtab/test/schemas/pings.js b/browser/components/newtab/test/schemas/pings.js index 6a2d74847dbc..1e65750f82a6 100644 --- a/browser/components/newtab/test/schemas/pings.js +++ b/browser/components/newtab/test/schemas/pings.js @@ -139,6 +139,20 @@ export const ImpressionStatsPing = Joi.object().keys(Object.assign({}, baseKeys, pocket: Joi.number().integer(), })); +export const SpocsFillEntrySchema = Joi.object().keys({ + id: Joi.number().integer().required(), + displayed: Joi.number().integer().required(), + reason: Joi.string().required(), + full_recalc: Joi.number().integer().required(), +}); + +export const SpocsFillPing = Joi.object().keys(Object.assign({}, baseKeys, { + impression_id: Joi.string().required(), + client_id: Joi.valid("n/a").required(), + session_id: Joi.valid("n/a").required(), + spoc_fills: Joi.array().items(SpocsFillEntrySchema).required(), +})); + export const PerfPing = Joi.object().keys(Object.assign({}, baseKeys, { source: Joi.string(), event: Joi.string().required(), diff --git a/browser/components/newtab/test/unit/asrouter/ASRouter.test.js b/browser/components/newtab/test/unit/asrouter/ASRouter.test.js index bb68bbfd5b61..cf8dc6e61ce9 100644 --- a/browser/components/newtab/test/unit/asrouter/ASRouter.test.js +++ b/browser/components/newtab/test/unit/asrouter/ASRouter.test.js @@ -872,6 +872,26 @@ describe("ASRouter", () => { }); }); + describe(".includeBundle", () => { + it("should send a message with .includeBundle property with specified length and template", async () => { + let messages = [ + {id: "trailhead", template: "trailhead", includeBundle: {length: 2, template: "foo", trigger: {id: "foo"}}, trigger: {id: "firstRun"}, content: {}}, + {id: "foo2", template: "foo", bundled: 2, trigger: {id: "foo"}, content: {title: "Foo2", body: "Foo123-2"}}, + {id: "foo3", template: "foo", bundled: 2, trigger: {id: "foo"}, content: {title: "Foo3", body: "Foo123-3"}}, + ]; + sandbox.stub(Router, "_findProvider").returns(null); + await Router.setState({messages}); + + const msg = fakeAsyncMessage({type: "TRIGGER", data: {trigger: {id: "firstRun"}}}); + await Router.onMessage(msg); + + const [, resp] = msg.target.sendAsyncMessage.firstCall.args; + assert.propertyVal(resp, "type", "SET_MESSAGE"); + assert.isArray(resp.data.bundle, "resp.data.bundle"); + assert.lengthOf(resp.data.bundle, 2, "resp.data.bundle"); + }); + }); + describe("#onMessage: OVERRIDE_MESSAGE", () => { it("should broadcast a SET_MESSAGE message to all clients with a particular id", async () => { const [testMessage] = Router.state.messages; diff --git a/browser/components/newtab/test/unit/asrouter/ASRouterTargeting.test.js b/browser/components/newtab/test/unit/asrouter/ASRouterTargeting.test.js index 934e34028495..7203098d47b0 100644 --- a/browser/components/newtab/test/unit/asrouter/ASRouterTargeting.test.js +++ b/browser/components/newtab/test/unit/asrouter/ASRouterTargeting.test.js @@ -57,9 +57,10 @@ describe("#CachedTargetingGetter", () => { const context = {attributionData: {campaign: "non-fx-button", source: "addons.mozilla.org"}}; await ASRouterTargeting.findMatchingMessage({messages, trigger: {id: "firstRun"}, context}); - assert.calledTwice(stub); - assert.equal(stub.firstCall.args[0].id, "RETURN_TO_AMO_1"); - assert.equal(stub.secondCall.args[0].id, "FXA_1"); + assert.equal(stub.callCount, 6); + const calls = stub.getCalls().map(call => call.args[0]); + const lastCall = calls[calls.length - 1]; + assert.equal(lastCall.id, "FXA_1"); }); it("should return FxA message (is fallback)", async () => { const messages = (await OnboardingMessageProvider.getUntranslatedMessages()) diff --git a/browser/components/newtab/test/unit/asrouter/ModalOverlay.test.jsx b/browser/components/newtab/test/unit/asrouter/ModalOverlay.test.jsx new file mode 100644 index 000000000000..547f5543c05c --- /dev/null +++ b/browser/components/newtab/test/unit/asrouter/ModalOverlay.test.jsx @@ -0,0 +1,54 @@ +import {ModalOverlayWrapper} from "content-src/asrouter/components/ModalOverlay/ModalOverlay"; +import {mount} from "enzyme"; +import React from "react"; + +describe("ModalOverlayWrapper", () => { + let fakeDoc; + let sandbox; + beforeEach(() => { + sandbox = sinon.createSandbox(); + fakeDoc = { + addEventListener: sandbox.stub(), + removeEventListener: sandbox.stub(), + body: {classList: {add: sandbox.stub(), remove: sandbox.stub()}}, + }; + }); + afterEach(() => { + sandbox.restore(); + }); + it("should add eventListener and a class on mount", async () => { + mount(); + assert.calledOnce(fakeDoc.addEventListener); + assert.calledWith(fakeDoc.body.classList.add, "modal-open"); + }); + + it("should remove eventListener on unmount", async () => { + const wrapper = mount(); + wrapper.unmount(); + assert.calledOnce(fakeDoc.addEventListener); + assert.calledOnce(fakeDoc.removeEventListener); + assert.calledWith(fakeDoc.body.classList.remove, "modal-open"); + }); + + it("should call props.onClose on an Escape key", async () => { + const onClose = sandbox.stub(); + mount(); + + // Simulate onkeydown being called + const [, callback] = fakeDoc.addEventListener.firstCall.args; + callback({key: "Escape"}); + + assert.calledOnce(onClose); + }); + + it("should not call props.onClose on other keys than Escape", async () => { + const onClose = sandbox.stub(); + mount(); + + // Simulate onkeydown being called + const [, callback] = fakeDoc.addEventListener.firstCall.args; + callback({key: "Ctrl"}); + + assert.notCalled(onClose); + }); +}); diff --git a/browser/components/newtab/test/unit/asrouter/asrouter-content.test.jsx b/browser/components/newtab/test/unit/asrouter/asrouter-content.test.jsx index 665be9c69672..0948bf81a17b 100644 --- a/browser/components/newtab/test/unit/asrouter/asrouter-content.test.jsx +++ b/browser/components/newtab/test/unit/asrouter/asrouter-content.test.jsx @@ -3,14 +3,17 @@ import {OUTGOING_MESSAGE_NAME as AS_GENERAL_OUTGOING_MESSAGE_NAME} from "content import {FAKE_LOCAL_MESSAGES} from "./constants"; import {GlobalOverrider} from "test/unit/utils"; import {mount} from "enzyme"; +import {OnboardingMessageProvider} from "lib/OnboardingMessageProvider.jsm"; import React from "react"; +import {Trailhead} from "../../../content-src/asrouter/templates/Trailhead/Trailhead"; + let [FAKE_MESSAGE] = FAKE_LOCAL_MESSAGES; const FAKE_NEWSLETTER_SNIPPET = FAKE_LOCAL_MESSAGES.find(msg => msg.id === "newsletter"); const FAKE_FXA_SNIPPET = FAKE_LOCAL_MESSAGES.find(msg => msg.id === "fxa"); const FAKE_BELOW_SEARCH_SNIPPET = FAKE_LOCAL_MESSAGES.find(msg => msg.id === "belowsearch"); FAKE_MESSAGE = Object.assign({}, FAKE_MESSAGE, {provider: "fakeprovider"}); -const FAKE_BUNDLED_MESSAGE = {bundle: [{id: "foo", template: "onboarding", content: {title: "Foo", primary_button: {}, body: "Foo123"}}], extraTemplateStrings: {}, template: "onboarding"}; +const FAKE_BUNDLED_MESSAGE = {bundle: [{id: "foo", template: "onboarding", content: {title: "Foo", primary_button: {label: "Bar"}, text: "Foo123"}}], extraTemplateStrings: {}, template: "onboarding"}; describe("ASRouterUtils", () => { let global; @@ -41,12 +44,14 @@ describe("ASRouterUISurface", () => { let wrapper; let global; let sandbox; - let portalContainer; + let headerPortal; + let footerPortal; let fakeDocument; beforeEach(() => { sandbox = sinon.createSandbox(); - portalContainer = document.createElement("div"); + headerPortal = document.createElement("div"); + footerPortal = document.createElement("div"); fakeDocument = { location: {href: ""}, _listeners: new Set(), @@ -67,8 +72,8 @@ describe("ASRouterUISurface", () => { removeEventListener(event, listener) { this._listeners.delete(listener); }, - getElementById() { - return portalContainer; + getElementById(id) { + return id === "header-asrouter-container" ? headerPortal : footerPortal; }, }; global = new GlobalOverrider(); @@ -122,14 +127,23 @@ describe("ASRouterUISurface", () => { assert.isFalse(wrapper.find(".snippets-preview-banner").exists()); }); - it("should render a SimpleSnippet in the portal", () => { + it("should render a SimpleSnippet in the footer portal", () => { wrapper.setState({message: FAKE_MESSAGE}); - assert.isTrue(portalContainer.childElementCount > 0); + assert.isTrue(footerPortal.childElementCount > 0); + assert.equal(headerPortal.childElementCount, 0); }); - it("should not render a SimpleBelowSearchSnippet in the portal", () => { + it("should not render a SimpleBelowSearchSnippet in a portal", () => { wrapper.setState({message: FAKE_BELOW_SEARCH_SNIPPET}); - assert.equal(portalContainer.childElementCount, 0); + assert.equal(headerPortal.childElementCount, 0); + assert.equal(footerPortal.childElementCount, 0); + }); + + it("should render a trailhead message in the header portal", async () => { + const message = (await OnboardingMessageProvider.getUntranslatedMessages()).find(msg => msg.template === "trailhead"); + wrapper.setState({message}); + assert.isTrue(headerPortal.childElementCount > 0); + assert.equal(footerPortal.childElementCount, 0); }); it("should dispatch an event to select the correct theme", () => { @@ -162,6 +176,14 @@ describe("ASRouterUISurface", () => { }); }); + describe("trailhead", () => { + it("should render trailhead if a trailhead message is received", async () => { + const message = (await OnboardingMessageProvider.getUntranslatedMessages()).find(msg => msg.template === "trailhead"); + wrapper.setState({message}); + assert.lengthOf(wrapper.find(Trailhead), 1); + }); + }); + describe("impressions", () => { function simulateVisibilityChange(value) { fakeDocument.visibilityState = value; diff --git a/browser/components/newtab/test/unit/asrouter/templates/OnboardingMessage.test.jsx b/browser/components/newtab/test/unit/asrouter/templates/OnboardingMessage.test.jsx index 62e2641852c5..a5d6d314d212 100644 --- a/browser/components/newtab/test/unit/asrouter/templates/OnboardingMessage.test.jsx +++ b/browser/components/newtab/test/unit/asrouter/templates/OnboardingMessage.test.jsx @@ -47,7 +47,7 @@ describe("OnboardingMessage", () => { it("should validate all messages from OnboardingMessageProvider", async () => { const messages = await OnboardingMessageProvider.getUntranslatedMessages(); // FXA_1 doesn't have content - so filter it out - messages.filter(msg => msg.content).forEach(msg => assert.jsonSchema(msg.content, schema)); + messages.filter(msg => msg.template in ["onboarding", "return_to_amo_overlay"]).forEach(msg => assert.jsonSchema(msg.content, schema)); }); it("should decode the content field (double decoding)", async () => { const fakeContent = "foo%2540bar.org"; diff --git a/browser/components/newtab/test/unit/asrouter/templates/Trailhead.test.jsx b/browser/components/newtab/test/unit/asrouter/templates/Trailhead.test.jsx new file mode 100644 index 000000000000..84f8843a9019 --- /dev/null +++ b/browser/components/newtab/test/unit/asrouter/templates/Trailhead.test.jsx @@ -0,0 +1,45 @@ +import {actionCreators as ac, actionTypes as at} from "common/Actions.jsm"; +import {mount} from "enzyme"; +import {OnboardingMessageProvider} from "lib/OnboardingMessageProvider.jsm"; +import React from "react"; +import {Trailhead} from "content-src/asrouter/templates/Trailhead/Trailhead"; + +describe("", () => { + let wrapper; + let dispatch; + let sandbox; + + beforeEach(async () => { + sandbox = sinon.sandbox.create(); + dispatch = sandbox.stub(); + sandbox.stub(global, "fetch") + .resolves({ok: true, status: 200, json: () => Promise.resolve({flowId: 123, flowBeginTime: 456})}); + + const message = (await OnboardingMessageProvider.getUntranslatedMessages()).find(msg => msg.template === "trailhead"); + wrapper = mount(); + }); + + afterEach(() => { + sandbox.restore(); + }); + + it("should emit UserEvent SKIPPED_SIGNIN when you click the start browsing button", () => { + let skipButton = wrapper.find(".trailheadStart"); + assert.ok(skipButton.exists()); + skipButton.simulate("click"); + + assert.calledOnce(dispatch); + assert.isUserEventAction(dispatch.firstCall.args[0]); + assert.calledWith(dispatch, ac.UserEvent({event: at.SKIPPED_SIGNIN, value: {has_flow_params: false}})); + }); + + it("should emit UserEvent SUBMIT_EMAIL when you submit the form", () => { + let form = wrapper.find("form"); + assert.ok(form.exists()); + form.simulate("submit"); + + assert.calledOnce(dispatch); + assert.isUserEventAction(dispatch.firstCall.args[0]); + assert.calledWith(dispatch, ac.UserEvent({event: at.SUBMIT_EMAIL, value: {has_flow_params: false}})); + }); +}); diff --git a/browser/components/newtab/test/unit/common/Reducers.test.js b/browser/components/newtab/test/unit/common/Reducers.test.js index 1a4b9dbef418..5838a8680ec1 100644 --- a/browser/components/newtab/test/unit/common/Reducers.test.js +++ b/browser/components/newtab/test/unit/common/Reducers.test.js @@ -719,17 +719,17 @@ describe("Reducers", () => { const state = DiscoveryStream(undefined, {type: at.DISCOVERY_STREAM_SPOCS_UPDATE, data}); assert.deepEqual(state.spocs, INITIAL_STATE.DiscoveryStream.spocs); }); - it("should not update state for empty action.data on PLACES_LINK_BLOCKED", () => { - const newState = DiscoveryStream(undefined, {type: at.PLACES_LINK_BLOCKED}); + it("should not update state for empty action.data on DISCOVERY_STREAM_LINK_BLOCKED", () => { + const newState = DiscoveryStream(undefined, {type: at.DISCOVERY_STREAM_LINK_BLOCKED}); assert.equal(newState, INITIAL_STATE.DiscoveryStream); }); it("should not update state if feeds are not loaded", () => { - const deleteAction = {type: at.PLACES_LINK_BLOCKED, data: {url: "foo.com"}}; + const deleteAction = {type: at.DISCOVERY_STREAM_LINK_BLOCKED, data: {url: "foo.com"}}; const newState = DiscoveryStream(undefined, deleteAction); assert.equal(newState, INITIAL_STATE.DiscoveryStream); }); it("should not update state if spocs and feeds data is undefined", () => { - const deleteAction = {type: at.PLACES_LINK_BLOCKED, data: {url: "foo.com"}}; + const deleteAction = {type: at.DISCOVERY_STREAM_LINK_BLOCKED, data: {url: "foo.com"}}; const oldState = { spocs: { data: {}, @@ -743,8 +743,8 @@ describe("Reducers", () => { const newState = DiscoveryStream(oldState, deleteAction); assert.deepEqual(newState, oldState); }); - it("should remove the site on PLACES_LINK_BLOCKED from spocs if feeds data is empty", () => { - const deleteAction = {type: at.PLACES_LINK_BLOCKED, data: {url: "https://foo.com"}}; + it("should remove the site on DISCOVERY_STREAM_LINK_BLOCKED from spocs if feeds data is empty", () => { + const deleteAction = {type: at.DISCOVERY_STREAM_LINK_BLOCKED, data: {url: "https://foo.com"}}; const oldState = { spocs: { data: { @@ -763,8 +763,8 @@ describe("Reducers", () => { const newState = DiscoveryStream(oldState, deleteAction); assert.deepEqual(newState.spocs.data.spocs, [{url: "test-spoc.com"}]); }); - it("should remove the site on PLACES_LINK_BLOCKED from feeds if spocs data is empty", () => { - const deleteAction = {type: at.PLACES_LINK_BLOCKED, data: {url: "https://foo.com"}}; + it("should remove the site on DISCOVERY_STREAM_LINK_BLOCKED from feeds if spocs data is empty", () => { + const deleteAction = {type: at.DISCOVERY_STREAM_LINK_BLOCKED, data: {url: "https://foo.com"}}; const oldState = { spocs: { data: {}, @@ -787,7 +787,7 @@ describe("Reducers", () => { const newState = DiscoveryStream(oldState, deleteAction); assert.deepEqual(newState.feeds.data["https://foo.com/feed1"].data.recommendations, [{url: "test.com"}]); }); - it("should remove the site on PLACES_LINK_BLOCKED from both feeds and spocs", () => { + it("should remove the site on DISCOVERY_STREAM_LINK_BLOCKED from both feeds and spocs", () => { const oldState = { feeds: { data: { @@ -812,7 +812,7 @@ describe("Reducers", () => { loaded: true, }, }; - const deleteAction = {type: at.PLACES_LINK_BLOCKED, data: {url: "https://foo.com"}}; + const deleteAction = {type: at.DISCOVERY_STREAM_LINK_BLOCKED, data: {url: "https://foo.com"}}; const newState = DiscoveryStream(oldState, deleteAction); assert.deepEqual(newState.spocs.data.spocs, [{url: "test-spoc.com"}]); assert.deepEqual(newState.feeds.data["https://foo.com/feed1"].data.recommendations, [{url: "test.com"}]); diff --git a/browser/components/newtab/test/unit/content-src/lib/selectLayoutRender.test.js b/browser/components/newtab/test/unit/content-src/lib/selectLayoutRender.test.js index 7ddbd333b8bc..a072a2c66584 100644 --- a/browser/components/newtab/test/unit/content-src/lib/selectLayoutRender.test.js +++ b/browser/components/newtab/test/unit/content-src/lib/selectLayoutRender.test.js @@ -21,30 +21,35 @@ describe("selectLayoutRender", () => { }); it("should return an empty array given initial state", () => { - const result = selectLayoutRender(store.getState().DiscoveryStream, {}, []); - assert.deepEqual(result, []); + const {layoutRender} = selectLayoutRender(store.getState().DiscoveryStream, {}, []); + assert.deepEqual(layoutRender, []); + }); + + it("should return an empty SPOCS fill array given initial state", () => { + const {spocsFill} = selectLayoutRender(store.getState().DiscoveryStream, {}, []); + assert.deepEqual(spocsFill, []); }); it("should add .data property from feeds to each compontent in .layout", () => { store.dispatch({type: at.DISCOVERY_STREAM_LAYOUT_UPDATE, data: {layout: FAKE_LAYOUT}}); store.dispatch({type: at.DISCOVERY_STREAM_FEEDS_UPDATE, data: FAKE_FEEDS}); - const result = selectLayoutRender(store.getState().DiscoveryStream, {}, []); + const {layoutRender} = selectLayoutRender(store.getState().DiscoveryStream, {}, []); - assert.lengthOf(result, 1); - assert.propertyVal(result[0], "width", 3); - assert.deepEqual(result[0].components[0], {type: "foo", feed: {url: "foo.com"}, data: {recommendations: ["foo", "bar"]}}); + assert.lengthOf(layoutRender, 1); + assert.propertyVal(layoutRender[0], "width", 3); + assert.deepEqual(layoutRender[0].components[0], {type: "foo", feed: {url: "foo.com"}, data: {recommendations: ["foo", "bar"]}}); }); it("should return layout property without data if feed isn't available", () => { store.dispatch({type: at.DISCOVERY_STREAM_LAYOUT_UPDATE, data: {layout: FAKE_LAYOUT}}); store.dispatch({type: at.DISCOVERY_STREAM_FEEDS_UPDATE, data: {}}); - const result = selectLayoutRender(store.getState().DiscoveryStream, {}, []); + const {layoutRender} = selectLayoutRender(store.getState().DiscoveryStream, {}, []); - assert.lengthOf(result, 1); - assert.propertyVal(result[0], "width", 3); - assert.deepEqual(result[0].components[0], FAKE_LAYOUT[0].components[0]); + assert.lengthOf(layoutRender, 1); + assert.propertyVal(layoutRender[0], "width", 3); + assert.deepEqual(layoutRender[0].components[0], FAKE_LAYOUT[0].components[0]); }); it("should return feed data offset by layout set prop", () => { @@ -52,12 +57,12 @@ describe("selectLayoutRender", () => { store.dispatch({type: at.DISCOVERY_STREAM_LAYOUT_UPDATE, data: {layout: fakeLayout}}); store.dispatch({type: at.DISCOVERY_STREAM_FEEDS_UPDATE, data: FAKE_FEEDS}); - const result = selectLayoutRender(store.getState().DiscoveryStream, {}, []); + const {layoutRender} = selectLayoutRender(store.getState().DiscoveryStream, {}, []); - assert.deepEqual(result[0].components[0].data, {recommendations: ["bar"]}); + assert.deepEqual(layoutRender[0].components[0].data, {recommendations: ["bar"]}); }); - it("should return spoc result for rolls below the probability", () => { + it("should return spoc result and spocs fill for rolls below the probability", () => { const fakeSpocConfig = {positions: [{index: 0}, {index: 1}], probability: 0.5}; const fakeLayout = [{width: 3, components: [{type: "foo", feed: {url: "foo.com"}, spocs: fakeSpocConfig}]}]; const fakeSpocsData = {lastUpdated: 0, spocs: {spocs: ["fooSpoc", "barSpoc"]}}; @@ -67,14 +72,69 @@ describe("selectLayoutRender", () => { store.dispatch({type: at.DISCOVERY_STREAM_SPOCS_UPDATE, data: fakeSpocsData}); const randomStub = globals.sandbox.stub(global.Math, "random").returns(0.1); - const result = selectLayoutRender(store.getState().DiscoveryStream, {}, []); + const {spocsFill, layoutRender} = selectLayoutRender(store.getState().DiscoveryStream, {}, []); assert.calledTwice(randomStub); - assert.lengthOf(result, 1); - assert.deepEqual(result[0].components[0].data.recommendations[0], "fooSpoc"); - assert.deepEqual(result[0].components[0].data.recommendations[1], "barSpoc"); - assert.deepEqual(result[0].components[0].data.recommendations[2], "foo"); - assert.deepEqual(result[0].components[0].data.recommendations[3], "bar"); + assert.lengthOf(layoutRender, 1); + assert.deepEqual(layoutRender[0].components[0].data.recommendations[0], "fooSpoc"); + assert.deepEqual(layoutRender[0].components[0].data.recommendations[1], "barSpoc"); + assert.deepEqual(layoutRender[0].components[0].data.recommendations[2], "foo"); + assert.deepEqual(layoutRender[0].components[0].data.recommendations[3], "bar"); + + assert.deepEqual(spocsFill, [ + {id: undefined, reason: "n/a", displayed: 1, full_recalc: 0}, + {id: undefined, reason: "n/a", displayed: 1, full_recalc: 0}, + ]); + }); + + it("should return spoc result and spocs fill when there are more positions than spocs", () => { + const fakeSpocConfig = {positions: [{index: 0}, {index: 1}, {index: 2}], probability: 0.5}; + const fakeLayout = [{width: 3, components: [{type: "foo", feed: {url: "foo.com"}, spocs: fakeSpocConfig}]}]; + const fakeSpocsData = {lastUpdated: 0, spocs: {spocs: ["fooSpoc", "barSpoc"]}}; + + store.dispatch({type: at.DISCOVERY_STREAM_LAYOUT_UPDATE, data: {layout: fakeLayout}}); + store.dispatch({type: at.DISCOVERY_STREAM_FEEDS_UPDATE, data: FAKE_FEEDS}); + store.dispatch({type: at.DISCOVERY_STREAM_SPOCS_UPDATE, data: fakeSpocsData}); + const randomStub = globals.sandbox.stub(global.Math, "random").returns(0.1); + + const {spocsFill, layoutRender} = selectLayoutRender(store.getState().DiscoveryStream, {}, []); + + assert.calledTwice(randomStub); + assert.lengthOf(layoutRender, 1); + assert.deepEqual(layoutRender[0].components[0].data.recommendations[0], "fooSpoc"); + assert.deepEqual(layoutRender[0].components[0].data.recommendations[1], "barSpoc"); + assert.deepEqual(layoutRender[0].components[0].data.recommendations[2], "foo"); + assert.deepEqual(layoutRender[0].components[0].data.recommendations[3], "bar"); + + assert.deepEqual(spocsFill, [ + {id: undefined, reason: "n/a", displayed: 1, full_recalc: 0}, + {id: undefined, reason: "n/a", displayed: 1, full_recalc: 0}, + ]); + }); + + it("should report non-displayed spocs with reason as probability_selection and out_of_position", () => { + const fakeSpocConfig = {positions: [{index: 0}, {index: 1}, {index: 2}], probability: 0.5}; + const fakeLayout = [{width: 3, components: [{type: "foo", feed: {url: "foo.com"}, spocs: fakeSpocConfig}]}]; + const fakeSpocsData = {lastUpdated: 0, spocs: {spocs: ["fooSpoc", "barSpoc", "lastSpoc"]}}; + + store.dispatch({type: at.DISCOVERY_STREAM_LAYOUT_UPDATE, data: {layout: fakeLayout}}); + store.dispatch({type: at.DISCOVERY_STREAM_FEEDS_UPDATE, data: FAKE_FEEDS}); + store.dispatch({type: at.DISCOVERY_STREAM_SPOCS_UPDATE, data: fakeSpocsData}); + const randomStub = globals.sandbox.stub(global.Math, "random"); + + const {spocsFill, layoutRender} = selectLayoutRender(store.getState().DiscoveryStream, {}, [0.7, 0.3, 0.8]); + + assert.notCalled(randomStub); + assert.lengthOf(layoutRender, 1); + assert.deepEqual(layoutRender[0].components[0].data.recommendations[0], "foo"); + assert.deepEqual(layoutRender[0].components[0].data.recommendations[1], "fooSpoc"); + assert.deepEqual(layoutRender[0].components[0].data.recommendations[2], "bar"); + + assert.deepEqual(spocsFill, [ + {id: undefined, reason: "n/a", displayed: 1, full_recalc: 0}, + {id: undefined, reason: "probability_selection", displayed: 0, full_recalc: 0}, + {id: undefined, reason: "out_of_position", displayed: 0, full_recalc: 0}, + ]); }); it("should not return spoc result for rolls above the probability", () => { @@ -87,12 +147,17 @@ describe("selectLayoutRender", () => { store.dispatch({type: at.DISCOVERY_STREAM_SPOCS_UPDATE, data: fakeSpocsData}); const randomStub = globals.sandbox.stub(global.Math, "random").returns(0.6); - const result = selectLayoutRender(store.getState().DiscoveryStream, {}, []); + const {spocsFill, layoutRender} = selectLayoutRender(store.getState().DiscoveryStream, {}, []); assert.calledTwice(randomStub); - assert.lengthOf(result, 1); - assert.deepEqual(result[0].components[0].data.recommendations[0], "foo"); - assert.deepEqual(result[0].components[0].data.recommendations[1], "bar"); + assert.lengthOf(layoutRender, 1); + assert.deepEqual(layoutRender[0].components[0].data.recommendations[0], "foo"); + assert.deepEqual(layoutRender[0].components[0].data.recommendations[1], "bar"); + + assert.deepEqual(spocsFill, [ + {id: undefined, reason: "probability_selection", displayed: 0, full_recalc: 0}, + {id: undefined, reason: "out_of_position", displayed: 0, full_recalc: 0}, + ]); }); it("Subsequent render should return spoc result for cached rolls below the probability", () => { @@ -105,14 +170,19 @@ describe("selectLayoutRender", () => { store.dispatch({type: at.DISCOVERY_STREAM_SPOCS_UPDATE, data: fakeSpocsData}); const randomStub = globals.sandbox.stub(global.Math, "random"); - const result = selectLayoutRender(store.getState().DiscoveryStream, {}, [0.4, 0.3]); + const {spocsFill, layoutRender} = selectLayoutRender(store.getState().DiscoveryStream, {}, [0.4, 0.3]); assert.notCalled(randomStub); - assert.lengthOf(result, 1); - assert.deepEqual(result[0].components[0].data.recommendations[0], "fooSpoc"); - assert.deepEqual(result[0].components[0].data.recommendations[1], "barSpoc"); - assert.deepEqual(result[0].components[0].data.recommendations[2], "foo"); - assert.deepEqual(result[0].components[0].data.recommendations[3], "bar"); + assert.lengthOf(layoutRender, 1); + assert.deepEqual(layoutRender[0].components[0].data.recommendations[0], "fooSpoc"); + assert.deepEqual(layoutRender[0].components[0].data.recommendations[1], "barSpoc"); + assert.deepEqual(layoutRender[0].components[0].data.recommendations[2], "foo"); + assert.deepEqual(layoutRender[0].components[0].data.recommendations[3], "bar"); + + assert.deepEqual(spocsFill, [ + {id: undefined, reason: "n/a", displayed: 1, full_recalc: 0}, + {id: undefined, reason: "n/a", displayed: 1, full_recalc: 0}, + ]); }); it("Subsequent render should not return spoc result for cached rolls above the probability", () => { @@ -125,12 +195,17 @@ describe("selectLayoutRender", () => { store.dispatch({type: at.DISCOVERY_STREAM_SPOCS_UPDATE, data: fakeSpocsData}); const randomStub = globals.sandbox.stub(global.Math, "random"); - const result = selectLayoutRender(store.getState().DiscoveryStream, {}, [0.6, 0.7]); + const {spocsFill, layoutRender} = selectLayoutRender(store.getState().DiscoveryStream, {}, [0.6, 0.7]); assert.notCalled(randomStub); - assert.lengthOf(result, 1); - assert.deepEqual(result[0].components[0].data.recommendations[0], "foo"); - assert.deepEqual(result[0].components[0].data.recommendations[1], "bar"); + assert.lengthOf(layoutRender, 1); + assert.deepEqual(layoutRender[0].components[0].data.recommendations[0], "foo"); + assert.deepEqual(layoutRender[0].components[0].data.recommendations[1], "bar"); + + assert.deepEqual(spocsFill, [ + {id: undefined, reason: "probability_selection", displayed: 0, full_recalc: 0}, + {id: undefined, reason: "out_of_position", displayed: 0, full_recalc: 0}, + ]); }); it("Subsequent render should return spoc result by cached rolls probability", () => { @@ -143,13 +218,18 @@ describe("selectLayoutRender", () => { store.dispatch({type: at.DISCOVERY_STREAM_SPOCS_UPDATE, data: fakeSpocsData}); const randomStub = globals.sandbox.stub(global.Math, "random"); - const result = selectLayoutRender(store.getState().DiscoveryStream, {}, [0.7, 0.2]); + const {spocsFill, layoutRender} = selectLayoutRender(store.getState().DiscoveryStream, {}, [0.7, 0.2]); assert.notCalled(randomStub); - assert.lengthOf(result, 1); - assert.deepEqual(result[0].components[0].data.recommendations[0], "foo"); - assert.deepEqual(result[0].components[0].data.recommendations[1], "fooSpoc"); - assert.deepEqual(result[0].components[0].data.recommendations[2], "bar"); + assert.lengthOf(layoutRender, 1); + assert.deepEqual(layoutRender[0].components[0].data.recommendations[0], "foo"); + assert.deepEqual(layoutRender[0].components[0].data.recommendations[1], "fooSpoc"); + assert.deepEqual(layoutRender[0].components[0].data.recommendations[2], "bar"); + + assert.deepEqual(spocsFill, [ + {id: undefined, reason: "n/a", displayed: 1, full_recalc: 0}, + {id: undefined, reason: "out_of_position", displayed: 0, full_recalc: 0}, + ]); }); it("should return a layout with feeds of items length with positions", () => { @@ -164,13 +244,15 @@ describe("selectLayoutRender", () => { store.dispatch({type: at.DISCOVERY_STREAM_LAYOUT_UPDATE, data: {layout: fakeLayout}}); store.dispatch({type: at.DISCOVERY_STREAM_FEEDS_UPDATE, data: fakeFeeds}); - const result = selectLayoutRender(store.getState().DiscoveryStream, {}, []); + const {spocsFill, layoutRender} = selectLayoutRender(store.getState().DiscoveryStream, {}, []); - const {recommendations} = result[0].components[0].data; + const {recommendations} = layoutRender[0].components[0].data; assert.equal(recommendations.length, 4); assert.equal(recommendations[0].pos, 0); assert.equal(recommendations[1].pos, 1); assert.equal(recommendations[2].pos, 2); assert.equal(recommendations[3].pos, undefined); + + assert.lengthOf(spocsFill, 0); }); }); diff --git a/browser/components/newtab/test/unit/lib/BookmarkPanelHub.test.js b/browser/components/newtab/test/unit/lib/BookmarkPanelHub.test.js index ecfacaaaa0c1..9e2d5f445a96 100644 --- a/browser/components/newtab/test/unit/lib/BookmarkPanelHub.test.js +++ b/browser/components/newtab/test/unit/lib/BookmarkPanelHub.test.js @@ -239,13 +239,14 @@ describe("BookmarkPanelHub", () => { describe("#_forceShowMessage", () => { it("should call showMessage with the correct args", () => { const msg = {content: "foo"}; + const target = {infoButton: {disabled: false}}; sandbox.stub(instance, "showMessage"); - sandbox.stub(instance, "_response").value({target: "target", win: "win"}); + sandbox.stub(instance, "_response").value({target, win: "win"}); instance._forceShowMessage(msg); assert.calledOnce(instance.showMessage); - assert.calledWithExactly(instance.showMessage, "foo", "target", "win"); + assert.calledWithExactly(instance.showMessage, "foo", target, "win"); }); }); describe("#sendImpression", () => { diff --git a/browser/components/newtab/test/unit/lib/DiscoveryStreamFeed.test.js b/browser/components/newtab/test/unit/lib/DiscoveryStreamFeed.test.js index 6180bc1a9f4a..4a0e4b70ac1c 100644 --- a/browser/components/newtab/test/unit/lib/DiscoveryStreamFeed.test.js +++ b/browser/components/newtab/test/unit/lib/DiscoveryStreamFeed.test.js @@ -384,7 +384,7 @@ describe("DiscoveryStreamFeed", () => { const fakeCache = {}; sandbox.stub(feed.cache, "get").returns(Promise.resolve(fakeCache)); sandbox.stub(feed, "rotate").callsFake(val => val); - sandbox.stub(feed, "scoreItems").callsFake(val => val); + sandbox.stub(feed, "scoreItems").callsFake(val => ({data: val, filtered: []})); sandbox.stub(feed, "fetchFromEndpoint").resolves({ recommendations: "data", settings: { @@ -406,7 +406,7 @@ describe("DiscoveryStreamFeed", () => { }, }); sandbox.stub(feed, "rotate").callsFake(val => val); - sandbox.stub(feed, "scoreItems").callsFake(val => val); + sandbox.stub(feed, "scoreItems").callsFake(val => ({data: val, filtered: []})); clock.tick(THIRTY_MINUTES + 1); const feedResp = await feed.getComponentFeed("foo.com"); @@ -566,41 +566,44 @@ describe("DiscoveryStreamFeed", () => { describe("#transform", () => { it("should return initial data if spocs are empty", () => { - const result = feed.transform({spocs: []}); + const {data: result} = feed.transform({spocs: []}); assert.equal(result.spocs.length, 0); }); it("should sort based on item_score", () => { - const result = feed.transform({ + const {data: result} = feed.transform({ spocs: [ - {campaign_id: 2, item_score: 0.8, min_score: 0.1}, - {campaign_id: 3, item_score: 0.7, min_score: 0.1}, - {campaign_id: 1, item_score: 0.9, min_score: 0.1}, + {id: 2, campaign_id: 2, item_score: 0.8, min_score: 0.1}, + {id: 3, campaign_id: 3, item_score: 0.7, min_score: 0.1}, + {id: 1, campaign_id: 1, item_score: 0.9, min_score: 0.1}, ], }); assert.deepEqual(result.spocs, [ - {campaign_id: 1, item_score: 0.9, score: 0.9, min_score: 0.1}, - {campaign_id: 2, item_score: 0.8, score: 0.8, min_score: 0.1}, - {campaign_id: 3, item_score: 0.7, score: 0.7, min_score: 0.1}, + {id: 1, campaign_id: 1, item_score: 0.9, score: 0.9, min_score: 0.1}, + {id: 2, campaign_id: 2, item_score: 0.8, score: 0.8, min_score: 0.1}, + {id: 3, campaign_id: 3, item_score: 0.7, score: 0.7, min_score: 0.1}, ]); }); it("should remove items with scores lower than min_score", () => { - const result = feed.transform({ + const {data: result, filtered} = feed.transform({ spocs: [ - {campaign_id: 2, item_score: 0.8, min_score: 0.9}, - {campaign_id: 3, item_score: 0.7, min_score: 0.7}, - {campaign_id: 1, item_score: 0.9, min_score: 0.8}, + {id: 2, campaign_id: 2, item_score: 0.8, min_score: 0.9}, + {id: 3, campaign_id: 3, item_score: 0.7, min_score: 0.7}, + {id: 1, campaign_id: 1, item_score: 0.9, min_score: 0.8}, ], }); assert.deepEqual(result.spocs, [ - {campaign_id: 1, item_score: 0.9, score: 0.9, min_score: 0.8}, - {campaign_id: 3, item_score: 0.7, score: 0.7, min_score: 0.7}, + {id: 1, campaign_id: 1, item_score: 0.9, score: 0.9, min_score: 0.8}, + {id: 3, campaign_id: 3, item_score: 0.7, score: 0.7, min_score: 0.7}, ]); + + assert.deepEqual(filtered.below_min_score, + [{id: 2, campaign_id: 2, item_score: 0.8, min_score: 0.9, score: 0.8}]); }); it("should add a score prop to spocs", () => { - const result = feed.transform({ + const {data: result} = feed.transform({ spocs: [ {campaign_id: 1, item_score: 0.9, min_score: 0.1}, ], @@ -609,20 +612,25 @@ describe("DiscoveryStreamFeed", () => { assert.equal(result.spocs[0].score, 0.9); }); it("should filter out duplicate campigns", () => { - const result = feed.transform({ + const {data: result, filtered} = feed.transform({ spocs: [ - {campaign_id: 2, item_score: 0.8, min_score: 0.1}, - {campaign_id: 3, item_score: 0.6, min_score: 0.1}, - {campaign_id: 1, item_score: 0.9, min_score: 0.1}, - {campaign_id: 3, item_score: 0.7, min_score: 0.1}, - {campaign_id: 1, item_score: 0.9, min_score: 0.1}, + {id: 1, campaign_id: 2, item_score: 0.8, min_score: 0.1}, + {id: 2, campaign_id: 3, item_score: 0.6, min_score: 0.1}, + {id: 3, campaign_id: 1, item_score: 0.9, min_score: 0.1}, + {id: 4, campaign_id: 3, item_score: 0.7, min_score: 0.1}, + {id: 5, campaign_id: 1, item_score: 0.9, min_score: 0.1}, ], }); assert.deepEqual(result.spocs, [ - {campaign_id: 1, item_score: 0.9, score: 0.9, min_score: 0.1}, - {campaign_id: 2, item_score: 0.8, score: 0.8, min_score: 0.1}, - {campaign_id: 3, item_score: 0.7, score: 0.7, min_score: 0.1}, + {id: 3, campaign_id: 1, item_score: 0.9, score: 0.9, min_score: 0.1}, + {id: 1, campaign_id: 2, item_score: 0.8, score: 0.8, min_score: 0.1}, + {id: 4, campaign_id: 3, item_score: 0.7, score: 0.7, min_score: 0.1}, + ]); + + assert.deepEqual(filtered.campaign_duplicate, [ + {id: 5, campaign_id: 1, item_score: 0.9, min_score: 0.1, score: 0.9}, + {id: 2, campaign_id: 3, item_score: 0.6, min_score: 0.1, score: 0.6}, ]); }); it("should filter out duplicate campigns while using spocs_per_domain", () => { @@ -632,40 +640,47 @@ describe("DiscoveryStreamFeed", () => { }, }); - const result = feed.transform({ + const {data: result, filtered} = feed.transform({ spocs: [ - {campaign_id: 2, item_score: 0.8, min_score: 0.1}, - {campaign_id: 3, item_score: 0.6, min_score: 0.1}, - {campaign_id: 1, item_score: 0.6, min_score: 0.1}, - {campaign_id: 3, item_score: 0.7, min_score: 0.1}, - {campaign_id: 1, item_score: 0.9, min_score: 0.1}, - {campaign_id: 2, item_score: 0.6, min_score: 0.1}, - {campaign_id: 3, item_score: 0.7, min_score: 0.1}, - {campaign_id: 1, item_score: 0.8, min_score: 0.1}, - {campaign_id: 3, item_score: 0.7, min_score: 0.1}, - {campaign_id: 1, item_score: 0.8, min_score: 0.1}, + {id: 1, campaign_id: 2, item_score: 0.8, min_score: 0.1}, + {id: 2, campaign_id: 3, item_score: 0.6, min_score: 0.1}, + {id: 3, campaign_id: 1, item_score: 0.6, min_score: 0.1}, + {id: 4, campaign_id: 3, item_score: 0.7, min_score: 0.1}, + {id: 5, campaign_id: 1, item_score: 0.9, min_score: 0.1}, + {id: 6, campaign_id: 2, item_score: 0.6, min_score: 0.1}, + {id: 7, campaign_id: 3, item_score: 0.7, min_score: 0.1}, + {id: 8, campaign_id: 1, item_score: 0.8, min_score: 0.1}, + {id: 9, campaign_id: 3, item_score: 0.7, min_score: 0.1}, + {id: 10, campaign_id: 1, item_score: 0.8, min_score: 0.1}, ], }); assert.deepEqual(result.spocs, [ - {campaign_id: 1, item_score: 0.9, score: 0.9, min_score: 0.1}, - {campaign_id: 2, item_score: 0.8, score: 0.8, min_score: 0.1}, - {campaign_id: 1, item_score: 0.8, score: 0.8, min_score: 0.1}, - {campaign_id: 3, item_score: 0.7, score: 0.7, min_score: 0.1}, - {campaign_id: 3, item_score: 0.7, score: 0.7, min_score: 0.1}, - {campaign_id: 2, item_score: 0.6, score: 0.6, min_score: 0.1}, + {id: 5, campaign_id: 1, item_score: 0.9, score: 0.9, min_score: 0.1}, + {id: 1, campaign_id: 2, item_score: 0.8, score: 0.8, min_score: 0.1}, + {id: 8, campaign_id: 1, item_score: 0.8, score: 0.8, min_score: 0.1}, + {id: 4, campaign_id: 3, item_score: 0.7, score: 0.7, min_score: 0.1}, + {id: 7, campaign_id: 3, item_score: 0.7, score: 0.7, min_score: 0.1}, + {id: 6, campaign_id: 2, item_score: 0.6, score: 0.6, min_score: 0.1}, + ]); + + assert.deepEqual(filtered.campaign_duplicate, [ + {id: 10, campaign_id: 1, item_score: 0.8, min_score: 0.1, score: 0.8}, + {id: 9, campaign_id: 3, item_score: 0.7, min_score: 0.1, score: 0.7}, + {id: 2, campaign_id: 3, item_score: 0.6, min_score: 0.1, score: 0.6}, + {id: 3, campaign_id: 1, item_score: 0.6, min_score: 0.1, score: 0.6}, ]); }); }); describe("#filterBlocked", () => { it("should return initial data if spocs are empty", () => { - const result = feed.filterBlocked({spocs: []}); + const {data: result} = feed.filterBlocked({spocs: []}); assert.equal(result.spocs.length, 0); }); it("should return initial spocs data if links are not blocked", () => { - const result = feed.filterBlocked({ + const {data: result} = feed.filterBlocked({ spocs: [ {url: "https://foo.com"}, {url: "test.com"}, @@ -677,19 +692,20 @@ describe("DiscoveryStreamFeed", () => { fakeNewTabUtils.blockedLinks.links = [{url: "https://foo.com"}]; fakeNewTabUtils.blockedLinks.isBlocked = site => (fakeNewTabUtils.blockedLinks.links[0].url === site.url); - const result = feed.filterBlocked({ + const {data: result, filtered} = feed.filterBlocked({ spocs: [ - {url: "https://foo.com"}, - {url: "test.com"}, + {id: 1, url: "https://foo.com"}, + {id: 2, url: "test.com"}, ], }, "spocs"); assert.lengthOf(result.spocs, 1); assert.equal(result.spocs[0].url, "test.com"); assert.notInclude(result.spocs, fakeNewTabUtils.blockedLinks.links[0]); + assert.deepEqual(filtered, [{id: 1, url: "https://foo.com"}]); }); it("should return initial recommendations data if links are not blocked", () => { - const result = feed.filterBlocked({ + const {data: result} = feed.filterBlocked({ recommendations: [ {url: "https://foo.com"}, {url: "test.com"}, @@ -701,7 +717,7 @@ describe("DiscoveryStreamFeed", () => { fakeNewTabUtils.blockedLinks.links = [{url: "https://foo.com"}]; fakeNewTabUtils.blockedLinks.isBlocked = site => (fakeNewTabUtils.blockedLinks.links[0].url === site.url); - const result = feed.filterBlocked({ + const {data: result} = feed.filterBlocked({ recommendations: [ {url: "https://foo.com"}, {url: "test.com"}, @@ -738,6 +754,7 @@ describe("DiscoveryStreamFeed", () => { const fakeSpocs = { spocs: [ { + id: 1, campaign_id: "seen", caps: { lifetime: 3, @@ -748,6 +765,7 @@ describe("DiscoveryStreamFeed", () => { }, }, { + id: 2, campaign_id: "not-seen", caps: { lifetime: 3, @@ -764,10 +782,11 @@ describe("DiscoveryStreamFeed", () => { }; sandbox.stub(feed, "readImpressionsPref").returns(fakeImpressions); - const result = feed.frequencyCapSpocs(fakeSpocs); + const {data: result, filtered} = feed.frequencyCapSpocs(fakeSpocs); assert.equal(result.spocs.length, 1); assert.equal(result.spocs[0].campaign_id, "not-seen"); + assert.deepEqual(filtered, [fakeSpocs.spocs[0]]); }); }); @@ -1007,6 +1026,7 @@ describe("DiscoveryStreamFeed", () => { const data = { spocs: [ { + id: 1, campaign_id: "seen", caps: { lifetime: 3, @@ -1017,6 +1037,7 @@ describe("DiscoveryStreamFeed", () => { }, }, { + id: 2, campaign_id: "not-seen", caps: { lifetime: 3, @@ -1046,6 +1067,7 @@ describe("DiscoveryStreamFeed", () => { const result = { spocs: [ { + id: 2, campaign_id: "not-seen", caps: { lifetime: 3, @@ -1057,6 +1079,13 @@ describe("DiscoveryStreamFeed", () => { }, ], }; + const spocFillResult = [{ + id: 1, + reason: "frequency_cap", + displayed: 0, + full_recalc: 0, + }]; + sandbox.stub(feed, "recordCampaignImpression").returns(); sandbox.stub(feed, "readImpressionsPref").returns(fakeImpressions); sandbox.spy(feed.store, "dispatch"); @@ -1064,6 +1093,7 @@ describe("DiscoveryStreamFeed", () => { await feed.onAction({type: at.DISCOVERY_STREAM_SPOC_IMPRESSION, data: {campaign_id: "seen"}}); assert.deepEqual(feed.store.dispatch.secondCall.args[0].data.spocs, result); + assert.deepEqual(feed.store.dispatch.thirdCall.args[0].data.spoc_fills, spocFillResult); }); it("should not call dispatch to ac.AlsoToPreloaded if spocs were not changed by frequency capping", async () => { Object.defineProperty(feed, "showSpocs", {get: () => true}); @@ -1078,6 +1108,56 @@ describe("DiscoveryStreamFeed", () => { }); }); + describe("#onAction: PLACES_LINK_BLOCKED", () => { + beforeEach(() => { + const data = { + spocs: [ + { + id: 1, + campaign_id: "foo", + url: "foo.com", + }, + { + id: 2, + campaign_id: "bar", + url: "bar.com", + }, + ], + }; + sandbox.stub(feed.store, "getState").returns({ + DiscoveryStream: { + spocs: {data}, + }, + }); + }); + + it("should call dispatch with the SPOCS Fill if found a blocked spoc", async () => { + Object.defineProperty(feed, "showSpocs", {get: () => true}); + const spocFillResult = [{ + id: 1, + reason: "blocked_by_user", + displayed: 0, + full_recalc: 0, + }]; + + sandbox.spy(feed.store, "dispatch"); + + await feed.onAction({type: at.PLACES_LINK_BLOCKED, data: {url: "foo.com"}}); + + assert.deepEqual(feed.store.dispatch.firstCall.args[0].data.spoc_fills, spocFillResult); + assert.deepEqual(feed.store.dispatch.secondCall.args[0].data.url, "foo.com"); + }); + it("should not call dispatch with the SPOCS Fill if the blocked is not a SPOC", async () => { + Object.defineProperty(feed, "showSpocs", {get: () => true}); + sandbox.spy(feed.store, "dispatch"); + + await feed.onAction({type: at.PLACES_LINK_BLOCKED, data: {url: "not_a_spoc.com"}}); + + assert.calledOnce(feed.store.dispatch); + assert.deepEqual(feed.store.dispatch.firstCall.args[0].data.url, "not_a_spoc.com"); + }); + }); + describe("#onAction: INIT", () => { it("should be .loaded=false before initialization", () => { assert.isFalse(feed.loaded); @@ -1653,7 +1733,7 @@ describe("DiscoveryStreamFeed", () => { }); describe("#scoreItems", () => { it("should score items using item_score and min_score", () => { - const result = feed.scoreItems([ + const {data: result, filtered} = feed.scoreItems([ {item_score: 0.8, min_score: 0.1}, {item_score: 0.5, min_score: 0.6}, {item_score: 0.7, min_score: 0.1}, @@ -1664,6 +1744,9 @@ describe("DiscoveryStreamFeed", () => { {item_score: 0.8, score: 0.8, min_score: 0.1}, {item_score: 0.7, score: 0.7, min_score: 0.1}, ]); + assert.deepEqual(filtered, [ + {item_score: 0.5, min_score: 0.6, score: 0.5}, + ]); }); }); @@ -1704,4 +1787,60 @@ describe("DiscoveryStreamFeed", () => { assert.equal(result.min_score, 0); }); }); + + describe("#_sendSpocsFill", () => { + it("should send out all the SPOCS Fill pings", () => { + sandbox.spy(feed.store, "dispatch"); + const expected = [ + {id: 1, reason: "frequency_cap", displayed: 0, full_recalc: 1}, + {id: 2, reason: "frequency_cap", displayed: 0, full_recalc: 1}, + {id: 3, reason: "blocked_by_user", displayed: 0, full_recalc: 1}, + {id: 4, reason: "blocked_by_user", displayed: 0, full_recalc: 1}, + {id: 5, reason: "campaign_duplicate", displayed: 0, full_recalc: 1}, + {id: 6, reason: "campaign_duplicate", displayed: 0, full_recalc: 1}, + {id: 7, reason: "below_min_score", displayed: 0, full_recalc: 1}, + {id: 8, reason: "below_min_score", displayed: 0, full_recalc: 1}, + ]; + const filtered = { + frequency_cap: [{id: 1, campaign_id: 1}, {id: 2, campaign_id: 2}], + blocked_by_user: [{id: 3, campaign_id: 3}, {id: 4, campaign_id: 4}], + campaign_duplicate: [{id: 5, campaign_id: 5}, {id: 6, campaign_id: 6}], + below_min_score: [{id: 7, campaign_id: 7}, {id: 8, campaign_id: 8}], + }; + feed._sendSpocsFill(filtered, true); + + assert.deepEqual(feed.store.dispatch.firstCall.args[0].data.spoc_fills, expected); + }); + it("should send SPOCS Fill ping with the correct full_recalc", () => { + sandbox.spy(feed.store, "dispatch"); + const expected = [ + {id: 1, reason: "frequency_cap", displayed: 0, full_recalc: 0}, + {id: 2, reason: "frequency_cap", displayed: 0, full_recalc: 0}, + ]; + const filtered = { + frequency_cap: [{id: 1, campaign_id: 1}, {id: 2, campaign_id: 2}], + }; + feed._sendSpocsFill(filtered, false); + + assert.deepEqual(feed.store.dispatch.firstCall.args[0].data.spoc_fills, expected); + }); + it("should not send non-SPOCS Fill pings", () => { + sandbox.spy(feed.store, "dispatch"); + const expected = [ + {id: 1, reason: "frequency_cap", displayed: 0, full_recalc: 1}, + {id: 3, reason: "blocked_by_user", displayed: 0, full_recalc: 1}, + {id: 5, reason: "campaign_duplicate", displayed: 0, full_recalc: 1}, + {id: 7, reason: "below_min_score", displayed: 0, full_recalc: 1}, + ]; + const filtered = { + frequency_cap: [{id: 1, campaign_id: 1}, {id: 2}], + blocked_by_user: [{id: 3, campaign_id: 3}, {id: 4}], + campaign_duplicate: [{id: 5, campaign_id: 5}, {id: 6}], + below_min_score: [{id: 7, campaign_id: 7}, {id: 8}], + }; + feed._sendSpocsFill(filtered, true); + + assert.deepEqual(feed.store.dispatch.firstCall.args[0].data.spoc_fills, expected); + }); + }); }); diff --git a/browser/components/newtab/test/unit/lib/TelemetryFeed.test.js b/browser/components/newtab/test/unit/lib/TelemetryFeed.test.js index f3bef380fbbe..4f7b839aadbd 100644 --- a/browser/components/newtab/test/unit/lib/TelemetryFeed.test.js +++ b/browser/components/newtab/test/unit/lib/TelemetryFeed.test.js @@ -6,6 +6,7 @@ import { ImpressionStatsPing, PerfPing, SessionPing, + SpocsFillPing, UndesiredPing, UserEventPing, } from "test/schemas/pings"; @@ -632,6 +633,20 @@ describe("TelemetryFeed", () => { assert.propertyVal(ping, "tiles", tiles); }); }); + describe("#createSpocsFillPing", () => { + it("should create a valid SPOCS Fill ping", async () => { + const spocFills = [ + {id: 10001, displayed: 0, reason: "frequency_cap", full_recalc: 1}, + {id: 10002, displayed: 0, reason: "blocked_by_user", full_recalc: 1}, + {id: 10003, displayed: 1, reason: "n/a", full_recalc: 1}, + ]; + const action = ac.DiscoveryStreamSpocsFill({spoc_fills: spocFills}); + const ping = await instance.createSpocsFillPing(action.data); + + assert.validate(ping, SpocsFillPing); + assert.propertyVal(ping, "spoc_fills", spocFills); + }); + }); describe("#applyCFRPolicy", () => { it("should use client_id and message_id in prerelease", () => { globals.set("UpdateUtils", {getUpdateChannel() { return "nightly"; }}); @@ -1100,6 +1115,21 @@ describe("TelemetryFeed", () => { assert.calledWith(instance.handleDiscoveryStreamLoadedContent, "port123", data); }); + it("should send an event on a DISCOVERY_STREAM_SPOCS_FILL action", () => { + const sendEvent = sandbox.stub(instance, "sendStructuredIngestionEvent"); + const eventCreator = sandbox.stub(instance, "createSpocsFillPing"); + const spocFills = [ + {id: 10001, displayed: 0, reason: "frequency_cap", full_recalc: 1}, + {id: 10002, displayed: 0, reason: "blocked_by_user", full_recalc: 1}, + {id: 10003, displayed: 1, reason: "n/a", full_recalc: 1}, + ]; + const action = ac.DiscoveryStreamSpocsFill({spoc_fills: spocFills}); + + instance.onAction(action); + + assert.calledWith(eventCreator, action.data); + assert.calledWith(sendEvent, eventCreator.returnValue); + }); }); describe("#handlePagePrerendered", () => { it("should not throw if there is no session for the given port ID", () => { diff --git a/browser/components/newtab/yamscripts.yml b/browser/components/newtab/yamscripts.yml index 632b48de4df4..7d0c2cd9293a 100644 --- a/browser/components/newtab/yamscripts.yml +++ b/browser/components/newtab/yamscripts.yml @@ -64,6 +64,7 @@ scripts: # lint: Run eslint and sass-lint lint: eslint: esw --ext=.js,.jsm,.json,.jsx . + jsx-a11y: esw --config=.eslintrc.jsx-a11y.js --ext=.jsx content-src/asrouter/components/ModalOverlay content-src/asrouter/templates/OnboardingMessage content-src/asrouter/templates/Trailhead sasslint: sass-lint -v -q # strings-import: Replace local strings with those from l10n-central diff --git a/browser/modules/PingCentre.jsm b/browser/modules/PingCentre.jsm index 2dfc3e71f1d4..a3204a0a1e83 100644 --- a/browser/modules/PingCentre.jsm +++ b/browser/modules/PingCentre.jsm @@ -163,6 +163,26 @@ class PingCentre { return payload; } + async _createStructuredIngestionPing(data, options) { + let filter = options && options.filter; + let experiments = TelemetryEnvironment.getActiveExperiments(); + let experimentsString = this._createExperimentsString(experiments, filter); + + let clientID = data.client_id || await this.telemetryClientId; + let locale = data.locale || Services.locale.appLocaleAsLangTag; + const payload = Object.assign({ + locale, + client_id: clientID, + version: AppConstants.MOZ_APP_VERSION, + release_channel: UpdateUtils.getUpdateChannel(false), + }, data); + if (experimentsString) { + payload.shield_id = experimentsString; + } + + return payload; + } + async sendPing(data, options) { if (!this.enabled) { return Promise.resolve(); @@ -205,7 +225,11 @@ class PingCentre { return Promise.resolve(); } - const payload = await this._createPing(data, options); + const payload = await this._createStructuredIngestionPing(data, options); + + if (this.logging) { + Services.console.logStringMessage(`TELEMETRY PING (STRUCTURED INGESTION): ${JSON.stringify(payload)}\n`); + } return fetch(endpoint, { method: "POST",