Skip to content

Update to 2.3.5 and fix settings #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AuroraWright wants to merge 1 commit into
base: safari-web-extension
Choose a base branch
from
Open

Update to 2.3.5 and fix settings #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion safari_web_extension/MultiSubs/Shared (Extension)/Resources/background.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion safari_web_extension/MultiSubs/Shared (Extension)/Resources/content.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions safari_web_extension/MultiSubs/Shared (Extension)/Resources/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"short_name": "NflxMultiSubs",
"description": "Bilingual Subtitles for Netflix",
"version": "2.4.3",
"version": "2.4.4",
"name": "NflxMultiSubs",
"manifest_version": 2,
"author": "WingCH",
Expand All @@ -16,7 +16,8 @@
]
},
"browser_action": {
"default_icon": "icon-gray.png"
"default_icon": "icon-gray.png",
"default_popup": "settings.html"
},
"icons": {
"16": "icon16.png",
Expand All @@ -43,4 +44,4 @@
"web_accessible_resources": [
"nflxmultisubs.min.js"
]
}
}
2 changes: 1 addition & 1 deletion safari_web_extension/MultiSubs/Shared (Extension)/Resources/nflxmultisubs.min.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions safari_web_extension/MultiSubs/Shared (Extension)/Resources/nflxmultisubs.min.js.LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!

JSZip v3.7.1 - A JavaScript class for generating and reading zip files
JSZip v3.10.1 - A JavaScript class for generating and reading zip files
<http://stuartk.com/jszip>

(c) 2009-2016 Stuart Knightley <stuart [at] stuartk.com>
Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/master/LICENSE.markdown.
Dual licenced under the MIT license or GPLv3. See https://raw.github.com/Stuk/jszip/main/LICENSE.markdown.

JSZip uses the library pako released under the MIT license :
https://github.com/nodeca/pako/blob/master/LICENSE
https://github.com/nodeca/pako/blob/main/LICENSE
*/
53 changes: 41 additions & 12 deletions safari_web_extension/MultiSubs/Shared (Extension)/Resources/settings.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ html, body {
padding: 0;
outline: 0;
user-select: none;
overflow: hidden;
}

.wrapper {
Expand Down Expand Up @@ -140,28 +141,40 @@ footer {

.font-size {
position: relative;
height: 30px;
width: 30px;
height: 25px;
width: 25px;
border: 2px solid hsl(0, 0%, 70%);
color: hsl(0, 0%, 30%);
border-radius: 21px;
font-weight: bold;
background-color: hsl(0, 0%, 98%);
border-radius: 25px;
font-size: 25px;
font-weight: normal;
align-items: stretch;
display: inline-flex;
flex-direction: column;
justify-content: center;
text-align: center;
}
.font-size-indicator {
height: 35px;
width: 35px;
border: 1px solid hsl(0, 0%, 70%);
background-color: hsl(0, 0%, 100%);
border-radius: 10px;
}
.font-size + .font-size {
margin-left: 10px;
margin-left: 7px;
}

.font-size:hover,
.font-size.active {
.action:hover{
border-color: hsl(0, 70%, 50%);
color: hsl(0, 70%, 50%);
cursor: pointer;
}
.action:active {
border-color: hsl(0, 84%, 80%);
color: hsl(0, 91%, 86%);
}

.settings-secondary-lang div span {
visibility: hidden;
Expand Down Expand Up @@ -242,8 +255,24 @@ footer {
border-color: #5e5e5e transparent transparent transparent;
}

.font-size-xs { font-size: 9px; }
.font-size-s { font-size: 11px; }
.font-size-m { font-size: 13px; }
.font-size-l { font-size: 15px; }
.font-size-xl { font-size: 17px; }
#primary-color-ff .picker_wrapper {
width: 230px;
left: -100px;
margin-top: 5px;
}

#secondary-color-ff .picker_wrapper {
width: 230px;
left: -100px;
margin-bottom: 60px;
}

#primary-color-ff .picker_arrow,
#secondary-color-ff .picker_arrow {
visibility: hidden;
}

#primary-color-ff .picker_wrapper.popup,
#secondary-color-ff .picker_wrapper.popup {
box-shadow: 0 0 10px 1px rgb(0 0 0 / 80%);
}
20 changes: 8 additions & 12 deletions safari_web_extension/MultiSubs/Shared (Extension)/Resources/settings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,13 @@ <h2>Layout</h2>
<h2>Primary Subtitles</h2>
<p>Size</p>
<div class="font-size-list">
<div data-id="0" class="font-size font-size-xs">字</div>
<div data-id="1" class="font-size font-size-s">字</div>
<div data-id="2" class="font-size font-size-m">字</div>
<div data-id="3" class="font-size font-size-l">字</div>
<div data-id="4" class="font-size font-size-xl">字</div>
<div id="primary-minus" class="action font-size">－</div>
<div class="font-size-indicator font-size"><div id="primary-font-indicator">A</div></div>
<div id="primary-plus" class="action font-size">＋</div>
</div>
<p>Text color</p>
<div class="tooltip">
<div class="font-color">
<div class="font-color" id="primary-color-ff">
<input type="color" id="primary-color">
<span>Currently only for text subtitles. Image-subs will be white.</span>
</div>
Expand All @@ -58,15 +56,13 @@ <h2>Primary Subtitles</h2>
<h2>Secondary Subtitles</h2>
<p>Size</p>
<div class="font-size-list">
<div data-id="0" class="font-size font-size-xs">A</div>
<div data-id="1" class="font-size font-size-s">A</div>
<div data-id="2" class="font-size font-size-m">A</div>
<div data-id="3" class="font-size font-size-l">A</div>
<div data-id="4" class="font-size font-size-xl">A</div>
<div id="secondary-minus" class="action font-size">－</div>
<div class="font-size-indicator font-size"><div id="secondary-font-indicator">A</div></div>
<div id="secondary-plus" class="action font-size">＋</div>
</div>
<p>Text color</p>
<div class="tooltip">
<div class="font-color">
<div class="font-color" id="secondary-color-ff">
<input type="color" id="secondary-color">
<span>Currently only for text subtitles. Image-subs will be white.</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion safari_web_extension/MultiSubs/Shared (Extension)/Resources/settings.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions safari_web_extension/Step.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ npm install
npm run build
```

Patch the settings code to work with Safari:

```
LC_ALL=C sed -i '.bak' 's/chrome\.runtime/browser.runtime/g' src/*.js && rm src/*.bak
```

If the xcode project has not been generated before, use [converter](https://developer.apple.com/documentation/safariservices/safari_web_extensions/converting_a_web_extension_for_safari) to convert chrome extension to safari extension

```
Expand Down
Loading