Skip to content

Commit

Permalink
rename to "Firefox Bridge (Beta)". Add localization to tab title. Rem…
Browse files Browse the repository at this point in the history
…ove welcome page mobile formatting.
  • Loading branch information
GregSherman authored Mar 25, 2024
1 parent 600cc7c commit 3a29b5f
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 66 deletions.
17 changes: 10 additions & 7 deletions src/_locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,23 @@
"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."
},
"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."
Expand Down Expand Up @@ -127,17 +133,14 @@
"message": "Find shortcuts for this extension by going to <a>extension settings.</a>"
},
"welcomePageTryFirefox": {
"message": "Want to launch in Firefox? <a>Try our Chromium extension.</a>"
"message": "Want to hop back to Firefox? <a>Try our Chromium extension.</a>"
},
"welcomePageTryChromium": {
"message": "Launch another browser with our <a>extension in Firefox.</a>"
"message": "Hop back from another browser with our <a>extension in Firefox.</a>"
},
"welcomePageDefaultBrowser": {
"message": "(Default Browser)"
},
"welcomePageBeta": {
"message": "BETA"
},
"welcomePageNoExternalBrowserErrorChromium": {
"message": "Looks like Firefox isn’t installed on this device. <a>Download Now</a>"
},
Expand Down
2 changes: 1 addition & 1 deletion src/chromium/manifest.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion src/firefox/manifest.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down
4 changes: 1 addition & 3 deletions src/shared/pages/welcomePage/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Firefox Bridge</title>
<title data-locale="welcomePageTabTitle"></title>
<script src="script.bundle.js"></script>
<link rel="stylesheet" href="style.css" />
</head>
Expand All @@ -18,11 +18,9 @@
<div class="welcome-info">
<div class="welcome-header">
<h1 data-locale="welcomePageTitle"></h1>
<span data-locale="welcomePageBeta"></span>
</div>

<h2 data-locale="welcomePageSubtitle"></h2>
<img id="welcome-image-mobile" src="images/splash.svg" />
<p data-locale="welcomePageDescription"></p>

<div class="browser-list firefox" id="browser-list-container">
Expand Down
21 changes: 0 additions & 21 deletions src/shared/pages/welcomePage/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
34 changes: 1 addition & 33 deletions src/shared/pages/welcomePage/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

1 comment on commit 3a29b5f

@firefoxci-taskcluster
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uh oh! Looks like an error! Details

Taskcluster-GitHub attempted to create a task for this event with the following scopes:

["assume:repo:github.com/mozilla-extensions/firefox-bridge:tag:v0.0.2-alpha","queue:route:checks","queue:scheduler-id:taskcluster-github"]

The expansion of these scopes is not sufficient to create the task, leading to the following:

Client ID static/taskcluster/github does not have sufficient scopes and is missing the following scopes:

assume:repo:github.com/mozilla-extensions/firefox-bridge:branch:v0.0.2-alpha

This request requires the client to satisfy the following scope expression:

{
  "AllOf": [
    "assume:repo:github.com/mozilla-extensions/firefox-bridge:branch:v0.0.2-alpha",
    "queue:route:checks",
    "queue:route:index.xpi.v2.firefox-bridge.revision.3a29b5f303246084b79a35672135abe9d9db72da.taskgraph.decision",
    "queue:create-task:project:none",
    "queue:scheduler-id:xpi-level-1",
    {
      "AnyOf": [
        "queue:create-task:highest:xpi-1/decision-gcp",
        "queue:create-task:very-high:xpi-1/decision-gcp",
        "queue:create-task:high:xpi-1/decision-gcp",
        "queue:create-task:medium:xpi-1/decision-gcp",
        "queue:create-task:low:xpi-1/decision-gcp",
        "queue:create-task:very-low:xpi-1/decision-gcp",
        "queue:create-task:lowest:xpi-1/decision-gcp"
      ]
    }
  ]
}

  • method: createTask
  • errorCode: InsufficientScopes
  • statusCode: 403
  • time: 2024-03-25T21:07:23.782Z

Please sign in to comment.