From 3a29b5f303246084b79a35672135abe9d9db72da Mon Sep 17 00:00:00 2001 From: Greg Sherman <63402349+GregSherman@users.noreply.github.com> Date: Mon, 25 Mar 2024 13:44:22 -0700 Subject: [PATCH] rename to "Firefox Bridge (Beta)". Add localization to tab title. Remove welcome page mobile formatting. --- src/_locales/en/messages.json | 17 ++++++++----- src/chromium/manifest.json | 2 +- src/firefox/manifest.json | 2 +- src/shared/pages/welcomePage/index.html | 4 +-- src/shared/pages/welcomePage/script.js | 21 --------------- src/shared/pages/welcomePage/style.css | 34 +------------------------ 6 files changed, 14 insertions(+), 66 deletions(-) diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index 8ae2910..579b452 100644 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -51,8 +51,11 @@ "openWelcomePage": { "message": "Extension Settings" }, + "welcomePageTabTitleFirefox": { + "message": "Firefox Bridge (Beta)" + }, "welcomePageTitleFirefox": { - "message": "Firefox Bridge" + "message": "Firefox Bridge (Beta)" }, "welcomePageSubtitleFirefox": { "message": "Switch between browsers in one click." @@ -60,8 +63,11 @@ "welcomePageDescriptionFirefox": { "message": "Sometimes, you just want to use a different browser.\nThis extension helps you easily open sites in other browsers." }, + "welcomePageTabTitleChromium": { + "message": "Firefox Bridge (Beta)" + }, "welcomePageTitleChromium": { - "message": "Firefox Bridge" + "message": "Firefox Bridge (Beta)" }, "welcomePageSubtitleChromium": { "message": "Switch from your current browser to Firefox in one click." @@ -127,17 +133,14 @@ "message": "Find shortcuts for this extension by going to extension settings." }, "welcomePageTryFirefox": { - "message": "Want to launch in Firefox? Try our Chromium extension." + "message": "Want to hop back to Firefox? Try our Chromium extension." }, "welcomePageTryChromium": { - "message": "Launch another browser with our extension in Firefox." + "message": "Hop back from another browser with our extension in Firefox." }, "welcomePageDefaultBrowser": { "message": "(Default Browser)" }, - "welcomePageBeta": { - "message": "BETA" - }, "welcomePageNoExternalBrowserErrorChromium": { "message": "Looks like Firefox isn’t installed on this device. Download Now" }, diff --git a/src/chromium/manifest.json b/src/chromium/manifest.json index b0e42b5..e6fb3ae 100644 --- a/src/chromium/manifest.json +++ b/src/chromium/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 3, "minimum_chrome_version": "97", - "name": "Firefox Bridge", + "name": "Firefox Bridge (Beta)", "description": "Easily switch from Chrome to Firefox when you want to use Firefox's extra privacy features.", "version": "0.1", "icons": { diff --git a/src/firefox/manifest.json b/src/firefox/manifest.json index 8c5e94d..e2a4c42 100644 --- a/src/firefox/manifest.json +++ b/src/firefox/manifest.json @@ -1,6 +1,6 @@ { "manifest_version": 2, - "name": "Firefox Bridge", + "name": "Firefox Bridge (Beta)", "description": "Easily hop from Firefox to another browser when you want to use a specific feature or keep your browsing separate.", "version": "0.1", "permissions": [ diff --git a/src/shared/pages/welcomePage/index.html b/src/shared/pages/welcomePage/index.html index e6ec536..83aa4a9 100644 --- a/src/shared/pages/welcomePage/index.html +++ b/src/shared/pages/welcomePage/index.html @@ -3,7 +3,7 @@ - Firefox Bridge + @@ -18,11 +18,9 @@

-

-

diff --git a/src/shared/pages/welcomePage/script.js b/src/shared/pages/welcomePage/script.js index 282359c..8d42dab 100644 --- a/src/shared/pages/welcomePage/script.js +++ b/src/shared/pages/welcomePage/script.js @@ -188,33 +188,12 @@ export async function activatePlatformSpecificElements() { }); checkChromiumHotkeys(); checkPrivateBrowsing(); - if (browser.runtime.getPlatformInfo().os === "android") { - applyMobileLogic(); - } if (!(await getInstalledFirefoxVariant())) { document.getElementById("error-notification").style.display = "flex"; } } } -/** - * Apply logic for mobile browsers. - */ -export function applyMobileLogic() { - // move the manage shortcuts text to the bottom of the description and - // remove the shortcuts container. - const manageShortcutsText = document.querySelector( - "[data-locale='welcomePageManageShortcuts']", - ); - - document - .querySelector("[data-locale='welcomePageDescription']") - .insertAdjacentElement("afterend", manageShortcutsText); - - const shortcutsContainer = document.getElementById("shortcuts-container"); - shortcutsContainer.remove(); -} - document.addEventListener("DOMContentLoaded", async function () { await initGlean(); activatePlatformSpecificElements(); diff --git a/src/shared/pages/welcomePage/style.css b/src/shared/pages/welcomePage/style.css index d426511..9bacae7 100644 --- a/src/shared/pages/welcomePage/style.css +++ b/src/shared/pages/welcomePage/style.css @@ -71,48 +71,16 @@ span { margin-top: 20px; } -#welcome-image-mobile { - display: none; -} - .welcome-info { min-width: 60%; } -/* Mobile & Small Screen Styling */ -@media (max-width: 768px) { - .welcome-content { - flex-direction: column; - padding: 20px; - } - - #welcome-image { - display: none; - } - - #welcome-image-mobile { - display: block; - max-width: 50%; - margin-bottom: 20px; - margin-left: auto; - margin-right: auto; - } -} - -/* Title and Beta Styling */ +/* Title Styling */ .welcome-header { display: flex; align-items: center; } -.welcome-header span { - border-radius: 8px; - border: #cfcfd8 solid 2px; - font-weight: lighter; - padding: 12px; - margin-left: 10px; -} - /* Subtitle Styling */ .welcome-info h2 { margin-top: 0px;