Refresh assignManager is proxy permission changes

.eslintrc.js

@@ -1,6 +1,6 @@
 module.exports = {
   "parserOptions": {
-    "ecmaVersion": 2021
+    "ecmaVersion": 2018
   },
   "env": {
     "browser": true,
@@ -19,10 +19,7 @@ module.exports = {
     "OS": true,
     "ADDON_UNINSTALL": true,
     "ADDON_DISABLE": true,
-    "CONTAINER_ORDER_STORAGE_KEY": true,
-    "proxifiedContainers": true,
-    "MozillaVPN": true,
-    "MozillaVPN_Background": true
+    "proxifiedContainers": true
   },
   "plugins": [
     "promise",

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,27 @@
+<!--
+  Feel free to ignore this Issue template if you just want to ask or suggest something. If you experience an Issue then please provide all asked information.
+
+  Also please make sure that:
+  - "Firefox will: Never remember history" in the Firefox Preferences/Options under "Privacy & Security > History" is NOT selected
+  - You are NOT using Firefox in a Private Window
+  - You can see a grayed out but ticked Checkbox with the description "Enable Container Tabs" in the Firefox Preferences/Options under "Tabs"
+-->
+- Multi-Account Containers Version:
+- Operating System + Version:
+- Firefox Version:
+- Other installed Add-ons + Version + Enabled/Disabled-Status:
+<!-- To be able to copy & paste the full list of your Add-ons navigate to "about:support" and scroll down to "Extensions" -->
+
+
+### Actual behavior
+
+
+### Expected behavior
+
+
+### Steps to reproduce
+1.
+2.
+3.
+
+### Notes

.github/ISSUE_TEMPLATE/bug.yml

@@ -1,53 +0,0 @@
-name: Bug Report
-description: Report a problem in Multi-Account Containers
-labels: [bug]
-body:
-  - type: checkboxes
-    id: before-bug-report
-    attributes:
-      label: Before submitting a bug report
-      options:
-        - label: "I updated to the latest version of Multi-Account Container and tested if I can reproduce the issue"
-          required: true
-        - label: "I searched for existing reports to see if it hasn't already been reported"
-          required: true
-  - type: textarea
-    id: step_to_reproduce
-    attributes:
-      label: "Step to reproduce"
-      description: "Provide a list of steps you did to trigger this bug"
-      placeholder: |
-        1. I opened ...
-        2. I clicked on ...
-        3. ...
-    validations:
-      required: true
-  - type: textarea
-    id: actual_behavior
-    attributes:
-      label: "Actual behavior"
-      description: "Provide a description of what is currently happening"
-    validations:
-      required: true
-  - type: textarea
-    id: expected_behavior
-    attributes:
-      label: "Expected behavior"
-      description: "Provide a description of what should happen"
-    validations:
-      required: true
-  - type: textarea
-    id: additional_informations
-    attributes:
-      label: "Additional informations"
-      description: "Provide any other information revelant to this issue"
-    validations:
-      required: false
-  - type: textarea
-    id: about_support
-    attributes:
-      label: "Provide a copy of Troubleshooting Information page (optional)"
-      description: "To get a copy of the Troubleshooting Information page, type *about:support* in the address bar and click on the *Copy text to clipboard* button."
-      render: "plain text"
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -1,17 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: "Explore our help articles"
-    url: "https://support.mozilla.org/kb/containers"
-    about: "Dig into the knowledge base, tips and tricks, troubleshooting, and so much more."
-  - name: "Ask a support question"
-    url: "https://support.mozilla.org/questions/new/desktop/form"
-    about: "Get support from our contributors or staff members."
-  - name: "Submit new ideas"
-    url: "https://connect.mozilla.org/t5/discussions/how-to-submit-a-great-idea-in-five-easy-steps/td-p/24"
-    about: "Have an idea for a new product feature? Share it with our community and staff members!"
-  - name: "Discussions" 
-    url: "https://connect.mozilla.org/t5/discussions/bd-p/discussions"
-    about: "Give feedback and participate in meaningful conversations with the community and Mozilla employees"
-  - name: "Discover more awesome tools"
-    url: "https://www.mozilla.org/firefox/products/"
-    about: "Learn more about other products from Mozilla"

.github/pull_request_template.md

@@ -1,24 +0,0 @@
-**Before submitting your pull request**
-
-- [ ] I agree to license my code under the [MPL 2.0 license](https://www.mozilla.org/en-US/MPL/2.0/).
-- [ ] I rebased my work on top of the main branch.
-- [ ] I ran `npm test` and all tests passed.
-- [ ] I added test coverages if relevant.
-
-# Description
-
-*Please include a summary of the changes including relevant motivation and context.*
-
-## Type of change
-
-*Select all that apply.*
-
-- [ ] Bug fix
-- [ ] New feature
-- [ ] Major change (fix or feature that would cause existing functionality to work differently than in the current version)
-
-Tag issues related to this pull request:
-
-*
-*
-*

.github/workflows/builds.yaml

@@ -1,32 +0,0 @@
-name: Builds
-on:
-  push:
-    branches:
-      - main
-      - production
-  pull_request:
-    branches:
-      - main
-      - production
-  schedule:
-    - cron: '0 2 * * *' # Daily at 2AM UTC
-
-jobs:
-  builds:
-    name: Builds
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Clone repository
-        uses: actions/checkout@v3
-
-      - name: Create the package
-        shell: bash
-        run: |
-          ./bin/build-addon.sh nightly.xpi
-
-      - name: Uploading
-        uses: actions/upload-artifact@v4
-        with:
-            name: ${{matrix.config.name}} Build
-            path: src/web-ext-artifacts

.github/workflows/test.yaml

@@ -1,28 +0,0 @@
-name: Test
-on:
-  push:
-    branches:
-      - main
-      - production
-  pull_request:
-    branches:
-
-jobs:
-  test:
-    name: Run tests
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Clone repository
-        uses: actions/checkout@v3
-
-      - name: Set up node
-        uses: actions/setup-node@v3
-        with:
-          node-version: lts/*
-
-      - name: Install dependencies
-        run: npm install --legacy-peer-deps
-
-      - name: Run tests
-        run: npm run test

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
+package-lock.json
 node_modules
 README.html
 *.xpi
@@ -8,7 +9,6 @@ README.html
 addon.env
 
 src/web-ext-artifacts/*
-web-ext-artifacts
 
 # JetBrains IDE files
 .idea

.gitmodules

@@ -1,5 +0,0 @@
-[submodule "src/_locales"]
-	branch = main
-	path = src/_locales
-	url = https://github.com/mozilla-l10n/multi-account-containers-l10n.git 
-	ignore=all

.stylelintrc

@@ -9,12 +9,13 @@
 
   "rules": {
     "declaration-block-no-duplicate-properties": true,
+    "order/properties-alphabetical-order": true,
     "property-no-unknown": [
       true, {
         ignoreProperties:
           ["inset-block-end", "inset-block-start"]
     }],
-    "property-disallowed-list": [
+    "property-blacklist": [
       "/(min[-]|max[-])height/",
       "/width/",
       "/top/",

.travis.yml

@@ -0,0 +1,7 @@
+language: node_js
+node_js:
+    - "lts/*"
+
+notifications:
+    irc:
+        - "ircs://irc.mozilla.org:6697/#testpilot-containers-bots"

CONTRIBUTING.md

@@ -1,54 +1,35 @@
 # Contributing
 
-## Requirements
+Everyone is welcome to contribute to containers. Reach out to team members if you have questions:
 
-* Firefox 91.1.0+
-* Git 2.13+
-* Node 7+
+- IRC: #containers on irc.mozilla.org
+- Email: containers@mozilla.com
 
-## Getting Started
+## Filing bugs
 
-1. Follow the instructions on [How to fork a repository][fork]
-2. Fetch the locales:
+If you find a bug with containers, please file a issue.
 
-    ```
-    cd multi-account-containers
-    git submodule update --init
-    ```
-3. Install the project dependencies
-    ```
-    npm install --legacy-peer-deps
-    ```
-4. Run `npm run dev`.
+Check first if the bug might already exist: https://github.com/mozilla/multi-account-containers/issues
 
-## Translations
+[Open an issue](https://github.com/mozilla/multi-account-containers/issues/new)
 
-The translations are located in `src/_locales`. This directory is a git
-repository like any other. Before editing files in this folder, you need to:
+1. Visit about:support
+2. Click "Copy raw data to clipboard" and paste into the bug. Alternatively copy the following sections into the issue:
+  - Application Basics
+  - Nightly Features (if you are in nightly)
+  - Extensions
+  - Experimental Features
+3. Include clear steps to reproduce the issue you have experienced.
+4. Include screenshots if possible.
 
-1. `cd src/_locales/`
-2. `git checkout -b message-updates-yyyymmdd`
-3. `git push -u origin message-updates-yyyymmdd`
+## Sending Pull Requests
 
-You can then [open a pull request][pr] on [the l10n repository][l10n].
+Patches should be submitted as pull requests. When submitting patches as PRs:
 
-## Tips for contributing
+- You agree to license your code under the project's open source license (MPL 2.0).
+- Base your branch off the current master (see below for an example workflow).
+- Add both your code and new tests if relevant.
+- Run npm test to make sure all tests still pass.
+- Please do not include merge commits in pull requests; include only commits with the new relevant code.
 
-1. Choose [an issue][issues] that you would like to work on.
-2. Fork the repository and follow the instructions for setting it up locally.
-3. Run the add-on locally and try reproducing the issue.
-4. Debug add-ons by clicking the “Settings” icon in about:addons, and then clicking “Debug Add-ons”
-5. Click “Inspect” on the MAC add-on to open developer tools for the popup extension (see [this documentation][extension-doc] for more information)
-6. Once you have a fix ready, commit your changes with the following commit message template: “Fix #<insert issue id #>: <short description>”
-7. Push your changes and open a pull request for review.
-
-If you run into an issue, you can always ask the other community members in the [discussions board][discussions]. 
-
-<!-- Please keep the list in alphabetical order -->
-[discussions]: https://github.com/mozilla/multi-account-containers/discussions
-[extension-doc]: https://extensionworkshop.com/documentation/develop/debugging/
-[fork]: https://docs.github.com/en/get-started/quickstart/fork-a-repo
-[issues]: https://github.com/mozilla/multi-account-containers/issues
-[l10n]: https://github.com/mozilla-l10n/multi-account-containers-l10n/
-[pr]: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests
-[web-ext]: https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Getting_started_with_web-ext
+See the main [README](./README.md) for information on prerequisites, installing, running and testing.

README.md

@@ -1,33 +1,90 @@
 # Multi-Account Containers
 
-[![Test](https://github.com/mozilla/multi-account-containers/actions/workflows/test.yaml/badge.svg)](https://github.com/mozilla/multi-account-containers/actions/workflows/test.yaml)
+The Firefox Multi-Account Containers extension lets you carve out a separate box for each of your online lives – no more opening a different browser just to check your work email! [Learn More Here](https://blog.mozilla.org/firefox/introducing-firefox-multi-account-containers/)
 
-The Firefox Multi-Account Containers extension lets you carve out a separate box for each of your online lives – no more opening a different browser just to check your work email!
+[Available on addons.mozilla.org](https://addons.mozilla.org/firefox/addon/multi-account-containers/)
 
-Learn more about Multi-Account Containers in
-[our end-user documentation][enduser].
+For more info, see: 
 
-## Contributing
+* [Test Pilot Product Hypothesis Document](https://docs.google.com/document/d/1WQdHTVXROk7dYkSFluc6_hS44tqZjIrG9I-uPyzevE8/edit#)
+* [Shield Product Hypothesis Document](https://docs.google.com/document/d/1vMD-fH_5hGDDqNvpRZk12_RhCN2WAe4_yaBamaNdtik/edit#)
 
-Everyone is welcome to contribute to Multi-Account Containers. To learn how
-to contribute a patch to Multi-Account Container, please
-[read our contributing guide][contributing].
 
-You can also chat with us on [our Matrix room][matrix] or ask in [our discussions board][discussions].
+## Requirements
 
-This repository is governed by Mozilla's code of conduct and etiquette
-guidelines. For more details, [please read the Mozilla Community Participation Guidelines][cpg].
+* node 7+ (for jpm)
+* Firefox 57+
 
-### License
 
-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 https://mozilla.org/MPL/2.0/.
+## Development
 
-<!-- Please keep the list in alphabetical order -->
-[contributing]: CONTRIBUTING.md
-[cpg]: https://www.mozilla.org/about/governance/policies/participation/
-[enduser]: https://support.mozilla.org/en-US/kb/containers
-[forum]: https://discourse.mozilla.org/c/containers/223
-[discussions]: https://github.com/mozilla/multi-account-containers/discussions
-[matrix]: https://matrix.to/#/#containers:mozilla.org
+### Running Locally
+
+#### Via WebExtensions API (web-ext)
+
+1. Install the [web-ext](https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Getting_started_with_web-ext) tool.
+2. Run `web-ext run -s src/`. This launches Firefox and installs the extension automatically.
+
+This tool provides some additional development features, such as [automatic reloading](https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Getting_started_with_web-ext#Automatic_extension_reloading).
+
+#### Via about:debugging in Firefox
+
+1. Open the `about:debugging` page in Firefox.
+2. Click on `This Firefox`.
+3. Click on [Load Temporary Add-on](https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Temporary_Installation_in_Firefox).
+4. Select `src/manifest.json`.
+
+Here is a [video](https://www.youtube.com/watch?v=cer9EUKegG4) that demonstrates how to do this.
+
+### Testing
+
+* Install dependencies:
+
+  ```
+  npm install
+  ```
+
+* Run all tests:
+
+  ```
+  npm run test
+  ```
+
+* Only run the linter:
+
+  ```
+  npm run lint
+  ```
+
+There is a timeout test that sometimes fails on certain machines, so make sure to run the tests on your clone before you make any changes to see if you have this problem.
+
+### Distributing
+#### Make the new version
+
+1. Bump the version number in `package.json` and `manifest.json`
+2. Commit the version number bump
+3. Create a git tag for the version: `git tag <version>`
+4. Push the tag up to GitHub: `git push --tags`
+
+#### Publish to AMO
+
+1. `npm run-script build`
+2. [Upload the `.zip` to AMO](https://addons.mozilla.org/developers/addon/multi-account-containers/versions/submit/)
+
+#### Publish to GitHub
+Finally, we also publish the release to GitHub for those followers.
+
+1. Download the signed `.xpi` from [the addon versions page](https://addons.mozilla.org/developers/addon/multi-account-containers/versions)
+2. [Make the new release on
+   GitHub](https://github.com/mozilla/multi-account-containers/releases/new)
+   * Use the version number for "Tag version" and "Release title"
+   * Release notes: copy the output of `git log --no-merges --pretty=format:"%h %s" <previous-version>..<new-version>`
+   * Attach binaries: select the signed `.xpi` file
+
+### Links
+
+Facebook & Twitter icons CC-Attrib https://fairheadcreative.com.
+
+- [License](./LICENSE.txt)
+- [Contributing](./CONTRIBUTING.md)
+- [Code Of Conduct](./CODE_OF_CONDUCT.md)

bin/addons-linter.sh

@@ -1,35 +0,0 @@
-#!/bin/env bash
-
-# 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/.
-
-# addons-linter is not happy to see a `.github` folder in src/_locales.
-# We need to do an horrible hack to run the test.
-
-. $(dirname $0)/commons.sh
-
-TMPDIR=/tmp/MAC_addonsLinter
-
-print Y "Update the submodules..."
-git submodule init || die
-git submodule update --remote --depth 1 src/_locales || die
-
-printn Y "Removing previous execution data... "
-rm -rf $TMPDIR || die
-print G "done."
-
-printn Y "Creating a tmp folder ($TMPDIR)... "
-mkdir $TMPDIR || die
-print G "done."
-
-printn Y "Copying data... "
-cp -r src $TMPDIR || die
-print G "done."
-
-printn Y "Removing the github folder... "
-rm -rf $TMPDIR/src/_locales/.github || die
-print G "done."
-
-print Y "Running the test..."
-npx addons-linter $TMPDIR/src || die

bin/build-addon.sh

@@ -1,26 +1 @@
-#!/bin/env bash
-
-# 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/.
-
-. $(dirname $0)/commons.sh
-
-print Y "Update the submodules..."
-git submodule init || die
-git submodule update --remote --depth 1 src/_locales || die
-
-print Y "Installing dependencies..."
-npm install --legacy-peer-deps || die
-
-print Y "Running tests..."
-npm test
-
-print Y "Creating the final package..."
-cd src || die
-
-if [[ $# -gt 0 ]]; then
-  EXTRA_PARAMS="--filename $1"
-fi
-
-npx web-ext build --overwrite-dest $EXTRA_PARAMS || die
+npm install && npm run deploy

bin/commons.sh

@@ -1,54 +0,0 @@
-#!/bin/env bash
-
-# 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/.
-
-printv() {
-  if [ -t 1 ]; then
-    NCOLORS=$(tput colors)
-
-    if test -n "$NCOLORS" && test "$NCOLORS" -ge 8; then
-      NORMAL="$(tput sgr0)"
-      RED="$(tput setaf 1)"
-      GREEN="$(tput setaf 2)"
-      YELLOW="$(tput setaf 3)"
-    fi
-  fi
-
-  if [[ $2 = 'G' ]]; then
-    # shellcheck disable=SC2086
-    echo $1 -e "${GREEN}$3${NORMAL}"
-  elif [[ $2 = 'Y' ]]; then
-    # shellcheck disable=SC2086
-    echo $1 -e "${YELLOW}$3${NORMAL}"
-  elif [[ $2 = 'N' ]]; then
-    # shellcheck disable=SC2086
-    echo $1 -e "$3"
-  else
-    # shellcheck disable=SC2086
-    echo $1 -e "${RED}$3${NORMAL}"
-  fi
-}
-
-print() {
-  printv '' "$1" "$2"
-}
-
-printn() {
-  printv "-n" "$1" "$2"
-}
-
-error() {
-  printv '' R "$1"
-}
-
-die() {
-  if [[ "$1" ]]; then
-    error "$1"
-  else
-    error Failed
-  fi
-
-  exit 1
-}

data/filters.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg">
+  <filter id="fill">
+    <feComposite in="FillPaint" in2="SourceGraphic" operator="in"/>
+  </filter>
+</svg>

data/usercontext.css

@@ -0,0 +1,143 @@
+#userContext-indicator {
+  height: 16px;
+  list-style-image: none !important;
+  vertical-align: middle;
+  width: 16px;
+}
+
+#userContext-label {
+  color: var(--identity-tab-color) !important;
+  margin-inline-end: 5px;
+  max-inline-size: 75px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+#userContext-icons {
+  -moz-box-align: center;
+  align-items: center;
+  display: flex;
+  max-inline-size: 120px;
+}
+
+#userContext-icons[data-identity-color=""] {
+  display: none;
+}
+
+/* containers experiment */
+
+/* reset nightly containers */
+.tabbrowser-tab[usercontextid] {
+  background-image: none !important;
+  background-repeat: no-repeat;
+  background-size: 0;
+}
+
+/* special styles run through a psuedo-class off of
+these elements so they need to be relatively positioned.
+these styles address both regular and compact themes,
+special cases are addressed below */
+.tabbrowser-tab[usercontextid] .tab-background-middle,
+#main-window[style*='compact'] .tabbrowser-tab[usercontextid] .tab-content,
+#verticaltabs-box .tabbrowser-tab[usercontextid] .tab-content {
+  position: relative;
+}
+
+.tabbrowser-tab[usercontextid] .tab-background-middle::after,
+#main-window[style*='compact'] .tabbrowser-tab[usercontextid] .tab-content::after {
+  background-color: var(--identity-tab-color);
+  bottom: 0;
+  content: '';
+  height: 2px;
+  left: 0;
+  position: absolute;
+  right: 0;
+  width: 100%;
+  z-index: 999;
+}
+
+.tabbrowser-tab[usercontextid] .tab-background-middle::after {
+  background-color: var(--identity-tab-color);
+  border-radius: 2px 2px 0 0;
+  bottom: 1px;
+  height: 3px;
+}
+
+.tabbrowser-tab[usercontextid]:not([visuallyselected="true"]) .tab-background-middle::after {
+  bottom: 2px;
+  height: 2px !important;
+}
+
+.tabbrowser-tab[usercontextid][pinned="true"] .tab-background-middle::after {
+  left: -150%;
+  width: 400%;
+}
+
+.tabs-newtab-button .toolbarbutton-icon[type="menu"] {
+  margin-inline-end: 0;
+}
+
+.tabs-newtab-button .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
+#new-tab-overlay {
+  --icon-size: 16px;
+  -moz-appearance: none;
+  background: transparent;
+  font-style: -moz-use-system-font;
+  inline-size: 180px;
+  margin-inline-start: -50px !important;
+  visibility: visible;
+}
+
+#new-tab-overlay .panel-arrowcontent {
+  -moz-appearance: none !important;
+  background: none;
+  border: 0;
+  box-shadow: none;
+  display: block;
+  margin-block-end: 0;
+  margin-block-start: 2px;
+  padding-block-start: 0 !important;
+}
+
+#new-tab-overlay .panel-arrowcontent,
+#new-tab-overlay menuitem {
+  inline-size: 100%;
+}
+
+#new-tab-overlay .panel-arrowbox {
+  display: none;
+}
+
+#new-tab-overlay[hidden=true] {
+  display: none;
+}
+
+#new-tab-overlay menuitem {
+  -moz-appearance: none;
+  background: white;
+  border-radius: 20px;
+  border: 0;
+  box-shadow: 0 0 7px #0004;
+  color: #4b4b4b;
+  margin-block-end: 5px;
+  padding-block-end: 10px;
+  padding-block-start: 10px;
+  padding-inline-end: 10px;
+  padding-inline-start: 10px;
+}
+
+#new-tab-overlay menuitem:hover {
+  background: #f2f2f2;
+}
+
+#new-tab-overlay .menuitem-iconic[data-usercontextid] > .menu-iconic-left > .menu-iconic-icon {
+  block-size: var(--icon-size);
+  inline-size: var(--icon-size);
+}
+
+.menuitem-iconic[data-usercontextid] > .menu-iconic-left {
+  visibility: visible;
+}

