diff --git a/browser/components/newtab/content-src/components/Base/Base.jsx b/browser/components/newtab/content-src/components/Base/Base.jsx
index d554a8943c..bfac8b6edf 100644
--- a/browser/components/newtab/content-src/components/Base/Base.jsx
+++ b/browser/components/newtab/content-src/components/Base/Base.jsx
@@ -156,12 +156,26 @@ export class BaseContent extends React.PureComponent {
return (
+ LOGO HERE
+
+
+
+
+ BANNER HERE
+
+
+
+
{prefs.showSearch &&
-
+
}
diff --git a/browser/components/newtab/css/activity-stream-linux.css b/browser/components/newtab/css/activity-stream-linux.css
index 34bbf49fc7..b124294b4e 100644
--- a/browser/components/newtab/css/activity-stream-linux.css
+++ b/browser/components/newtab/css/activity-stream-linux.css
@@ -253,7 +253,7 @@ body,
body {
background-color: var(--newtab-background-color);
- font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Ubuntu', 'Helvetica Neue', sans-serif;
+ font-family: sans-serif;
font-size: 16px;
overflow-y: scroll; }
@@ -1715,7 +1715,7 @@ main {
width: 1%;
white-space: nowrap; }
.asrouter-admin table.minimal-table td:not(:first-child) {
- font-family: "SF Mono", "Monaco", "Inconsolata", "Fira Mono", "Droid Sans Mono", "Source Code Pro", monospace; }
+ font-family: monospace; }
.asrouter-admin table.errorReporting tr {
border: 1px solid var(--newtab-textbox-background-color); }
.asrouter-admin table.errorReporting td {
@@ -1753,7 +1753,7 @@ main {
.asrouter-admin .message-item.blocked .message-id {
opacity: 0.5; }
.asrouter-admin .message-item .message-id {
- font-family: "SF Mono", "Monaco", "Inconsolata", "Fira Mono", "Droid Sans Mono", "Source Code Pro", monospace;
+ font-family: monospace;
font-size: 12px; }
.asrouter-admin .providerUrl {
font-size: 12px; }
@@ -1764,7 +1764,7 @@ main {
font-size: 12px;
max-width: 750px;
overflow: auto;
- font-family: "SF Mono", "Monaco", "Inconsolata", "Fira Mono", "Droid Sans Mono", "Source Code Pro", monospace; }
+ font-family: monospace; }
.asrouter-admin .errorState {
border: 1px solid #D70022; }
.asrouter-admin .helpLink {
diff --git a/browser/components/newtab/css/activity-stream-mac.css b/browser/components/newtab/css/activity-stream-mac.css
index 0fae889d0a..3baabba2d0 100644
--- a/browser/components/newtab/css/activity-stream-mac.css
+++ b/browser/components/newtab/css/activity-stream-mac.css
@@ -256,7 +256,7 @@ body,
body {
background-color: var(--newtab-background-color);
- font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Ubuntu', 'Helvetica Neue', sans-serif;
+ font-family: sans-serif;
font-size: 16px;
overflow-y: scroll; }
@@ -1718,7 +1718,7 @@ main {
width: 1%;
white-space: nowrap; }
.asrouter-admin table.minimal-table td:not(:first-child) {
- font-family: "SF Mono", "Monaco", "Inconsolata", "Fira Mono", "Droid Sans Mono", "Source Code Pro", monospace; }
+ font-family: monospace; }
.asrouter-admin table.errorReporting tr {
border: 1px solid var(--newtab-textbox-background-color); }
.asrouter-admin table.errorReporting td {
@@ -1756,7 +1756,7 @@ main {
.asrouter-admin .message-item.blocked .message-id {
opacity: 0.5; }
.asrouter-admin .message-item .message-id {
- font-family: "SF Mono", "Monaco", "Inconsolata", "Fira Mono", "Droid Sans Mono", "Source Code Pro", monospace;
+ font-family: monospace;
font-size: 12px; }
.asrouter-admin .providerUrl {
font-size: 12px; }
@@ -1767,7 +1767,7 @@ main {
font-size: 12px;
max-width: 750px;
overflow: auto;
- font-family: "SF Mono", "Monaco", "Inconsolata", "Fira Mono", "Droid Sans Mono", "Source Code Pro", monospace; }
+ font-family: monospace; }
.asrouter-admin .errorState {
border: 1px solid #D70022; }
.asrouter-admin .helpLink {
diff --git a/browser/components/newtab/css/activity-stream-windows.css b/browser/components/newtab/css/activity-stream-windows.css
index 64e792542d..1e65a7b5d7 100644
--- a/browser/components/newtab/css/activity-stream-windows.css
+++ b/browser/components/newtab/css/activity-stream-windows.css
@@ -253,7 +253,7 @@ body,
body {
background-color: var(--newtab-background-color);
- font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Ubuntu', 'Helvetica Neue', sans-serif;
+ font-family: sans-serif;
font-size: 16px;
overflow-y: scroll; }
@@ -1715,7 +1715,7 @@ main {
width: 1%;
white-space: nowrap; }
.asrouter-admin table.minimal-table td:not(:first-child) {
- font-family: "SF Mono", "Monaco", "Inconsolata", "Fira Mono", "Droid Sans Mono", "Source Code Pro", monospace; }
+ font-family: monospace; }
.asrouter-admin table.errorReporting tr {
border: 1px solid var(--newtab-textbox-background-color); }
.asrouter-admin table.errorReporting td {
@@ -1753,7 +1753,7 @@ main {
.asrouter-admin .message-item.blocked .message-id {
opacity: 0.5; }
.asrouter-admin .message-item .message-id {
- font-family: "SF Mono", "Monaco", "Inconsolata", "Fira Mono", "Droid Sans Mono", "Source Code Pro", monospace;
+ font-family: monospace;
font-size: 12px; }
.asrouter-admin .providerUrl {
font-size: 12px; }
@@ -1764,7 +1764,7 @@ main {
font-size: 12px;
max-width: 750px;
overflow: auto;
- font-family: "SF Mono", "Monaco", "Inconsolata", "Fira Mono", "Droid Sans Mono", "Source Code Pro", monospace; }
+ font-family: monospace; }
.asrouter-admin .errorState {
border: 1px solid #D70022; }
.asrouter-admin .helpLink {
diff --git a/browser/components/newtab/lib/ActivityStream.jsm b/browser/components/newtab/lib/ActivityStream.jsm
index a039e7d799..a1db618557 100644
--- a/browser/components/newtab/lib/ActivityStream.jsm
+++ b/browser/components/newtab/lib/ActivityStream.jsm
@@ -29,17 +29,7 @@ const {HighlightsFeed} = ChromeUtils.import("resource://activity-stream/lib/High
const {ASRouterFeed} = ChromeUtils.import("resource://activity-stream/lib/ASRouterFeed.jsm");
const {DiscoveryStreamFeed} = ChromeUtils.import("resource://activity-stream/lib/DiscoveryStreamFeed.jsm");
-const DEFAULT_SITES = new Map([
- // This first item is the global list fallback for any unexpected geos
- ["", "https://www.youtube.com/,https://www.facebook.com/,https://www.wikipedia.org/,https://www.reddit.com/,https://www.amazon.com/,https://twitter.com/"],
- ["US", "https://www.youtube.com/,https://www.facebook.com/,https://www.amazon.com/,https://www.reddit.com/,https://www.wikipedia.org/,https://twitter.com/"],
- ["CA", "https://www.youtube.com/,https://www.facebook.com/,https://www.reddit.com/,https://www.wikipedia.org/,https://www.amazon.ca/,https://twitter.com/"],
- ["DE", "https://www.youtube.com/,https://www.facebook.com/,https://www.amazon.de/,https://www.ebay.de/,https://www.wikipedia.org/,https://www.reddit.com/"],
- ["PL", "https://www.youtube.com/,https://www.facebook.com/,https://allegro.pl/,https://www.wikipedia.org/,https://www.olx.pl/,https://www.wykop.pl/"],
- ["RU", "https://vk.com/,https://www.youtube.com/,https://ok.ru/,https://www.avito.ru/,https://www.aliexpress.com/,https://www.wikipedia.org/"],
- ["GB", "https://www.youtube.com/,https://www.facebook.com/,https://www.reddit.com/,https://www.amazon.co.uk/,https://www.bbc.co.uk/,https://www.ebay.co.uk/"],
- ["FR", "https://www.youtube.com/,https://www.facebook.com/,https://www.wikipedia.org/,https://www.amazon.fr/,https://www.leboncoin.fr/,https://twitter.com/"],
-]);
+const DEFAULT_SITES = new Map([[""]]);
const GEO_PREF = "browser.search.region";
const SPOCS_GEOS = ["US"];
const IS_NIGHTLY_OR_UNBRANDED_BUILD = ["nightly", "default"].includes(UpdateUtils.getUpdateChannel(true));
@@ -65,10 +55,10 @@ const PREFS_CONFIG = new Map([
hidden: !PREFS_CONFIG.get("feeds.section.topstories").getValue(args),
provider_icon: "pocket",
provider_name: "Pocket",
- read_more_endpoint: "https://getpocket.com/explore/trending?src=fx_new_tab",
- stories_endpoint: `https://getpocket.cdn.mozilla.net/v3/firefox/global-recs?version=3&consumer_key=$apiKey&locale_lang=${args.locale}&feed_variant=${showSpocs(args) ? "default_spocs_on" : "default_spocs_off"}`,
- stories_referrer: "https://getpocket.com/recommendations",
- topics_endpoint: `https://getpocket.cdn.mozilla.net/v3/firefox/trending-topics?version=2&consumer_key=$apiKey&locale_lang=${args.locale}`,
+ read_more_endpoint: "",
+ stories_endpoint: "",
+ stories_referrer: "",
+ topics_endpoint: "",
model_keys: ["nmf_model_animals", "nmf_model_business", "nmf_model_career", "nmf_model_datascience", "nmf_model_design", "nmf_model_education", "nmf_model_entertainment", "nmf_model_environment", "nmf_model_fashion", "nmf_model_finance", "nmf_model_food", "nmf_model_health", "nmf_model_home", "nmf_model_life", "nmf_model_marketing", "nmf_model_politics", "nmf_model_programming", "nmf_model_science", "nmf_model_shopping", "nmf_model_sports", "nmf_model_tech", "nmf_model_travel", "nb_model_animals", "nb_model_books", "nb_model_business", "nb_model_career", "nb_model_datascience", "nb_model_design", "nb_model_economics", "nb_model_education", "nb_model_entertainment", "nb_model_environment", "nb_model_fashion", "nb_model_finance", "nb_model_food", "nb_model_game", "nb_model_health", "nb_model_history", "nb_model_home", "nb_model_life", "nb_model_marketing", "nb_model_military", "nb_model_philosophy", "nb_model_photography", "nb_model_politics", "nb_model_productivity", "nb_model_programming", "nb_model_psychology", "nb_model_science", "nb_model_shopping", "nb_model_society", "nb_model_space", "nb_model_sports", "nb_model_tech", "nb_model_travel", "nb_model_writing"],
show_spocs: showSpocs(args),
personalized: true,
@@ -77,7 +67,7 @@ const PREFS_CONFIG = new Map([
}],
["showSponsored", {
title: "Show sponsored cards in spoc experiment (show_spocs in topstories.options has to be set to true as well)",
- value: true,
+ value: false,
}],
["pocketCta", {
title: "Pocket cta and button for logged out users.",
@@ -102,7 +92,7 @@ const PREFS_CONFIG = new Map([
}],
["feeds.snippets", {
title: "Show snippets on activity stream",
- value: true,
+ value: false,
}],
["topSitesRows", {
title: "Number of rows of Top Sites to display",
@@ -110,7 +100,7 @@ const PREFS_CONFIG = new Map([
}],
["telemetry", {
title: "Enable system error and usage data collection",
- value: true,
+ value: false,
value_local_dev: false,
}],
["telemetry.ut.events", {
@@ -129,7 +119,7 @@ const PREFS_CONFIG = new Map([
}],
["telemetry.ping.endpoint", {
title: "Telemetry server endpoint",
- value: "https://tiles.services.mozilla.com/v4/links/activity-stream",
+ value: ""
}],
["section.highlights.includeVisited", {
title: "Boolean flag that decides whether or not to show visited pages in highlights.",
@@ -141,7 +131,7 @@ const PREFS_CONFIG = new Map([
}],
["section.highlights.includePocket", {
title: "Boolean flag that decides whether or not to show saved Pocket stories in highlights.",
- value: true,
+ value: false,
}],
["section.highlights.includeDownloads", {
title: "Boolean flag that decides whether or not to show saved recent Downloads in highlights.",
@@ -307,7 +297,7 @@ const FEEDS_DATA = [
"CA": ["en-CA", "en-GB", "en-US", "en-ZA"],
"DE": ["de", "de-DE", "de-AT", "de-CH"],
})[geo];
- return !!locales && locales.includes(locale);
+ return false;
},
},
{
@@ -320,7 +310,7 @@ const FEEDS_DATA = [
name: "telemetry",
factory: () => new TelemetryFeed(),
title: "Relays telemetry-related actions to PingCentre",
- value: true,
+ value: false,
},
{
name: "favicon",
@@ -338,13 +328,13 @@ const FEEDS_DATA = [
name: "asrouterfeed",
factory: () => new ASRouterFeed(),
title: "Handles AS Router messages, such as snippets and onboaridng",
- value: true,
+ value: false,
},
{
name: "discoverystreamfeed",
factory: () => new DiscoveryStreamFeed(),
title: "Handles new pocket ui for the new tab page",
- value: true,
+ value: false,
},
];