Merge pull request #13 from twofas/bugfix/1.4.4_safari

Bugfix/1.4.4 safari
This commit is contained in:
Greg Zajac 2023-07-25 14:51:48 +02:00 committed by GitHub
commit f82f73cfa7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 97 additions and 56 deletions

View File

@ -498,7 +498,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 28;
CURRENT_PROJECT_VERSION = 29;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = ZY8UR5ADFW;
ENABLE_HARDENED_RUNTIME = YES;
@ -534,7 +534,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 28;
CURRENT_PROJECT_VERSION = 29;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = ZY8UR5ADFW;
ENABLE_HARDENED_RUNTIME = YES;
@ -572,7 +572,7 @@
CODE_SIGN_ENTITLEMENTS = "macOS (App)/2FAS - Two factor authentication.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 28;
CURRENT_PROJECT_VERSION = 29;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = ZY8UR5ADFW;
ENABLE_HARDENED_RUNTIME = YES;
@ -613,7 +613,7 @@
CODE_SIGN_IDENTITY = "Apple Distribution";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 28;
CURRENT_PROJECT_VERSION = 29;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = ZY8UR5ADFW;
ENABLE_HARDENED_RUNTIME = YES;

View File

@ -20,15 +20,17 @@
const browser = require('webextension-polyfill');
const setIcon = async (tabId, active = true, changeTitle = false) => {
const option = process.env.EXT_PLATFORM === 'Safari' ? 'safari' : '';
const iconObj =
active
? {
path: {
16: browser.runtime.getURL('images/icons/icon16.png'),
32: browser.runtime.getURL('images/icons/icon32.png'),
48: browser.runtime.getURL('images/icons/icon48.png'),
96: browser.runtime.getURL('images/icons/icon96.png'),
128: browser.runtime.getURL('images/icons/icon128.png')
16: browser.runtime.getURL(`images/icons/icon16${option}.png`),
32: browser.runtime.getURL(`images/icons/icon32${option}.png`),
48: browser.runtime.getURL(`images/icons/icon48${option}.png`),
96: browser.runtime.getURL(`images/icons/icon96${option}.png`),
128: browser.runtime.getURL(`images/icons/icon128${option}.png`)
},
tabId
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 362 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 676 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 901 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -15,11 +15,11 @@
},
"browser_action": {
"default_icon": {
"16": "images/icons/icon16.png",
"32": "images/icons/icon32.png",
"48": "images/icons/icon48.png",
"96": "images/icons/icon96.png",
"128": "images/icons/icon128.png"
"16": "images/icons/icon16safari.png",
"32": "images/icons/icon32safari.png",
"48": "images/icons/icon48safari.png",
"96": "images/icons/icon96safari.png",
"128": "images/icons/icon128safari.png"
}
},
"options_ui": {

View File

@ -46,46 +46,7 @@
</div>
<div class="twofas-options-page-menu-content js-twofas-options-menu-content">
<nav class="twofas-options-page-menu-nav">
<ul>
<li>
<a href="/optionsPage/optionsPage.html" data-twofas-menu="intro" class="js-twofas-menu-link">
<svg class="icon-intro" width="29" height="25" viewBox="0 0 29 25" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M1.67871 3.60461C1.67871 2.62283 2.44081 1.89307 3.30051 1.89307H25.5569C26.4167 1.89307 27.1787 2.62281 27.1787 3.60461V21.3737C27.1787 22.3556 26.4167 23.0853 25.5569 23.0853H3.30051C2.44079 23.0853 1.67871 22.3555 1.67871 21.3737V3.60461Z" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round" /><path d="M11.8135 7.87354L19.1981 12.4889L11.8135 17.1042V7.87354Z" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round" /></svg>
<span data-i18n="optionsIntro">Intro</span>
</a>
</li>
<li>
<a href="/optionsPage/optionsPage.html" data-twofas-menu="settings" class="active js-twofas-menu-link">
<svg class="icon-settings" xmlns="http://www.w3.org/2000/svg" width="30" height="30"><path d="M14.531 19.762a4.94 4.94 0 0 0 3.494-8.434 4.94 4.94 0 0 0-8.434 3.494 4.94 4.94 0 0 0 4.941 4.941zm0-7.411a2.47 2.47 0 0 1 1.746 4.217 2.47 2.47 0 0 1-4.217-1.747 2.47 2.47 0 0 1 2.47-2.47zM4.032 15.905l-1.235.715a2.47 2.47 0 0 0-.906 3.375l1.839 3.184a2.47 2.47 0 0 0 3.376.907l1.248-.721a1.24 1.24 0 0 1 .624-.16c.218.003.433.062.621.174a1.24 1.24 0 0 1 .447.448c.107.186.164.396.164.611v1.502a2.47 2.47 0 0 0 2.47 2.47h3.706a2.47 2.47 0 0 0 2.47-2.47v-1.504a1.23 1.23 0 0 1 .172-.612c.11-.185.265-.34.451-.448s.398-.165.614-.167a1.25 1.25 0 0 1 .616.157l1.246.719a2.47 2.47 0 0 0 3.374-.904l1.838-3.184a2.47 2.47 0 0 0-.906-3.375l-1.235-.715c-.192-.112-.35-.272-.458-.466s-.163-.412-.159-.634c.001-.216.058-.429.166-.616a1.23 1.23 0 0 1 .452-.451l1.235-.715a2.47 2.47 0 0 0 .906-3.375l-1.84-3.184a2.47 2.47 0 0 0-3.374-.906l-1.248.72c-.188.105-.401.16-.617.158a1.25 1.25 0 0 1-.614-.167c-.187-.108-.342-.263-.451-.449a1.25 1.25 0 0 1-.171-.613V3.705a2.47 2.47 0 0 0-2.47-2.47h-3.706a2.47 2.47 0 0 0-2.47 2.47v1.598c0 .185-.049.367-.142.528s-.226.294-.387.386l-.19.11a1.07 1.07 0 0 1-.527.139c-.185 0-.367-.048-.527-.139l-1.327-.77a2.47 2.47 0 0 0-3.376.905L1.894 9.65a2.47 2.47 0 0 0 .903 3.373l1.235.714a1.25 1.25 0 0 1 .618 1.101 1.23 1.23 0 0 1-.618 1.067zm1.235-4.307l-1.235-.714L5.872 7.7l1.327.766a3.53 3.53 0 0 0 3.52 0l.19-.109c.536-.31.982-.754 1.292-1.29s.475-1.144.476-1.763V3.705h3.706v1.502a3.72 3.72 0 0 0 .501 1.849 3.71 3.71 0 0 0 1.355 1.353c.562.324 1.2.497 1.85.498a3.72 3.72 0 0 0 1.852-.489l1.244-.719 1.844 3.184-1.235.714a3.73 3.73 0 0 0-1.353 1.366 3.74 3.74 0 0 0 0 3.716 3.74 3.74 0 0 0 1.353 1.366l1.235.715-1.838 3.184-1.25-.719c-.564-.322-1.203-.491-1.852-.489s-1.287.173-1.85.498-1.03.792-1.355 1.354-.498 1.199-.501 1.849v1.502h-3.706v-1.502a3.71 3.71 0 0 0-.5-1.85c-.326-.562-.793-1.029-1.356-1.354a3.71 3.71 0 0 0-3.703-.007l-1.244.719-1.844-3.184 1.235-.715a3.73 3.73 0 0 0 1.353-1.366 3.74 3.74 0 0 0 0-3.716 3.74 3.74 0 0 0-1.353-1.366z"/></svg>
<span data-i18n="optionsSettings">Settings</span>
</a>
</li>
<li>
<a href="https://2fas.com/" target="_blank" rel="noreferrer noopener" class="twofas-new-tab-link">
<svg class="icon-newpage" xmlns="http://www.w3.org/2000/svg" width="30" height="30" fill="none" stroke-width="2.444" stroke-linecap="round"><path d="M26 11.333V4h-7.333m-2.063 3.667H6.444C5.094 7.667 4 8.761 4 10.111v13.444C4 24.906 5.094 26 6.444 26h13.444c1.35 0 2.444-1.094 2.444-2.444v-10.16"/><path d="M26 4L12.555 17.444"/></svg>
<span data-i18n="optionsAbout">About 2FAS</span>
</a>
</li>
<li>
<a href="https://2fas.com/donate" target="_blank" rel="noreferrer noopener" class="twofas-new-tab-link">
<svg class="icon-donate" width="28" height="25" viewBox="0 0 15 13" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M7.27986 12.8463L6.57986 12.1813C5.34552 11.0496 4.32469 10.0731 3.51736 9.2518C2.82702 8.56076 2.1839 7.8241 1.59236 7.0468C1.17777 6.51241 0.838595 5.92356 0.584357 5.2968C0.389765 4.78443 0.286699 4.24185 0.279857 3.6938C0.265542 3.2066 0.351341 2.72165 0.531945 2.26893C0.71255 1.81621 0.98412 1.40537 1.32986 1.0618C1.67064 0.717237 2.0785 0.446266 2.52821 0.265659C2.97792 0.0850527 3.45991 -0.00134765 3.94436 0.0118047C4.58977 0.006647 5.22542 0.169479 5.78886 0.484305C6.38231 0.816666 6.89222 1.27989 7.27986 1.8388C7.6962 1.26907 8.22662 0.792279 8.83736 0.438805C9.38017 0.146161 9.98821 -0.0043453 10.6049 0.00130475C11.0893 -0.0118476 11.5713 0.0745528 12.021 0.25516C12.4707 0.435766 12.8786 0.706737 13.2194 1.0513C13.5651 1.39487 13.8367 1.80571 14.0173 2.25843C14.1979 2.71115 14.2837 3.1961 14.2694 3.6833C14.2691 4.22729 14.1707 4.76677 13.9789 5.2758C13.7283 5.90363 13.3901 6.49281 12.9744 7.0258C12.3837 7.80382 11.7405 8.54054 11.0494 9.2308C10.2444 10.0568 9.22352 11.0345 7.98686 12.1638L7.27986 12.8463Z" /></svg>
<span data-i18n="optionsDonate" class="icon-donate-text">Donate</span>
</a>
</li>
<li>
<a href="https://support.2fas.com" target="_blank" rel="noreferrer noopener" class="twofas-new-tab-link">
<svg class="icon-support" width="28" height="28" viewBox="0 0 34 34" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M29.6594 7.79236C28.6964 6.46694 27.5332 5.30029 26.2077 4.34074C23.6259 2.45615 20.4435 1.34473 17.0023 1.34473C13.561 1.34473 10.3751 2.45615 7.79334 4.34074C6.47136 5.30374 5.30472 6.46694 4.34171 7.79236C2.45713 10.3776 1.3457 13.56 1.3457 17.0013C1.3457 20.4426 2.45713 23.625 4.34171 26.2068C5.30472 27.5322 6.47136 28.6954 7.79334 29.6584C10.3751 31.543 13.5575 32.6544 17.0023 32.6544C20.447 32.6544 23.6259 31.543 26.2077 29.6584C27.5332 28.6988 28.6998 27.5322 29.6594 26.2068C31.544 23.625 32.6554 20.4426 32.6554 17.0013C32.6554 13.56 31.544 10.3776 29.6594 7.79236ZM20.5333 23.9839C19.4736 24.5224 18.2725 24.8261 17.0023 24.8261C15.7321 24.8261 14.5309 24.5224 13.4713 23.9805C11.9836 23.2349 10.7686 22.0199 10.0162 20.5323C9.47773 19.4727 9.17398 18.2715 9.17398 17.0013C9.17398 15.7311 9.47773 14.5299 10.0162 13.4668C10.7686 11.9792 11.9836 10.7642 13.4713 10.0187C14.5309 9.47675 15.7321 9.17301 17.0023 9.17301C18.2725 9.17301 19.4736 9.47675 20.5333 10.0152C22.0209 10.7677 23.2324 11.9792 23.9849 13.4668C24.5234 14.5299 24.8271 15.7311 24.8271 17.0013C24.8271 18.2715 24.5234 19.4727 23.9849 20.5323C23.2324 22.0199 22.0209 23.2315 20.5333 23.9839Z" stroke-width="3" stroke-miterlimit="10" stroke-linecap="round"/>
<path d="M27.2077 27.6588L22.5332 22.9844" stroke-width="3" stroke-miterlimit="10" stroke-linecap="round"/>
<path d="M11.0488 11.5L6.3418 6.79297" stroke-width="3" stroke-miterlimit="10" stroke-linecap="round"/>
<path d="M11.4709 22.9805L6.79297 27.6584" stroke-width="3" stroke-miterlimit="10" stroke-linecap="round"/>
<path d="M27.6588 6.79297L22.9844 11.4674" stroke-width="3" stroke-miterlimit="10" stroke-linecap="round"/>
</svg>
<span data-i18n="2fasSupport">2FAS Support</span>
</a>
</li>
</ul>
</nav>
<%= require.context('html-loader!../views/menuViews', false, MENU_VIEW_REGEXP)(MENU_VIEW_FILENAME).default %>
<div class="twofas-options-page-menu-social">
<ul>

View File

@ -0,0 +1,40 @@
<nav class="twofas-options-page-menu-nav">
<ul>
<li>
<a href="/optionsPage/optionsPage.html" data-twofas-menu="intro" class="js-twofas-menu-link">
<svg class="icon-intro" width="29" height="25" viewBox="0 0 29 25" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M1.67871 3.60461C1.67871 2.62283 2.44081 1.89307 3.30051 1.89307H25.5569C26.4167 1.89307 27.1787 2.62281 27.1787 3.60461V21.3737C27.1787 22.3556 26.4167 23.0853 25.5569 23.0853H3.30051C2.44079 23.0853 1.67871 22.3555 1.67871 21.3737V3.60461Z" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round" /><path d="M11.8135 7.87354L19.1981 12.4889L11.8135 17.1042V7.87354Z" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round" /></svg>
<span data-i18n="optionsIntro">Intro</span>
</a>
</li>
<li>
<a href="/optionsPage/optionsPage.html" data-twofas-menu="settings" class="active js-twofas-menu-link">
<svg class="icon-settings" xmlns="http://www.w3.org/2000/svg" width="30" height="30"><path d="M14.531 19.762a4.94 4.94 0 0 0 3.494-8.434 4.94 4.94 0 0 0-8.434 3.494 4.94 4.94 0 0 0 4.941 4.941zm0-7.411a2.47 2.47 0 0 1 1.746 4.217 2.47 2.47 0 0 1-4.217-1.747 2.47 2.47 0 0 1 2.47-2.47zM4.032 15.905l-1.235.715a2.47 2.47 0 0 0-.906 3.375l1.839 3.184a2.47 2.47 0 0 0 3.376.907l1.248-.721a1.24 1.24 0 0 1 .624-.16c.218.003.433.062.621.174a1.24 1.24 0 0 1 .447.448c.107.186.164.396.164.611v1.502a2.47 2.47 0 0 0 2.47 2.47h3.706a2.47 2.47 0 0 0 2.47-2.47v-1.504a1.23 1.23 0 0 1 .172-.612c.11-.185.265-.34.451-.448s.398-.165.614-.167a1.25 1.25 0 0 1 .616.157l1.246.719a2.47 2.47 0 0 0 3.374-.904l1.838-3.184a2.47 2.47 0 0 0-.906-3.375l-1.235-.715c-.192-.112-.35-.272-.458-.466s-.163-.412-.159-.634c.001-.216.058-.429.166-.616a1.23 1.23 0 0 1 .452-.451l1.235-.715a2.47 2.47 0 0 0 .906-3.375l-1.84-3.184a2.47 2.47 0 0 0-3.374-.906l-1.248.72c-.188.105-.401.16-.617.158a1.25 1.25 0 0 1-.614-.167c-.187-.108-.342-.263-.451-.449a1.25 1.25 0 0 1-.171-.613V3.705a2.47 2.47 0 0 0-2.47-2.47h-3.706a2.47 2.47 0 0 0-2.47 2.47v1.598c0 .185-.049.367-.142.528s-.226.294-.387.386l-.19.11a1.07 1.07 0 0 1-.527.139c-.185 0-.367-.048-.527-.139l-1.327-.77a2.47 2.47 0 0 0-3.376.905L1.894 9.65a2.47 2.47 0 0 0 .903 3.373l1.235.714a1.25 1.25 0 0 1 .618 1.101 1.23 1.23 0 0 1-.618 1.067zm1.235-4.307l-1.235-.714L5.872 7.7l1.327.766a3.53 3.53 0 0 0 3.52 0l.19-.109c.536-.31.982-.754 1.292-1.29s.475-1.144.476-1.763V3.705h3.706v1.502a3.72 3.72 0 0 0 .501 1.849 3.71 3.71 0 0 0 1.355 1.353c.562.324 1.2.497 1.85.498a3.72 3.72 0 0 0 1.852-.489l1.244-.719 1.844 3.184-1.235.714a3.73 3.73 0 0 0-1.353 1.366 3.74 3.74 0 0 0 0 3.716 3.74 3.74 0 0 0 1.353 1.366l1.235.715-1.838 3.184-1.25-.719c-.564-.322-1.203-.491-1.852-.489s-1.287.173-1.85.498-1.03.792-1.355 1.354-.498 1.199-.501 1.849v1.502h-3.706v-1.502a3.71 3.71 0 0 0-.5-1.85c-.326-.562-.793-1.029-1.356-1.354a3.71 3.71 0 0 0-3.703-.007l-1.244.719-1.844-3.184 1.235-.715a3.73 3.73 0 0 0 1.353-1.366 3.74 3.74 0 0 0 0-3.716 3.74 3.74 0 0 0-1.353-1.366z"/></svg>
<span data-i18n="optionsSettings">Settings</span>
</a>
</li>
<li>
<a href="https://2fas.com/" target="_blank" rel="noreferrer noopener" class="twofas-new-tab-link">
<svg class="icon-newpage" xmlns="http://www.w3.org/2000/svg" width="30" height="30" fill="none" stroke-width="2.444" stroke-linecap="round"><path d="M26 11.333V4h-7.333m-2.063 3.667H6.444C5.094 7.667 4 8.761 4 10.111v13.444C4 24.906 5.094 26 6.444 26h13.444c1.35 0 2.444-1.094 2.444-2.444v-10.16"/><path d="M26 4L12.555 17.444"/></svg>
<span data-i18n="optionsAbout">About 2FAS</span>
</a>
</li>
<li>
<a href="https://2fas.com/donate" target="_blank" rel="noreferrer noopener" class="twofas-new-tab-link">
<svg class="icon-donate" width="28" height="25" viewBox="0 0 15 13" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M7.27986 12.8463L6.57986 12.1813C5.34552 11.0496 4.32469 10.0731 3.51736 9.2518C2.82702 8.56076 2.1839 7.8241 1.59236 7.0468C1.17777 6.51241 0.838595 5.92356 0.584357 5.2968C0.389765 4.78443 0.286699 4.24185 0.279857 3.6938C0.265542 3.2066 0.351341 2.72165 0.531945 2.26893C0.71255 1.81621 0.98412 1.40537 1.32986 1.0618C1.67064 0.717237 2.0785 0.446266 2.52821 0.265659C2.97792 0.0850527 3.45991 -0.00134765 3.94436 0.0118047C4.58977 0.006647 5.22542 0.169479 5.78886 0.484305C6.38231 0.816666 6.89222 1.27989 7.27986 1.8388C7.6962 1.26907 8.22662 0.792279 8.83736 0.438805C9.38017 0.146161 9.98821 -0.0043453 10.6049 0.00130475C11.0893 -0.0118476 11.5713 0.0745528 12.021 0.25516C12.4707 0.435766 12.8786 0.706737 13.2194 1.0513C13.5651 1.39487 13.8367 1.80571 14.0173 2.25843C14.1979 2.71115 14.2837 3.1961 14.2694 3.6833C14.2691 4.22729 14.1707 4.76677 13.9789 5.2758C13.7283 5.90363 13.3901 6.49281 12.9744 7.0258C12.3837 7.80382 11.7405 8.54054 11.0494 9.2308C10.2444 10.0568 9.22352 11.0345 7.98686 12.1638L7.27986 12.8463Z" /></svg>
<span data-i18n="optionsDonate" class="icon-donate-text">Donate</span>
</a>
</li>
<li>
<a href="https://support.2fas.com" target="_blank" rel="noreferrer noopener" class="twofas-new-tab-link">
<svg class="icon-support" width="28" height="28" viewBox="0 0 34 34" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M29.6594 7.79236C28.6964 6.46694 27.5332 5.30029 26.2077 4.34074C23.6259 2.45615 20.4435 1.34473 17.0023 1.34473C13.561 1.34473 10.3751 2.45615 7.79334 4.34074C6.47136 5.30374 5.30472 6.46694 4.34171 7.79236C2.45713 10.3776 1.3457 13.56 1.3457 17.0013C1.3457 20.4426 2.45713 23.625 4.34171 26.2068C5.30472 27.5322 6.47136 28.6954 7.79334 29.6584C10.3751 31.543 13.5575 32.6544 17.0023 32.6544C20.447 32.6544 23.6259 31.543 26.2077 29.6584C27.5332 28.6988 28.6998 27.5322 29.6594 26.2068C31.544 23.625 32.6554 20.4426 32.6554 17.0013C32.6554 13.56 31.544 10.3776 29.6594 7.79236ZM20.5333 23.9839C19.4736 24.5224 18.2725 24.8261 17.0023 24.8261C15.7321 24.8261 14.5309 24.5224 13.4713 23.9805C11.9836 23.2349 10.7686 22.0199 10.0162 20.5323C9.47773 19.4727 9.17398 18.2715 9.17398 17.0013C9.17398 15.7311 9.47773 14.5299 10.0162 13.4668C10.7686 11.9792 11.9836 10.7642 13.4713 10.0187C14.5309 9.47675 15.7321 9.17301 17.0023 9.17301C18.2725 9.17301 19.4736 9.47675 20.5333 10.0152C22.0209 10.7677 23.2324 11.9792 23.9849 13.4668C24.5234 14.5299 24.8271 15.7311 24.8271 17.0013C24.8271 18.2715 24.5234 19.4727 23.9849 20.5323C23.2324 22.0199 22.0209 23.2315 20.5333 23.9839Z" stroke-width="3" stroke-miterlimit="10" stroke-linecap="round"/>
<path d="M27.2077 27.6588L22.5332 22.9844" stroke-width="3" stroke-miterlimit="10" stroke-linecap="round"/>
<path d="M11.0488 11.5L6.3418 6.79297" stroke-width="3" stroke-miterlimit="10" stroke-linecap="round"/>
<path d="M11.4709 22.9805L6.79297 27.6584" stroke-width="3" stroke-miterlimit="10" stroke-linecap="round"/>
<path d="M27.6588 6.79297L22.9844 11.4674" stroke-width="3" stroke-miterlimit="10" stroke-linecap="round"/>
</svg>
<span data-i18n="2fasSupport">2FAS Support</span>
</a>
</li>
</ul>
</nav>

View File

@ -0,0 +1,34 @@
<nav class="twofas-options-page-menu-nav">
<ul>
<li>
<a href="/optionsPage/optionsPage.html" data-twofas-menu="intro" class="js-twofas-menu-link">
<svg class="icon-intro" width="29" height="25" viewBox="0 0 29 25" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M1.67871 3.60461C1.67871 2.62283 2.44081 1.89307 3.30051 1.89307H25.5569C26.4167 1.89307 27.1787 2.62281 27.1787 3.60461V21.3737C27.1787 22.3556 26.4167 23.0853 25.5569 23.0853H3.30051C2.44079 23.0853 1.67871 22.3555 1.67871 21.3737V3.60461Z" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round" /><path d="M11.8135 7.87354L19.1981 12.4889L11.8135 17.1042V7.87354Z" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round" /></svg>
<span data-i18n="optionsIntro">Intro</span>
</a>
</li>
<li>
<a href="/optionsPage/optionsPage.html" data-twofas-menu="settings" class="active js-twofas-menu-link">
<svg class="icon-settings" xmlns="http://www.w3.org/2000/svg" width="30" height="30"><path d="M14.531 19.762a4.94 4.94 0 0 0 3.494-8.434 4.94 4.94 0 0 0-8.434 3.494 4.94 4.94 0 0 0 4.941 4.941zm0-7.411a2.47 2.47 0 0 1 1.746 4.217 2.47 2.47 0 0 1-4.217-1.747 2.47 2.47 0 0 1 2.47-2.47zM4.032 15.905l-1.235.715a2.47 2.47 0 0 0-.906 3.375l1.839 3.184a2.47 2.47 0 0 0 3.376.907l1.248-.721a1.24 1.24 0 0 1 .624-.16c.218.003.433.062.621.174a1.24 1.24 0 0 1 .447.448c.107.186.164.396.164.611v1.502a2.47 2.47 0 0 0 2.47 2.47h3.706a2.47 2.47 0 0 0 2.47-2.47v-1.504a1.23 1.23 0 0 1 .172-.612c.11-.185.265-.34.451-.448s.398-.165.614-.167a1.25 1.25 0 0 1 .616.157l1.246.719a2.47 2.47 0 0 0 3.374-.904l1.838-3.184a2.47 2.47 0 0 0-.906-3.375l-1.235-.715c-.192-.112-.35-.272-.458-.466s-.163-.412-.159-.634c.001-.216.058-.429.166-.616a1.23 1.23 0 0 1 .452-.451l1.235-.715a2.47 2.47 0 0 0 .906-3.375l-1.84-3.184a2.47 2.47 0 0 0-3.374-.906l-1.248.72c-.188.105-.401.16-.617.158a1.25 1.25 0 0 1-.614-.167c-.187-.108-.342-.263-.451-.449a1.25 1.25 0 0 1-.171-.613V3.705a2.47 2.47 0 0 0-2.47-2.47h-3.706a2.47 2.47 0 0 0-2.47 2.47v1.598c0 .185-.049.367-.142.528s-.226.294-.387.386l-.19.11a1.07 1.07 0 0 1-.527.139c-.185 0-.367-.048-.527-.139l-1.327-.77a2.47 2.47 0 0 0-3.376.905L1.894 9.65a2.47 2.47 0 0 0 .903 3.373l1.235.714a1.25 1.25 0 0 1 .618 1.101 1.23 1.23 0 0 1-.618 1.067zm1.235-4.307l-1.235-.714L5.872 7.7l1.327.766a3.53 3.53 0 0 0 3.52 0l.19-.109c.536-.31.982-.754 1.292-1.29s.475-1.144.476-1.763V3.705h3.706v1.502a3.72 3.72 0 0 0 .501 1.849 3.71 3.71 0 0 0 1.355 1.353c.562.324 1.2.497 1.85.498a3.72 3.72 0 0 0 1.852-.489l1.244-.719 1.844 3.184-1.235.714a3.73 3.73 0 0 0-1.353 1.366 3.74 3.74 0 0 0 0 3.716 3.74 3.74 0 0 0 1.353 1.366l1.235.715-1.838 3.184-1.25-.719c-.564-.322-1.203-.491-1.852-.489s-1.287.173-1.85.498-1.03.792-1.355 1.354-.498 1.199-.501 1.849v1.502h-3.706v-1.502a3.71 3.71 0 0 0-.5-1.85c-.326-.562-.793-1.029-1.356-1.354a3.71 3.71 0 0 0-3.703-.007l-1.244.719-1.844-3.184 1.235-.715a3.73 3.73 0 0 0 1.353-1.366 3.74 3.74 0 0 0 0-3.716 3.74 3.74 0 0 0-1.353-1.366z"/></svg>
<span data-i18n="optionsSettings">Settings</span>
</a>
</li>
<li>
<a href="https://2fas.com/" target="_blank" rel="noreferrer noopener" class="twofas-new-tab-link">
<svg class="icon-newpage" xmlns="http://www.w3.org/2000/svg" width="30" height="30" fill="none" stroke-width="2.444" stroke-linecap="round"><path d="M26 11.333V4h-7.333m-2.063 3.667H6.444C5.094 7.667 4 8.761 4 10.111v13.444C4 24.906 5.094 26 6.444 26h13.444c1.35 0 2.444-1.094 2.444-2.444v-10.16"/><path d="M26 4L12.555 17.444"/></svg>
<span data-i18n="optionsAbout">About 2FAS</span>
</a>
</li>
<li>
<a href="https://support.2fas.com" target="_blank" rel="noreferrer noopener" class="twofas-new-tab-link">
<svg class="icon-support" width="28" height="28" viewBox="0 0 34 34" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M29.6594 7.79236C28.6964 6.46694 27.5332 5.30029 26.2077 4.34074C23.6259 2.45615 20.4435 1.34473 17.0023 1.34473C13.561 1.34473 10.3751 2.45615 7.79334 4.34074C6.47136 5.30374 5.30472 6.46694 4.34171 7.79236C2.45713 10.3776 1.3457 13.56 1.3457 17.0013C1.3457 20.4426 2.45713 23.625 4.34171 26.2068C5.30472 27.5322 6.47136 28.6954 7.79334 29.6584C10.3751 31.543 13.5575 32.6544 17.0023 32.6544C20.447 32.6544 23.6259 31.543 26.2077 29.6584C27.5332 28.6988 28.6998 27.5322 29.6594 26.2068C31.544 23.625 32.6554 20.4426 32.6554 17.0013C32.6554 13.56 31.544 10.3776 29.6594 7.79236ZM20.5333 23.9839C19.4736 24.5224 18.2725 24.8261 17.0023 24.8261C15.7321 24.8261 14.5309 24.5224 13.4713 23.9805C11.9836 23.2349 10.7686 22.0199 10.0162 20.5323C9.47773 19.4727 9.17398 18.2715 9.17398 17.0013C9.17398 15.7311 9.47773 14.5299 10.0162 13.4668C10.7686 11.9792 11.9836 10.7642 13.4713 10.0187C14.5309 9.47675 15.7321 9.17301 17.0023 9.17301C18.2725 9.17301 19.4736 9.47675 20.5333 10.0152C22.0209 10.7677 23.2324 11.9792 23.9849 13.4668C24.5234 14.5299 24.8271 15.7311 24.8271 17.0013C24.8271 18.2715 24.5234 19.4727 23.9849 20.5323C23.2324 22.0199 22.0209 23.2315 20.5333 23.9839Z" stroke-width="3" stroke-miterlimit="10" stroke-linecap="round"/>
<path d="M27.2077 27.6588L22.5332 22.9844" stroke-width="3" stroke-miterlimit="10" stroke-linecap="round"/>
<path d="M11.0488 11.5L6.3418 6.79297" stroke-width="3" stroke-miterlimit="10" stroke-linecap="round"/>
<path d="M11.4709 22.9805L6.79297 27.6584" stroke-width="3" stroke-miterlimit="10" stroke-linecap="round"/>
<path d="M27.6588 6.79297L22.9844 11.4674" stroke-width="3" stroke-miterlimit="10" stroke-linecap="round"/>
</svg>
<span data-i18n="2fasSupport">2FAS Support</span>
</a>
</li>
</ul>
</nav>

View File

@ -113,7 +113,9 @@ const optionsPageDevConfig = {
OPTIONS_VIEW_FILENAME: process.env.EXT_PLATFORM === 'Safari' ? JSON.stringify('./safari.html') : process.env.EXT_PLATFORM === 'Firefox' ? JSON.stringify('./firefox.html') : JSON.stringify('./normal.html'),
OPTIONS_VIEW_REGEXP: process.env.EXT_PLATFORM === 'Safari' ? /safari\.html$/ : process.env.EXT_PLATFORM === 'Firefox' ? /firefox\.html$/ : /normal\.html$/,
PININFO_VIEW_FILENAME: JSON.stringify(`./${process.env.EXT_PLATFORM.toLowerCase()}.html`),
PININFO_VIEW_REGEXP: BrowserRegExps[process.env.EXT_PLATFORM.toLowerCase()]
PININFO_VIEW_REGEXP: BrowserRegExps[process.env.EXT_PLATFORM.toLowerCase()],
MENU_VIEW_FILENAME: process.env.EXT_PLATFORM === 'Safari' ? JSON.stringify('./safari.html') : JSON.stringify('./normal.html'),
MENU_VIEW_REGEXP: process.env.EXT_PLATFORM === 'Safari' ? /safari\.html$/ : /normal\.html$/
}),
new HtmlWebpackPlugin({
chunks: ['optionsPage', 'optionsPageStyles', 'contentPageStyles'],

View File

@ -118,7 +118,9 @@ const optionsPageProdConfig = {
OPTIONS_VIEW_FILENAME: process.env.EXT_PLATFORM === 'Safari' ? JSON.stringify('./safari.html') : process.env.EXT_PLATFORM === 'Firefox' ? JSON.stringify('./firefox.html') : JSON.stringify('./normal.html'),
OPTIONS_VIEW_REGEXP: process.env.EXT_PLATFORM === 'Safari' ? /safari\.html$/ : process.env.EXT_PLATFORM === 'Firefox' ? /firefox\.html$/ : /normal\.html$/,
PININFO_VIEW_FILENAME: JSON.stringify(`./${process.env.EXT_PLATFORM.toLowerCase()}.html`),
PININFO_VIEW_REGEXP: BrowserRegExps[process.env.EXT_PLATFORM.toLowerCase()]
PININFO_VIEW_REGEXP: BrowserRegExps[process.env.EXT_PLATFORM.toLowerCase()],
MENU_VIEW_FILENAME: process.env.EXT_PLATFORM === 'Safari' ? JSON.stringify('./safari.html') : JSON.stringify('./normal.html'),
MENU_VIEW_REGEXP: process.env.EXT_PLATFORM === 'Safari' ? /safari\.html$/ : /normal\.html$/
}),
new HtmlWebpackPlugin({
chunks: ['optionsPage', 'optionsPageStyles', 'contentPageStyles'],