data/usercontext.svg

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32" viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;">
+  <style>
+    path, circle, g {
+      fill: menutext;
+    }
+    path:not(:target),
+    circle:not(:target),
+    g:not(:target) {
+      display: none;
+    }
+  </style>
+  <path id="dollar" d="M16.2,0c-8.9,0-16,7.3-16,16c0,8.9,7.1,16,15.8,16s15.8-7.1,15.8-16C32,7.3,24.9,0,16.2,0z M17.1,25.1v1.6
+  c0,0.4-0.4,0.5-0.7,0.5c-0.4,0-0.7-0.2-0.7-0.5v-1.6c-3.2-0.2-5-1.8-5.5-4.3c0-0.2,0-0.2,0-0.4c0-0.5,0.4-0.9,0.9-0.9
+  c0.2,0,0.2,0,0.4,0c0.5,0,0.9,0.2,1.1,0.7c0.4,1.8,1.2,2.7,3.4,2.8v-6.8c-3.6-0.4-5.3-1.8-5.3-4.6c0-3,2.5-4.6,5.2-4.8V5.7
+  c0-0.4,0.4-0.5,0.7-0.5c0.4,0,0.7,0.2,0.7,0.5v1.1c2.7,0.4,4.4,1.8,5,3.9c0,0.2,0,0.2,0,0.4c0,0.5-0.4,0.7-0.7,0.9
+  c-0.2,0-0.2,0-0.4,0c-0.4,0-0.7-0.2-0.9-0.7c-0.4-1.4-1.2-2.3-3-2.5v6c3.2,0.7,5.5,1.8,5.5,5.2C22.8,23.5,20.1,25.1,17.1,25.1z
+   M12.4,11.6c0,1.6,0.7,2.5,3.2,3V8.7C13.7,8.9,12.4,10,12.4,11.6z M17.1,16.9v6.4c2.3-0.2,3.6-1.2,3.6-3.2
+  C20.6,17.8,19.2,17.2,17.1,16.9z"/>
+  <path id="briefcase" d="M23.1,5.3c0-1.4-1.2-2.7-2.8-2.7h-8.7c-1.4,0-2.7,1.2-2.7,2.7v4.4H7.1v19.6h17.8V9.8h-1.8V5.3z M20.8,9.8H11
+  V5.3c0-0.4,0.2-0.5,0.5-0.5h8.7c0.4,0,0.5,0.2,0.5,0.5V9.8z M1.8,9.8h2.7v19.6H1.8c-0.9,0-1.8-0.9-1.8-1.8v-16
+  C0,10.5,0.9,9.8,1.8,9.8z M32,11.6v16c0,0.9-0.7,1.8-1.8,1.8h-2.7V9.8h2.7C31.3,9.8,32,10.5,32,11.6z"/>
+  <path id="fingerprint" d="M7.17741905,12 C7.10965537,12 7.041327,11.9953181 6.97243393,11.985018 C6.33263187,11.8918489 5.90515601,11.3862071 6.01809547,10.8552833 C7.41798011,4.26321358 12.2613889,2.57493207 15.0238882,2.15590491 C19.6448063,1.45690206 24.3408291,3.21541158 25.8344535,5.29743816 C26.1664955,5.76047488 25.9835336,6.35881757 25.4244832,6.63364321 C24.8654329,6.9098734 24.1437497,6.75583996 23.8122724,6.29327142 C22.8923805,5.01043967 19.1749781,3.51130562 15.4479759,4.07406612 C12.8080159,4.474834 9.43056132,6.03623689 8.33561323,11.1942506 C8.23453242,11.666651 7.73816348,12 7.17741905,12 Z M16.63127,26 C16.1452186,26 15.6509104,25.9658335 15.147795,25.8938767 C10.637921,25.257137 6.71207921,21.8114952 6.01575422,17.8807924 C5.91171832,17.2932317 6.33391695,16.7382846 6.95813239,16.6404441 C7.58454965,16.5343208 8.17298555,16.9406954 8.27757192,17.5272206 C8.80876054,20.5255916 11.9766264,23.26409 15.4885263,23.7610576 C17.3975027,24.02766 20.959494,23.8221432 23.3220449,19.3789425 C24.4625867,17.2331815 23.0049831,11.881462 19.9521622,9.34692739 C18.2380468,7.92384005 16.4573263,7.76905536 14.6628445,8.89499751 C13.26469,9.77142052 11.8070864,12.2857658 11.8665355,14.6287608 C11.9127737,16.4835887 12.8386382,17.9325598 14.6171568,18.9363308 C15.2210054,19.2764429 16.9411759,19.4933486 17.9424527,18.8296898 C18.7257495,18.3104622 18.9591422,17.2761485 18.6365758,15.7583267 C18.3822659,14.5650869 17.2219077,12.4452096 16.6664991,12.3711821 C16.6692513,12.3722175 16.4666841,12.4312324 16.1276041,12.9095636 C15.8545786,13.2936782 15.58981,14.7297074 15.9476054,15.3581643 C16.0142104,15.4761941 16.0725586,15.5465978 16.3202632,15.5465978 C16.9532859,15.5465978 17.46686,16.0290705 17.46686,16.6249139 C17.46686,17.2207573 16.9543868,17.7042653 16.3213641,17.7042653 C15.2644914,17.7042653 14.4140391,17.2336992 13.9268868,16.3774655 C13.1083609,14.9388479 13.5536787,12.6548678 14.2202791,11.7137354 C15.2540327,10.2564816 16.3631986,10.1151564 17.1123672,10.2564816 C19.7066595,10.7389543 20.8763754,15.2908666 20.8857331,15.3359043 C21.5303153,18.3648181 20.3594985,19.8665919 19.264094,20.593407 C17.4151172,21.8192603 14.6920186,21.493643 13.4380832,20.7859819 C10.3280151,19.0310652 9.62013053,16.497566 9.5744428,14.6805283 C9.49022326,11.3643051 11.4779146,8.30018945 13.391845,7.10021984 C16.0417332,5.43848454 18.9877658,5.66781436 21.4714167,7.72919442 C25.1176276,10.7565552 27.0871539,17.1229168 25.3746898,20.3433702 C23.4326862,23.9950465 20.2983981,26 16.63127,26 Z M16.0845157,30 C14.9348455,30 13.9050564,29.8557557 13.0394288,29.6610017 C10.2114238,29.0257442 7.58700058,27.4599412 6.18892823,25.5735955 C5.84440518,25.1078371 5.98426642,24.4803503 6.50105099,24.1700066 C7.01675554,23.8596629 7.71552172,23.986423 8.06112477,24.4507244 C9.89498097,26.9252176 15.9397944,29.9781448 22.2508301,26.1937972 C22.7676147,25.8844249 23.4658409,26.0087566 23.8109039,26.474515 C24.155427,26.9397877 24.0161057,27.5672745 23.4993212,27.8776182 C20.7987573,29.4963593 18.2315746,30 16.0845157,30 Z"/>
+  <path id="cart" d="M26.9,21.4H9.4c-0.7,0-1.3,0.5-1.3,1.3s0.5,1.3,1.3,1.3h17.5c0.7,0,1.3-0.5,1.3-1.3
+  C28.5,21.9,27.8,21.4,26.9,21.4z M13.3,30.1c1.3,0,2.7-1.2,2.7-2.7c0-1.3-1.2-2.7-2.7-2.7s-2.7,1.2-2.7,2.7
+  C10.6,29,12,30.1,13.3,30.1z M23.9,30.1c1.3,0,2.7-1.2,2.7-2.7c0-1.3-1.2-2.7-2.7-2.7c-1.5,0-2.7,1.2-2.7,2.7
+  C21.4,29,22.6,30.1,23.9,30.1z M31.5,7.4L31.5,7.4H7.6V7.2L5.7,2.5C5.4,2.2,5.1,1.9,4.6,1.9H0.7C0,1.9,0,2.5,0,2.9
+  C0,3.5-0.2,4,0.7,4.2h2.7l0.7,1.5l4,13.3c0,0.2,0.2,0.5,0.8,0.5h18.5c0.3,0,0.7-0.2,0.7-0.5L32,8.3C32,8.1,31.8,7.4,31.5,7.4z"/>
+  <path id="vacation" d="M3.6,27l-2.5-1.8L0.8,25c-0.7-0.4-0.7-1.2-0.4-2c0.4-0.5,1.1-0.7,1.6-0.5l3.6,1.2c0-0.4,0.2-0.9,0.4-1.4
+  c0.2-0.7,0.5-1.6,1.1-2.3c0.2-0.4,0.5-0.7,0.7-1.2c0.2-0.4,0.5-0.9,0.9-1.2c0.4-0.9,1.1-1.6,1.8-2.5c0.7-0.9,1.4-1.6,2.3-2.5
+  c0.4-0.4,0.9-0.7,1.2-1.2c0.4-0.2,0.9-0.7,1.2-1.1c0.2-0.2,0.2-0.2,0.4-0.4L3.1,7.3c-0.2,0-0.2,0-0.4,0l-2,0.9
+  C0.2,8.3-0.3,7.6,0.2,7.1l2-2C2.4,5,2.4,5,2.5,5h17.9c0.5-0.5,1.2-1.1,1.8-1.6c0.7-0.7,1.4-1.2,2.1-1.8c0.4-0.4,0.7-0.5,1.1-0.7
+  c0.4-0.2,0.7-0.4,1.1-0.5c0.5,0,0.9-0.2,1.2-0.2s0.7,0,1.1,0s0.7,0,1.1,0c0.4,0,0.5,0,0.7,0.2c0.5,0,0.7,0.2,0.7,0.2
+  c0.2,0,0.2,0.2,0.4,0.4c0,0,0,0.4,0.2,0.7c0,0.2,0,0.5,0.2,0.7c0,0.4,0,0.7,0,1.1s0,0.7,0,1.1c0,0.4,0,0.9-0.2,1.2
+  c-0.2,0.4-0.4,0.7-0.5,1.1c-0.2,0.4-0.5,0.7-0.7,1.1c-0.5,0.7-1.1,1.4-1.8,2.1c-0.4,0.4-0.7,0.7-1.1,1.1v17.8c0,0.2,0,0.4-0.2,0.4
+  l-2,2c-0.5,0.5-1.2,0-1.1-0.5l0.7-2c0-0.2,0-0.2,0-0.4L22.8,16c-0.4,0.4-0.7,0.7-0.9,0.9c-0.4,0.4-0.7,0.9-1.2,1.2
+  c-0.4,0.4-0.7,0.9-1.2,1.2c-0.7,0.9-1.6,1.6-2.5,2.3c-0.9,0.7-1.6,1.4-2.5,2c-0.4,0.4-0.9,0.5-1.2,0.9c-0.4,0.2-0.7,0.5-1.2,0.7
+  c-0.7,0.4-1.6,0.7-2.3,1.1c-0.4,0.2-0.7,0.2-1.2,0.4L9.6,30c0.4,0.7,0,1.4-0.7,1.8c-0.5,0.2-1.2,0-1.6-0.5l-0.2-0.4l-1.8-2.3
+  c-0.2,0-0.2,0-0.4,0.2c-0.4,0-0.5,0.2-0.7,0.2s-0.2,0-0.4,0c-0.2,0-0.2,0-0.4,0c-0.2,0-0.4,0-0.5,0c-0.2,0-0.2,0-0.2,0s0,0,0-0.2
+  c0-0.2,0-0.2,0-0.5c0-0.2,0-0.2,0-0.4c0-0.2,0-0.2,0-0.4C3.4,27.5,3.4,27.3,3.6,27L3.6,27z M5.7,28.4L5.7,28.4L5.7,28.4L5.7,28.4z"
+  />
+  <path id="gift" d="M30.3,8.1h-4.5V8c0.7-0.7,1.3-1.9,1.3-3.2c0-2.6-2.1-4.7-4.9-4.7c-1.5,0-4.5,1.5-6.4,3.4C14,1.6,11,0.1,9.5,0.1
+  c-2.6,0-4.9,2.1-4.9,4.7C4.7,6.1,5.2,7.2,6,8H1.7C0.6,8,0,8.7,0,9.6v4.5c0,0.2,0.2,0.4,0.4,0.4h13.8V9.6h3.2v4.9h14.2
+  c0.2,0,0.4-0.2,0.4-0.4V9.6C32,8.7,31.4,8.1,30.3,8.1z M9.5,6.5C8.6,6.5,8,5.9,8,4.8s0.6-1.5,1.5-1.5s3.7,1.9,4.7,2.8
+  C13.7,6.3,9.5,6.5,9.5,6.5z M22.3,6.5c0,0-4.1-0.2-4.7-0.4c0.9-1.1,3.7-2.8,4.7-2.8S24,3.8,24,4.8S23.2,6.5,22.3,6.5z M1.7,17.7
+  h12.7v14.2H1.7V17.7z M17.6,17.7h12.7v14.2H17.6V17.7z"/>
+  <path id="food" d="M14.1,0.9v5.3h-1.4V0.9c0-1.1-1.4-1.1-1.4,0v5.3h-1.2V0.9c0-1.1-1.4-1.1-1.4,0v5.3H7.2V0.9c0-1.2-1.6-1.1-1.6,0
+  v10.4c0,1.8,1.2,3,2.8,3v15.2c0,1.6,1.1,2.5,2.1,2.5s2.1-0.9,2.1-2.5V14.3c1.6,0,2.8-1.4,2.8-2.8V0.9C15.6-0.4,14.1-0.2,14.1,0.9z
+   M19.8,3.7v25.8c0,3.2,4.2,3.2,4.2,0V17.1h2.3V3.7C26.5-1.2,19.8-1.2,19.8,3.7z"/>
+  <path id="fruit" d="M16.5,8c-2.1-0.9-3.9-1.2-6.6-0.9C4.6,8,1.8,12.6,1.8,18c0,5.9,4.8,14,9.8,14c1.6,0,3.9-1.2,4.4-1.2
+  c0.5,0,2.8,1.2,4.4,1.2c5,0,9.8-8.4,9.8-14c0-5.9-3.2-10.8-9.8-10.8C19,7.1,17.8,7.5,16.5,8z M11.7,0c1.1,0.2,3.2,0.9,4.1,2.3
+  c0.9,1.4,0.5,3.6,0.2,4.6c-1.2-0.2-3.2-0.7-4.1-2.3C11,3.2,11.4,1.1,11.7,0L11.7,0z"/>
+  <path id="pet" d="M28.5,8.1c0-1.1-1-1.9-2.1-2.4V3.7c-0.2-0.2-0.3-0.3-0.6-0.3c-0.6,0-1.1,0.8-1.3,2.1c-0.2,0-0.3,0-0.5,0l0,0
+  c0-0.2,0-0.3-0.2-0.5c-0.3-1.1-0.8-1.9-1.3-2.6C22,2.6,21.7,3.2,21.7,4L22,6.3c-0.3,0.2-0.6,0.3-1,0.6l-3.5,3.7l0,0
+  c0,0-6.3-0.8-10.9,0.2c-0.6,0-1,0.2-1.1,0.3c-0.5,0.2-0.8,0.3-1.1,0.6c-1.1-0.8-2.2-2.1-3.2-4c0-0.3-0.5-0.5-0.8-0.5s-0.5,0.6-0.3,1
+  c0.8,2.1,2.1,3.5,3.4,4.5c-0.5,0.5-0.8,1-1,1.6c0,0-0.3,2.2-0.3,5.5l1.4,8c0,1,0.8,1.8,1.9,1.8c1,0,1.9-0.8,1.9-1.8V23l0.5-1.3h8.8
+  l0.8,1.3v4.7c0,1,0.8,1.8,1.9,1.8c1,0,1.6-0.6,1.8-1.4l0,0l1.9-9l0,0l2.1-6.4h3c3.4,0,3.7-2.9,3.7-2.9L28.5,8.1z"/>
+  <path id="tree" d="M0.7,18c0,4.9,3.6,8.8,8.1,9.5v4.3c0.2,0,3.2,0,3.2,0v-4.3c1.8-0.4,3.6-1.1,4.9-2.5c0.2-0.2,0.2-0.2,0.2-0.5
+  c-0.2-0.4-0.2-1.1-0.2-1.6c0-2,0.2-4.9,1.6-7.9c0,0,0.9-1.6,0.7-1.8C18,7.2,14.4,0,10.4,0C5,0,0.7,12.6,0.7,18z M18.3,22.8
+  c0,3.1,2.2,5.6,4.9,6.3V32h3.2v-2.9c2.7-0.7,4.9-3.2,4.9-6.3c0-3.6-2.9-12.9-6.5-12.9S18.3,19.2,18.3,22.8z"/>
+  <path id="chill" d="M9.1,18.5l-5.7,5.9C3.2,23.8,3,23.3,3,22.6c0-2.5,2-4.4,4.4-4.4C7.8,18.1,8.5,18.3,9.1,18.5 M26.5,18.5l-5.7,5.9
+  c-0.2-0.5-0.4-1.1-0.4-1.8c0-2.5,2-4.4,4.4-4.4C25.4,18.1,26,18.3,26.5,18.5 M24.7,2L24.7,2c-0.7,0-1.4,0.7-1.4,1.4s0.7,1.4,1.4,1.4
+  c2.5,0,4.4,2,4.4,4.4v7.6c-1.6-1.2-3.6-1.8-5.5-1.4c-2.1,0.4-3.9,1.6-5,3.4c-1.6-1.2-3.9-1.2-5.5,0c-1.1-1.8-2.8-3-5-3.4
+  c-2-0.4-3.9,0.2-5.5,1.4V9.2c0-2.5,2-4.4,4.4-4.4c0.5,0,0.9-0.4,1.2-0.7c0.2-0.4,0.2-0.9,0-1.4C8.2,2.3,7.6,2,7.1,2
+  C3.2,2,0,5.2,0,9.2v13.5C0,26.7,3.2,30,7.1,30l0,0c3.9,0,7.1-3.2,7.1-7.3c0-0.2,0-0.4,0-0.5c0.2-0.9,0.9-1.4,1.8-1.4
+  s1.6,0.5,1.8,1.4v0.2c0,0.2,0,0.2,0,0.4c0,2,0.7,3.7,2.1,5c1.4,1.4,3,2.1,5,2.1l0,0c2,0,3.6-0.7,5-2.1c1.4-1.2,2.1-3.2,2.1-5V9.2
+  C32,5.2,28.8,2,24.7,2"/>
+  <circle id="circle" r="16" cx="16" cy="16" fill-rule="evenodd"/>
+</svg>

