Skip to content

Commit 53fa339

Browse files
lidellidel
committed
refactor: open Preferences in a new tab
Works, but requires refinement of options HTML page and CSS
1 parent 793bd6c commit 53fa339

File tree

6 files changed

+72
-77
lines changed

6 files changed

+72
-77
lines changed

‎add-on/manifest.common.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
"default_popup": "dist/popup/browser-action/index.html"
2525
},
2626
"options_ui": {
27+
"open_in_tab": true,
28+
"browser_style": false,
2729
"page": "dist/options/options.html"
2830
},
2931
"web_accessible_resources": [

‎add-on/src/options/options.css

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,6 @@
22
@import url('/ui-kit/ipfs.css');
33
@import url('../pages/components/switch-toggle.css');
44

5-
html {
6-
overflow: hidden;
7-
}
8-
.is-chrome body {
9-
margin: 0;
10-
min-width: 650px;
11-
height: 450px;
12-
padding: 15px;
13-
overflow-y: auto;
14-
}
155
form * {
166
font: caption;
177
font-size: 1em;

‎add-on/src/options/options.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<title>Options</title>
4+
<title>IPFS Companion Preferences</title>
55
<meta charset="utf-8">
66
<meta name="viewport" content="width=device-width">
77
<link rel="stylesheet" href="options.css">

‎add-on/src/options/options.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,3 @@ app.route('*', optionsPage)
1515

1616
// Start the application and render it to the given querySelector
1717
app.mount('#root')
18-
19-
// Fix for Chrome in OSX https://github.com/ipfs-shipyard/ipfs-companion/pull/429
20-
if (window.navigator.vendor === 'Google Inc.') {
21-
document.querySelector('html').className = 'is-chrome'
22-
}

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
"webpack-merge": "4.2.2"
121121
},
122122
"dependencies": {
123-
"@material/switch": "4.0.0",
123+
"@material/switch": "6.0.0",
124124
"browser-process-hrtime": "1.0.0",
125125
"choo": "7.0.0",
126126
"chrome-dgram": "3.0.4",
@@ -134,7 +134,7 @@
134134
"http-dns": "3.0.1",
135135
"http-node": "1.2.0",
136136
"ipfs": "0.40.0",
137-
"ipfs-css": "0.13.1",
137+
"ipfs-css": "1.0.0",
138138
"ipfs-http-client": "40.0.1",
139139
"ipfs-http-response": "0.4.0",
140140
"ipfs-postmsg-proxy": "3.1.1",

‎yarn.lock

Lines changed: 67 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,79 +1180,87 @@
11801180
"@hapi/bourne" "1.x.x"
11811181
"@hapi/hoek" "8.x.x"
11821182

1183-
"@material/animation@^4.0.0":
1184-
version "4.0.0"
1185-
resolved "https://registry.yarnpkg.com/@material/animation/-/animation-4.0.0.tgz#19eaf377809f20978f8452a4237d27867d3ffd1d"
1186-
integrity sha512-IfzXzstWdtKQcsNWu+s2Hpz5dBwkTHtgtzoesr+FC7TqENH+SJdsF1ntnZI1XVi2C9ZlBf7f4BSmXpWHD0MIlw==
1183+
"@material/animation@^6.0.0":
1184+
version "6.0.0"
1185+
resolved "https://registry.yarnpkg.com/@material/animation/-/animation-6.0.0.tgz#ec8c8bd48e069bb35bb6aa76d944f89d35cc74fa"
1186+
integrity sha512-BxlzXzQ5W2WtaEVV4/PqkTpKB5PfOUvPmr1EK8+xQ0ouMV4qiWuwBfnu7DgXF+cglpFP3T71uHVYmh6lMdi4vg==
11871187
dependencies:
11881188
tslib "^1.9.3"
11891189

1190-
"@material/base@^4.0.0":
1191-
version "4.0.0"
1192-
resolved "https://registry.yarnpkg.com/@material/base/-/base-4.0.0.tgz#535574d0b63c18892cfb70e88b27bc8f8090677a"
1193-
integrity sha512-vHm7fkqXzjdfxifXvlmaZColoIfKuWmO+1rvdzDORTWP+A8Dq70cgKd2I1SBqxzDGjOasMzHbQI6f9MISQf2vQ==
1190+
"@material/base@^6.0.0":
1191+
version "6.0.0"
1192+
resolved "https://registry.yarnpkg.com/@material/base/-/base-6.0.0.tgz#e1208f9e83a4e8d8c4e17745d9c909aa4aada625"
1193+
integrity sha512-S3rT7B9xa9IfHXIvYXYqbo6YVu9FWbFqTt1tMUCniizTRlpmHu9b5pmQ20f6mm3K3wAFD+crqsrtie2Y8h8r5g==
11941194
dependencies:
11951195
tslib "^1.9.3"
11961196

1197-
"@material/dom@^4.0.0":
1198-
version "4.0.0"
1199-
resolved "https://registry.yarnpkg.com/@material/dom/-/dom-4.0.0.tgz#f0e68c4429e555040304c958bb3e11614276fdfa"
1200-
integrity sha512-GRCJT9+PGWqygZwGf1XLTrbmzP35YWG7+T0hpfhoIJO8VDiMTeyfvhJXFuA2wh9pD0noEjte0lmbdBlykrbWZw==
1197+
"@material/density@^6.0.0":
1198+
version "6.0.0"
1199+
resolved "https://registry.yarnpkg.com/@material/density/-/density-6.0.0.tgz#9731d9b981f9b5fd92780812c8382f144ba2494d"
1200+
integrity sha512-svKiq7XtUg89hf08XGFF46NdiQAZfey5CiatmNxD3WX7LUoCb5zc8K9BqPL63P1Sh6kty9R0AHj+6w4ASFetPA==
1201+
1202+
"@material/dom@^6.0.0":
1203+
version "6.0.0"
1204+
resolved "https://registry.yarnpkg.com/@material/dom/-/dom-6.0.0.tgz#4f59993b65bc1921f680d5b5eb1c1ff084823dda"
1205+
integrity sha512-9hvoi3MxR25dmyv15xJGRS+Ezlr0oD+Y6k4UyAbLpExFP2OakTZc8Xj0Fd7Nwav3I5aIXyC5jJ2gvhZcy1cI9A==
12011206
dependencies:
1207+
"@material/feature-targeting" "^6.0.0"
12021208
tslib "^1.9.3"
12031209

1204-
"@material/elevation@^4.0.0":
1205-
version "4.0.0"
1206-
resolved "https://registry.yarnpkg.com/@material/elevation/-/elevation-4.0.0.tgz#58ba81c8c9efd0b5d3bfed7fa915d4930d814b97"
1207-
integrity sha512-wKffoZcqkwAMWYbfGJJ95RDeOFz/IMvF7ye4VamjUwLb1iPiKxUZKUcd40XpuEvsn794HSIEWfGDsRq7BxJAMQ==
1210+
"@material/elevation@^6.0.0":
1211+
version "6.0.0"
1212+
resolved "https://registry.yarnpkg.com/@material/elevation/-/elevation-6.0.0.tgz#9ebf7c442261e1c59e1e6af0424a0b06515e07df"
1213+
integrity sha512-9WNBu/MKTQX40Ev3ayq5V8Pf/E/DqUPRQO8F0YA99jRWuYScpX2zeJlpRe+wLI6zIxtfFcVvRW9D4O1s1Bmbdg==
12081214
dependencies:
1209-
"@material/animation" "^4.0.0"
1210-
"@material/feature-targeting" "^4.0.0"
1211-
"@material/theme" "^4.0.0"
1215+
"@material/animation" "^6.0.0"
1216+
"@material/base" "^6.0.0"
1217+
"@material/feature-targeting" "^6.0.0"
1218+
"@material/theme" "^6.0.0"
12121219

1213-
"@material/feature-targeting@^4.0.0":
1214-
version "4.0.0"
1215-
resolved "https://registry.yarnpkg.com/@material/feature-targeting/-/feature-targeting-4.0.0.tgz#8d9d1470801a1fd166773731613d9fa89e0fd85e"
1216-
integrity sha512-0gk+f151vqmEdWkrQ9ocPlQRU9aUtSGsVBhletqIbsthLUsZIz9qk25FHjV1wHd/bGHknd9NH+T8ENprv3KLFg==
1220+
"@material/feature-targeting@^6.0.0":
1221+
version "6.0.0"
1222+
resolved "https://registry.yarnpkg.com/@material/feature-targeting/-/feature-targeting-6.0.0.tgz#8dcfc470f3c5b8c7e1bc04bb86b062a640ff03a0"
1223+
integrity sha512-REj9VJnqkGwpngffc/iHGPt8WTF27QFPWDD8VBNXaP+MmnpIu7V5q5JMoozKzG5uk+hVryzam1i2PJHztizDXg==
12171224

1218-
"@material/ripple@^4.0.0":
1219-
version "4.0.0"
1220-
resolved "https://registry.yarnpkg.com/@material/ripple/-/ripple-4.0.0.tgz#906ba421a3e6c68651d829d44c50a95060aa1e75"
1221-
integrity sha512-9BLIOvyCP5sM+fQpLlcJZWyrHguusJq8E5A1pxg0wQwputOyaPBM7recHhYkJmVjzRpTcPgf1PkvkpN6DKGcNg==
1222-
dependencies:
1223-
"@material/animation" "^4.0.0"
1224-
"@material/base" "^4.0.0"
1225-
"@material/dom" "^4.0.0"
1226-
"@material/feature-targeting" "^4.0.0"
1227-
"@material/theme" "^4.0.0"
1225+
"@material/ripple@^6.0.0":
1226+
version "6.0.0"
1227+
resolved "https://registry.yarnpkg.com/@material/ripple/-/ripple-6.0.0.tgz#97e08b79ca9d63fdc2a9383f47576fca0615fc87"
1228+
integrity sha512-z+ARpjBVkRZBhiX20aAxAMrgBcfpcCRqIcI/E3Esfyo7M+q/mm8t92ZumcahxWnOBJkHM55kkpUqHlfkYlfyZQ==
1229+
dependencies:
1230+
"@material/animation" "^6.0.0"
1231+
"@material/base" "^6.0.0"
1232+
"@material/dom" "^6.0.0"
1233+
"@material/feature-targeting" "^6.0.0"
1234+
"@material/theme" "^6.0.0"
12281235
tslib "^1.9.3"
12291236

1230-
"@material/rtl@^4.0.0":
1231-
version "4.0.0"
1232-
resolved "https://registry.yarnpkg.com/@material/rtl/-/rtl-4.0.0.tgz#bc07e0a7c47174b2542862c252b0e35b44329c47"
1233-
integrity sha512-AP8zByVDEWAJVJoxByVccUbH+BX24IeG7ol+L6Qd8JjzPpz1fzPVJ4BeDNaF0a6sXtHsRmj2zN5dsx/BGC3IHg==
1237+
"@material/rtl@^6.0.0":
1238+
version "6.0.0"
1239+
resolved "https://registry.yarnpkg.com/@material/rtl/-/rtl-6.0.0.tgz#e8114194af72f7496ca2fc5b4ee63981c46f5066"
1240+
integrity sha512-/WkzlUm3qylWMqv7Lw7ColZ8DYvEvTXtevxxz7PKM1hT9FNlbO1/Qywvda4VUtXivEeynXEqeT1T/ZYHV9yDVw==
12341241

1235-
"@material/[email protected]":
1236-
version "4.0.0"
1237-
resolved "https://registry.yarnpkg.com/@material/switch/-/switch-4.0.0.tgz#5c5da30389f48f4f5245eb9f325cbc0e5f6bf2d4"
1238-
integrity sha512-90fvz0bYgeGQNBD14rdTOI/dvAPANwDQLIodOpE/r2bOZjge1K0rHSAm+TVwNCnrrM9HGmG8Ew0sIeEIj3jMMw==
1239-
dependencies:
1240-
"@material/animation" "^4.0.0"
1241-
"@material/base" "^4.0.0"
1242-
"@material/dom" "^4.0.0"
1243-
"@material/elevation" "^4.0.0"
1244-
"@material/feature-targeting" "^4.0.0"
1245-
"@material/ripple" "^4.0.0"
1246-
"@material/rtl" "^4.0.0"
1247-
"@material/theme" "^4.0.0"
1242+
"@material/[email protected]":
1243+
version "6.0.0"
1244+
resolved "https://registry.yarnpkg.com/@material/switch/-/switch-6.0.0.tgz#a8253e54fff7d1948e22fdd770cfca4b95665b11"
1245+
integrity sha512-Qpg3ne2MKSLy/vkcUAsWvSZrkuY4QOqo/s1IUKQrjLrDbCS1Al/M7ZUO7ZlKsQyx3sbb9ijEmJwK6lGtn12b3Q==
1246+
dependencies:
1247+
"@material/animation" "^6.0.0"
1248+
"@material/base" "^6.0.0"
1249+
"@material/density" "^6.0.0"
1250+
"@material/dom" "^6.0.0"
1251+
"@material/elevation" "^6.0.0"
1252+
"@material/feature-targeting" "^6.0.0"
1253+
"@material/ripple" "^6.0.0"
1254+
"@material/rtl" "^6.0.0"
1255+
"@material/theme" "^6.0.0"
12481256
tslib "^1.9.3"
12491257

1250-
"@material/theme@^4.0.0":
1251-
version "4.0.0"
1252-
resolved "https://registry.yarnpkg.com/@material/theme/-/theme-4.0.0.tgz#8de388fcdbae20fd09b02a3bdef3049bf2f623a8"
1253-
integrity sha512-vS4G4rusJTatTH50kSYO1U3UGN8EY9kGRvPaFsEFKikJBOqcR6KWK9H9/wCLqqd6nDNifEj9H2sdWw1AV4NA6Q==
1258+
"@material/theme@^6.0.0":
1259+
version "6.0.0"
1260+
resolved "https://registry.yarnpkg.com/@material/theme/-/theme-6.0.0.tgz#35da34965737e556b35670bfe4830de0a6d1ab9a"
1261+
integrity sha512-dViBx1lsidoQhVi/MYksTmDs8aUPj3mPVQIaBPtDRtqpIuWSwG7bCHoY8rG8FHRduPLpq3b1A4OwKHBd0RWVJw==
12541262
dependencies:
1255-
"@material/feature-targeting" "^4.0.0"
1263+
"@material/feature-targeting" "^6.0.0"
12561264

12571265
"@protobufjs/utf8@^1.1.0":
12581266
version "1.1.0"
@@ -7041,10 +7049,10 @@ ipfs-block@^0.8.0, ipfs-block@~0.8.0, ipfs-block@~0.8.1:
70417049
cids "~0.7.0"
70427050
class-is "^1.1.0"
70437051

7044-
ipfs-css@0.13.1:
7045-
version "0.13.1"
7046-
resolved "https://registry.yarnpkg.com/ipfs-css/-/ipfs-css-0.13.1.tgz#f751be9cc89e30c34c50325848233f6da6b6728e"
7047-
integrity sha512-hofJSYVBE3VC3/MOYZKfF66SKuHgnYkhXUmPDS8PISI8ygcljGOyBSSU4Je3dfgZX5UHDBEnzq5XyrTU822EDg==
7052+
ipfs-css@1.0.0:
7053+
version "1.0.0"
7054+
resolved "https://registry.yarnpkg.com/ipfs-css/-/ipfs-css-1.0.0.tgz#a925e681b5badbf3ccca5283206058330d73e75f"
7055+
integrity sha512-R82wX2bliiQBR1nKZqw8LWTCvvk1um94SvIq+9ATpf1bIzvXN0Xs0rnXpUPVU4Nu6kKz6VIiLfLUkm3smcDzhA==
70487056

70497057
[email protected]:
70507058
version "40.0.1"

0 commit comments

Comments
 (0)