docs/acceptance.md

@@ -0,0 +1,31 @@
+# Acceptance Criteria
+
+## User Experience
+- [ ] It should place a containers button on the user’s browser toolbar
+- [ ] It should include all containers management UI inside a door hanger from this toolbar button
+- [ ] It should provide a set of default container choices for users to pick from (work, home, travel etc.)
+  - [ ] Each container type should have a color, icon and name
+- [ ] It should allow users to create new containers
+- [ ] It should allow users to delete containers
+- [ ] It should allow users to open container tabs
+  - [ ] each container tab should be clearly demarcated by color/icon etc.
+- [ ] It should provide a control to show/hide all open tabs of one container type
+- [ ] It should provide a control to sort tabs by container type
+- [ ] It should provide a control to allow users to open containers in new tab or new window by default
+
+## User Experience Non-Requirements (out of scope)
+- [ ] It should not show any UI in browser settings
+- [ ] It should not effect the awesome bar
+- [ ] It should not effect the Firefox Library 
+- [ ] It should not make any changes to sync functionality
+
+## Measurements
+- [ ] It should measure container tab creations per session
+- [ ] It should measure the type of container tab created
+- [ ] It should measure container tab creations
+- [ ] It should measure new container creations
+- [ ] It should measure container deletes
+- [ ] It should measure container sorts
+- [ ] It should measure container hides
+- [ ] It should report URIs accessed across multiple containers
+- [ ] It should measure the % of tab-based vs windows-based containers

docs/release.md

@@ -1,31 +0,0 @@
-# Release a new version
-
-## Make the new version
-
-1. Bump the version number in `package.json` and `manifest.json`
-2. Commit the version number bump
-3. Create a git tag for the version: `git tag <version>`
-4. Push the tag up to GitHub: `git push --tags`
-
-## Publish to AMO
-
-1. Run `./bin/build-addon.sh`
-2. [Upload the zip file to AMO][amo-upload]
-
-## Publish to GitHub
-
-Finally, we also publish the release to GitHub.
-
-1. Download the signed `.xpi` from [the addon versions page][addon-page]
-2. [Create a new release on GitHub][gh-release]
-   * For *Tag version* and *Release title*, use the version number
-   * For *Release notes*, copy the output of:
-     ```
-     git log --no-merges \
-             --pretty=format:"%h %s" <previous-version>..<new-version>
-     ```
-   * For the *Attach binaries*, select the signed `.xpi` file
-
-[addon-page]: https://addons.mozilla.org/developers/addon/multi-account-containers/versions
-[amo-upload]: https://addons.mozilla.org/developers/addon/multi-account-containers/versions/submit/
-[gh-release]: https://github.com/mozilla/multi-account-containers/releases/new

package.json

@@ -2,22 +2,22 @@
   "name": "testpilot-containers",
   "title": "Multi-Account Containers",
   "description": "Containers helps you keep all the parts of your online life contained in different tabs. Custom labels and color-coded tabs help keep different activities — like online shopping, travel planning, or checking work email — separate.",
-  "version": "8.3.0",
-  "author": "Andrea Marchesini, Luke Crouch, Lesley Norton, Kendall Werts, Maxx Crawford, Jonathan Kingston",
+  "version": "7.4.0",
+  "author": "Andrea Marchesini, Luke Crouch and Jonathan Kingston",
   "bugs": {
     "url": "https://github.com/mozilla/multi-account-containers/issues"
   },
   "dependencies": {},
   "devDependencies": {
-    "addons-linter": "^5.28.0",
+    "addons-linter": "^1.3.2",
     "ajv": "^6.6.3",
     "chai": "^4.2.0",
-    "eslint": "^7.32.0",
-    "eslint-plugin-no-unsanitized": "^4.0.0",
-    "eslint-plugin-promise": "^5.2.0",
+    "eslint": "^6.6.0",
+    "eslint-plugin-no-unsanitized": "^2.0.0",
+    "eslint-plugin-promise": "^3.4.0",
     "htmllint-cli": "0.0.7",
-    "json": ">=10.0.0",
-    "mocha": "^10.1.0",
+    "json": "^9.0.6",
+    "mocha": "^6.2.2",
     "npm-run-all": "^4.0.0",
     "nyc": "^15.0.0",
     "sinon": "^7.5.0",
@@ -25,7 +25,7 @@
     "stylelint": "^13.5.0",
     "stylelint-config-standard": "^20.0.0",
     "stylelint-order": "^4.0.0",
-    "web-ext": "^7.5.0",
+    "web-ext": "^5.4.1",
     "webextensions-jsdom": "^1.2.1"
   },
   "homepage": "https://github.com/mozilla/multi-account-containers#readme",
@@ -36,16 +36,14 @@
     "url": "git+https://github.com/mozilla/multi-account-containers.git"
   },
   "scripts": {
-    "build": "web-ext build -s src/",
-    "dev": "npm run remove-locales-github && web-ext run -s src/",
+    "build": "npm test && cd src && web-ext build --overwrite-dest",
+    "webext": "web-ext run -s src/",
     "lint": "npm-run-all lint:*",
-    "lint:addon": "./bin/addons-linter.sh",
+    "lint:addon": "addons-linter src --self-hosted",
     "lint:css": "stylelint src/css/*.css",
     "lint:html": "htmllint *.html",
     "lint:js": "eslint .",
     "package": "rm -rf src/web-ext-artifacts && npm run build && mv src/web-ext-artifacts/firefox_multi-account_containers-*.zip addon.xpi",
-    "restore-locales-github": "cd src/_locales && git restore .github/",
-    "remove-locales-github": "rm -rf src/_locales/.github",
     "test": "npm run lint && npm run coverage",
     "test:once": "mocha test/**/*.test.js",
     "test:watch": "npm run test:once -- --watch",

src/_locales

@@ -1 +0,0 @@
-Subproject commit bdaa01291b7367a5e815470fd263ea36c862fe32

src/_locales/en/messages.json

@@ -0,0 +1,276 @@
+{
+  "extensionDescription": {
+      "message": "Multi-Account Containers helps you keep all the parts of your online life contained in different tabs. Custom labels and color-coded tabs help keep different activities — like online shopping, travel planning, or checking work email — separate.",
+      "description": "Description of the extension. DO NOT TRANSLATE \"Multi-Account Containers\"."
+  },
+  "openInNewTabTitle": {
+    "message": "Open New Tab in…",
+    "description": "Menu title"
+  },
+  "reopenThisSiteIn": {
+    "message": "Reopen This Site in…",
+    "description": "Menu title"
+  },
+  "sortTabsByContainer": {
+    "message": "Sort Tabs by Container",
+    "description": "Menu title"
+  },
+  "alwaysOpenThisSiteIn": {
+    "message": "Always Open This Site in…",
+    "description": "Menu title"
+  },
+  "alwaysOpenIn": {
+    "message": "Always open in…",
+    "description": "Menu title"
+  },
+  "alwaysOpenSiteInContainer": {
+    "message": "Always Open Site in Container"
+  },
+  "openANewTabIn": {
+    "message" : "Open a New Tab in…"
+  },
+  "openNewTabInThisContainer": {
+    "message" : "Open New Tab in this Container"
+  },
+  "openTabs": {
+    "message": "Open Tabs"
+  },
+  "moveTabsToANewWindow": {
+    "message": "Move Tabs to a New Window"
+  },
+  "onboarding-1-header": {
+    "message": "A better way to manage all the things you do online"
+  },
+  "onboarding-1-description": {
+    "message": "Use containers to organize tasks, manage accounts, and keep your focus where you want it."
+  },
+  "onboarding-1-sec-header": {
+    "message": "A simple and secure way to manage your online life"
+  },
+  "onboarding-1-sec-description": {
+    "message" : "Use containers to organize tasks, manage accounts, and store sensitive data."
+  },
+  "onboarding-2-header": {
+    "message": "Put containers to work for you."
+  },
+  "onboarding-2-description": {
+    "message": "Features like color-coding and separate container tabs help you find things easily, focus your attention, and minimize distractions."
+  },
+  "onboarding-2-sec-description": {
+    "message": "Color-coding helps you categorize your online life, find things easily, and minimize distractions."
+  },
+  "onboarding-3-header": {
+    "message": "A place for everything, and everything in its place."
+  },
+  "onboarding-3-description": {
+    "message": "Start with the containers we've created, or create your own."
+  },
+  "onboarding-3-sec-header": {
+    "message": "Set boundaries for your browsing."
+  },
+  "onboarding-3-sec-description": {
+    "message": "Cookies are stored within a container, so you can segment sensitive data and browsing history to stay organized and to limit the impact of online trackers."
+  },
+  "onboarding-4-header": {
+    "message": "Always open sites in the containers you want."
+  },
+  "onboarding-4-description": {
+    "message": "Right-click inside a container tab to assign the site to always open in the container."
+  },
+  "onboarding-5-header": {
+    "message": "Container tabs when you need them."
+  },
+  "onboarding-5-description": {
+    "message": "Long-press the New Tab button to create a new container tab."
+  },
+  "onboarding-6-header": {
+    "message": "Syncing Containers is now Available!"
+  },
+  "onboarding-6-description": {
+    "message": "Turn on Sync to share container and site assignments with any computer connected to your Firefox Account."
+  },
+  "onboarding-7-header": {
+    "message": "Firefox Account is required to sync."
+  },
+  "onboarding-7-description": {
+    "message": "Click Sign In to confirm that your Firefox Account is active."
+  },
+  "oneHundredTabsHeader": {
+    "message": "100 tabs!"
+  },
+  "youHaveOpened": {
+    "message": "You've opened 100 Container tabs."
+  },
+  "spreadTheWord": {
+    "message": "If you enjoy Containers, help us spread the word!"
+  },
+  "rate": {
+    "message": "Rate"
+  },
+  "share": {
+    "message": "Share"
+  },
+  "tweet": {
+    "message": "Tweet"
+  },
+  "default": {
+    "message": "Default"
+  },
+  "manageContainers": {
+    "message": "Manage Containers"
+  },
+  "newContainer": {
+    "message": "New Container"
+  },
+  "hideThisContainer": {
+    "message": "Hide This Container"
+  },
+  "removeThisContainer": {
+    "message": "Remove This Container"
+  },
+  "removeThisContainerConfirmation": {
+    "message": "Are you sure you want to remove this Container?"
+  },
+  "cancel": {
+    "message": "Cancel"
+  },
+  "ok": {
+    "message": "OK"
+  },
+  "sitesAssignedToThisContainer": {
+    "message": "Sites assigned to this container"
+  },
+  "options": {
+    "message": "Options"
+  },
+  "name": {
+    "message": "Name"
+  },
+  "color": {
+    "message": "Color"
+  },
+  "icon": {
+    "message": "Icon"
+  },
+  "limitToDesignatedSites": {
+    "message": "Limit to Designated Sites"
+  },
+  "deleteThisContainer": {
+    "message": "Delete This Container"
+  },
+  "manageSiteList": {
+    "message": "Manage Site List…"
+  },
+  "manageThisContainer": {
+    "message": "Manage This Container"
+  },
+  "containers": {
+    "message": "Containers"
+  },
+  "done": {
+    "message": "Done"
+  },
+  "getStarted": {
+    "message": "Get Started"
+  },
+  "signIn": {
+    "message": "Sign In"
+  },
+  "notNow": {
+    "message": "Not Now"
+  },
+  "startSyncing": {
+    "message": "Start Syncing"
+  },
+  "info": {
+    "message": "info"
+  },
+  "next": {
+    "message": "Next"
+  },
+  "openThisSiteConfirmation": {
+    "message": "Open this site in your assigned container?"
+  },
+  "wouldYouStillLikeToOpenConfirmation": {
+    "message": "Would you still like to open in this current container?"
+  },
+  "rememberMyDecision": {
+    "message": "Remember my decision for this site"
+  },
+  "optionalPermissions": {
+    "message": "Optional Permissions:"
+  },
+  "keyboardShortCuts": {
+    "message": "Keyboard Shortcuts:"
+  },
+  "onboarding": {
+    "message": "Onboarding"
+  },
+  "resetOnboardingPanels": {
+    "message": "Reset Onboarding Panels"
+  },
+  "onboardingToggle": {
+    "message": "Toggle this to see the onboarding panels again."
+  },
+  "tabBehavior": {
+    "message": "Tab behavior:"
+  },
+  "firefoxAccountsSync": {
+    "message": "Firefox Accounts Sync:"
+  },
+  "enableBookMarkMenus": {
+    "message": "Enable Bookmark Menus"
+  },
+  "enableProxy": {
+    "message": "Enable custom per-container proxy settings"
+  },
+  "enableProxyDescription": {
+    "message": "This setting allows you to route all traffic from a specific Container through a proxy. This feature requires the proxy permission. This permission grants the add-on to control browser proxy settings."
+  },
+  "enableSync": {
+    "message": "Enable Sync"
+  },
+  "enableBookMarkMenusDescription": {
+    "message": "This setting allows you to open a bookmark or folder of bookmarks in a container."
+  },
+  "enableSyncDescription": {
+    "message": "This setting allows you to sync your containers and site assignments across devices."
+  },
+  "replaceTab": {
+    "message": "This setting allows you to sync your containers and site assignments across devices."
+  },
+  "replaceTabDescription": {
+    "message": "Replace the current tab if a page which is assigned to another container is opened (instead of keeping the current tab open). Opening tabs with middle mouse button is not affected."
+  },
+  "editWhichContainer": {
+    "message": "Edit which container is opened when using the numbered shortcuts."
+  },
+  "keyboardShortCut": {
+    "message": "Container to open with Keyboard Shortcut $keyId$",
+    "placeholders": {
+      "keyId": {
+          "content": "$1"
+      }
+    }
+  },
+  "confirmNavigationTitle": {
+    "message": "Multi-Account Containers Confirm Navigation",
+    "description": "This is the title of a confirmation page. Please do not translate \"Multi-Account Containers\"."
+  },
+  "openInContainer": {
+    "message": "Open in $containerName$ Container",
+    "placeholders": {
+      "containerName": {
+        "content": "$1"
+      }
+    }
+  },
+  "youAskedFirefox": {
+    "message": "You asked Firefox to always open $containerName$ for this site:",
+    "placeholders": {
+      "containerName": {
+        "content": "$1"
+      }
+    }
+  }
+}

src/confirm-page.html

@@ -3,7 +3,6 @@
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
   <title data-i18n-message-id="confirmNavigationTitle"></title>
   <link xmlns="http://www.w3.org/1999/xhtml" rel="stylesheet" href="chrome://browser/skin/aboutNetError.css" type="text/css" media="all" />
-  <link xmlns="http://www.w3.org/1999/xhtml" rel="stylesheet" href="chrome://global/skin/aboutNetError.css" type="text/css" media="all" />
   <script type="text/javascript" src="./js/i18n.js"></script>
   <link rel="stylesheet" href="/css/confirm-page.css" />
 </head>
@@ -24,21 +23,8 @@
       </label>
       <br />
       <div class="button-container">
-        <button id="deny"
-                class="button"
-                data-message-id="openInContainer"
-                data-message-arg="current-container-name">
-        </button>
-        <button id="deny-no-container"
-                class="button"
-                data-message-id="openInNoContainer">
-        </button>
-        <button id="confirm"
-                class="button primary"
-                autofocus
-                data-message-id="openInContainer"
-                data-message-arg="container-name">
-        </button>
+        <button id="deny" class="button" data-message-id="openInContainer" data-message-arg="current-container-name"></button>
+        <button id="confirm" class="button primary" data-message-id="openInContainer" data-message-arg="container-name"></button>
       </div>
     </form>
   </main>

src/css/confirm-page.css

@@ -5,8 +5,8 @@
 
 main {
   background: url(/img/onboarding-4.png) no-repeat;
-  background-position: 200px 0;
-  background-size: 120px;
+  background-position: -10px -15px;
+  background-size: 300px;
   margin-inline-start: -350px;
   padding-inline-start: 350px;
 }
@@ -20,7 +20,7 @@ button .container-name,
   font-weight: bold;
 }
 
-@media only screen and (max-width: 900px) {
+@media only screen and (max-width: 1300px) {
   main {
     background: none;
   }

src/css/options.css

@@ -1,122 +1,29 @@
 body {
-  --grey10: #e7e7e7;
-
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
   background: #fff;
-  color: rgb(74, 74, 79);
-  font-size: 13px;
-  overflow: hidden;
+  color: #202023;
 }
 
-h3:first-of-type {
+h3 {
   margin-block-start: 2.5rem;
 }
 
+h3:first-of-type {
+  margin-block-start: 1rem;
+}
+
+p,
 label {
-  display: flex;
-  align-items: center;
-  font-size: 14px;
-}
-
-label > span {
-  padding-inline-end: 4px;
-}
-
-.settings-group {
-  margin-block-end: 16px;
-}
-
-form {
-  display: flex;
-  flex-direction: column;
-  padding-block-end: 1rem;
-}
-
-.settings-group p {
-  margin-inline-start: 24px;
-  margin-block: 4px 8px;
-}
-
-input[type="checkbox"] {
-  margin-inline: 0 8px;
-  margin-block: 1px auto;
-  inline-size: 16px;
-  block-size: 16px;
-}
-
-button {
-  margin-inline: 0 auto;
-}
-
-.keyboard-shortcut {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  max-inline-size: 70%;
-  align-items: center;
-}
-
-.bold {
-  font-weight: 600;
-}
-
-.moz-vpn-proxy-permissions {
-  margin-block: 0 2rem;
-  padding-block-end: 1rem;
-  border-block-end: 1px solid var(--grey10);
-  display: flex;
-  flex-direction: column;
-}
-
-h3.moz-vpn-proxy-permissions-title {
-  margin-block-start: 0;
-  position: relative;
-  display: flex;
-  align-items: center;
-}
-
-.warning-icon {
-  display: flex;
-  align-items: center;
-}
-
-.warning-icon.show-warning::before {
-  background-image: url("/img/warning.svg");
-  background-size: 24px;
-  background-repeat: no-repeat;
-  background-position: center;
-  content: "";
-  display: block;
-  block-size: 24px;
-  inline-size: 24px;
-  margin-inline-end: 0.5rem;
-}
-
-.moz-vpn-proxy-permissions-title::before,
-.moz-vpn-proxy-permissions-title::after {
-  background-color: var(--grey10);
-  content: "";
-  height: 1px;
-  flex: 1 1 0%;
-}
-
-h3.moz-vpn-proxy-permissions-title::before {
-  margin-inline-end: 2rem;
-  margin-inline-start: -50%;
-}
-
-h3.moz-vpn-proxy-permissions-title::after {
-  margin-inline-start: 2rem;
-  margin-inline-end: -50%;
+  color: rgb(74, 74, 79);
 }
 
 @media (prefers-color-scheme: dark) {
   body {
-    background: #23212a;
+    background: #202023;
     color: #fff;
   }
 
-  p {
+  p,
+  label {
     color: rgb(177, 177, 179);
   }
 }

src/img/arrow-icon-left-light.svg

@@ -1,3 +0,0 @@
-<!-- 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/. --><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill="#ffffff" d="M6.414 8l4.293-4.293a1 1 0 0 0-1.414-1.414l-5 5a1 1 0 0 0 0 1.414l5 5a1 1 0 0 0 1.414-1.414z"></path></svg>

src/img/arrow-icon-right-light.svg

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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/. -->
-<svg width="5px" height="8px" viewBox="0 0 5 8" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 53.2 (72643) - https://sketchapp.com -->
-    <title>Arrow</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M5.00090934,9.5006316 C4.79840046,9.50099392 4.61567086,9.37916873 4.53812503,9.19209489 C4.4605792,9.00502105 4.5035325,8.78964579 4.64690934,8.6466316 L7.29490934,6.0006316 L4.64690934,3.3546316 C4.45140054,3.1591228 4.45140054,2.8421404 4.64690934,2.6466316 C4.84241814,2.4511228 5.15940054,2.4511228 5.35490934,2.6466316 L8.35490934,5.6466316 C8.44895104,5.74043586 8.50180313,5.86780434 8.50180313,6.0006316 C8.50180313,6.13345886 8.44895104,6.26082734 8.35490934,6.3546316 L5.35490934,9.3546316 C5.26095861,9.44834555 5.13360821,9.5008686 5.00090934,9.5006316 Z" id="path-1"></path>
-    </defs>
-    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.6">
-        <g id="Icons-/-12-/-Arrowhead-Right-12---Thin" transform="translate(-4.000000, -2.000000)">
-            <rect id="bouding-box" x="0" y="0" width="12" height="12"></rect>
-            <mask id="mask-2" fill="white">
-                <use xlink:href="#path-1"></use>
-            </mask>
-            <g id="Shape" fill-rule="nonzero"></g>
-            <g id="Color-/-Photon-/-Primary---Grey-90-80%" mask="url(#mask-2)" fill="#ffffff" fill-opacity="0.8" fill-rule="evenodd">
-                <rect id="Rectangle" x="0" y="0" width="12" height="12"></rect>
-            </g>
-        </g>
-    </g>
-</svg>

src/img/arrow-icon-right.svg

@@ -16,7 +16,7 @@
                 <use xlink:href="#path-1"></use>
             </mask>
             <g id="Shape" fill-rule="nonzero"></g>
-            <g id="Color-/-Photon-/-Primary---Grey-90-80%" mask="url(#mask-2)" fill="#000000" fill-rule="evenodd">
+            <g id="Color-/-Photon-/-Primary---Grey-90-80%" mask="url(#mask-2)" fill="#0C0C0D" fill-opacity="0.8" fill-rule="evenodd">
                 <rect id="Rectangle" x="0" y="0" width="12" height="12"></rect>
             </g>
         </g>

src/img/arrow-toggle.svg

@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.71054 11.1175L11.3005 13.7075C11.6905 14.0975 12.3205 14.0975 12.7105 13.7075L15.3005 11.1175C15.9305 10.4875 15.4805 9.4075 14.5905 9.4075H9.41054C8.52054 9.4075 8.08054 10.4875 8.71054 11.1175Z" fill="#6D6D6E"/>
-</svg>

src/img/close-light.svg

@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.2225 11.9895L17.7594 7.45261C17.9155 7.29095 18.0019 7.07443 18 6.84969C17.998 6.62495 17.9079 6.40997 17.7489 6.25105C17.59 6.09213 17.375 6.00199 17.1503 6.00003C16.9256 5.99808 16.709 6.08447 16.5474 6.24061L12.0105 10.7775L7.47368 6.24061C7.31202 6.08447 7.0955 5.99808 6.87076 6.00003C6.64602 6.00199 6.43104 6.09213 6.27212 6.25105C6.1132 6.40997 6.02305 6.62495 6.0211 6.84969C6.01914 7.07443 6.10554 7.29095 6.26168 7.45261L10.7985 11.9895L6.26168 16.5263C6.17981 16.6054 6.11451 16.7 6.06959 16.8045C6.02467 16.9091 6.00102 17.0216 6.00003 17.1354C5.99904 17.2492 6.02073 17.3621 6.06383 17.4674C6.10693 17.5728 6.17057 17.6685 6.25105 17.7489C6.33153 17.8294 6.42723 17.8931 6.53257 17.9362C6.63791 17.9793 6.75078 18.001 6.86459 18C6.9784 17.999 7.09088 17.9753 7.19545 17.9304C7.30003 17.8855 7.39461 17.8202 7.47368 17.7383L12.0105 13.2015L16.5474 17.7383C16.709 17.8945 16.9256 17.9809 17.1503 17.9789C17.375 17.9769 17.59 17.8868 17.7489 17.7279C17.9079 17.569 17.998 17.354 18 17.1292C18.0019 16.9045 17.9155 16.688 17.7594 16.5263L13.2225 11.9895Z" fill="#ffffff"/>
-</svg>

src/img/close.svg

@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.2225 11.9895L17.7594 7.45261C17.9155 7.29095 18.0019 7.07443 18 6.84969C17.998 6.62495 17.9079 6.40997 17.7489 6.25105C17.59 6.09213 17.375 6.00199 17.1503 6.00003C16.9256 5.99808 16.709 6.08447 16.5474 6.24061L12.0105 10.7775L7.47368 6.24061C7.31202 6.08447 7.0955 5.99808 6.87076 6.00003C6.64602 6.00199 6.43104 6.09213 6.27212 6.25105C6.1132 6.40997 6.02305 6.62495 6.0211 6.84969C6.01914 7.07443 6.10554 7.29095 6.26168 7.45261L10.7985 11.9895L6.26168 16.5263C6.17981 16.6054 6.11451 16.7 6.06959 16.8045C6.02467 16.9091 6.00102 17.0216 6.00003 17.1354C5.99904 17.2492 6.02073 17.3621 6.06383 17.4674C6.10693 17.5728 6.17057 17.6685 6.25105 17.7489C6.33153 17.8294 6.42723 17.8931 6.53257 17.9362C6.63791 17.9793 6.75078 18.001 6.86459 18C6.9784 17.999 7.09088 17.9753 7.19545 17.9304C7.30003 17.8855 7.39461 17.8202 7.47368 17.7383L12.0105 13.2015L16.5474 17.7383C16.709 17.8945 16.9256 17.9809 17.1503 17.9789C17.375 17.9769 17.59 17.8868 17.7489 17.7279C17.9079 17.569 17.998 17.354 18 17.1292C18.0019 16.9045 17.9155 16.688 17.7594 16.5263L13.2225 11.9895Z" fill="black"/>
-</svg>