Skip to content

Commit 91e99dc

Browse files
authored
Merge branch 'main' into dbajpeyi/refactor/decouple-import-meta
2 parents 2562c00 + 0e27a05 commit 91e99dc

File tree

14 files changed

+110
-110
lines changed

14 files changed

+110
-110
lines changed

injected/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
"@rollup/plugin-commonjs": "^28.0.2",
4343
"@rollup/plugin-node-resolve": "^16.0.0",
4444
"@rollup/plugin-replace": "^6.0.2",
45-
"@types/chrome": "^0.0.306",
45+
"@types/chrome": "^0.0.308",
4646
"@types/jasmine": "^5.1.7",
47-
"@types/node": "^22.13.5",
47+
"@types/node": "^22.13.9",
4848
"@typescript-eslint/eslint-plugin": "^8.20.0",
4949
"fast-check": "^3.23.2",
5050
"jasmine": "^5.6.0",

package-lock.json

Lines changed: 68 additions & 67 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
"stylelint-config-standard": "^34.0.0",
4646
"stylelint-csstree-validator": "^3.0.0",
4747
"typedoc": "^0.27.9",
48-
"typescript": "^5.7.3",
49-
"typescript-eslint": "^8.25.0"
48+
"typescript": "^5.8.2",
49+
"typescript-eslint": "^8.26.0"
5050
},
5151
"dependencies": {
5252
"immutable-json-patch": "^6.0.1"

special-pages/pages/onboarding/app/components/v3/ElasticButton.module.css

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@
2323
letter-spacing: 0.06px;
2424
line-height: var(--btn-line-height);
2525

26-
white-space: nowrap;
27-
28-
height: var(--btn-height);
26+
height: 100%;
27+
min-height: var(--btn-height);
2928
padding: calc(10 * var(--px-in-rem)) var(--sp-6);
3029

3130
color: white;

special-pages/pages/onboarding/app/components/v3/SingleStep.module.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
.buttonBarContents {
5252
display: grid;
5353
gap: var(--sp-2);
54-
grid-template-columns: 1fr min-content min-content;
54+
grid-template-columns: 1fr auto auto;
5555
grid-template-areas: ". dismiss accept";
5656

5757
[data-platform-name="windows"] & {

special-pages/pages/onboarding/public/locales/de/onboarding.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@
321321
"note" : "Title for importing user data (bookmarks, passwords) to DuckDuckGo from other browsers."
322322
},
323323
"row_import_summary_v3" : {
324-
"title" : "Die Verschlüsselung auf dem Gerät sorgt für den Schutz deiner Passwörter.",
324+
"title" : "Die On-Device-Verschlüsselung schützt deine Passwörter.",
325325
"note" : "Explanation of additional security benefits of importing user's passwords into DuckDuckGo."
326326
},
327327
"row_import_accept_v3" : {
@@ -353,19 +353,19 @@
353353
"note" : "The description of a browser privacy feature in the comparison table."
354354
},
355355
"comparison_blockCookies" : {
356-
"title" : "Cookie-Anfragen und Popups blocken",
356+
"title" : "Cookie-Anfragen und Pop-ups blockieren",
357357
"note" : "The description of a browser privacy feature in the comparison table."
358358
},
359359
"comparison_blockAds" : {
360-
"title" : "Gezielte Werbung blockieren",
360+
"title" : "Tracking-Anzeigen blockieren",
361361
"note" : "The description of a browser privacy feature in the comparison table."
362362
},
363363
"comparison_eraseData" : {
364-
"title" : "Browserdaten schnell löschen",
364+
"title" : "Browsing-Daten mit einem Klick löschen",
365365
"note" : "The description of a browser privacy feature in the comparison table."
366366
},
367367
"comparison_privateYoutube" : {
368-
"title" : "YouTube ohne gezielte Werbung",
368+
"title" : "YouTube ohne gezielte Werbung abspielen",
369369
"note" : "The description of a browser privacy feature in the comparison table."
370370
},
371371
"comparison_fullSupport" : {

special-pages/pages/onboarding/public/locales/en/onboarding.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -358,15 +358,15 @@
358358
"note": "The description of a browser privacy feature in the comparison table."
359359
},
360360
"comparison_blockAds": {
361-
"title": "Block targeted ads",
361+
"title": "Block tracking ads",
362362
"note": "The description of a browser privacy feature in the comparison table."
363363
},
364364
"comparison_eraseData": {
365-
"title": "Erase browsing data swiftly",
365+
"title": "Delete browsing data with one button",
366366
"note": "The description of a browser privacy feature in the comparison table."
367367
},
368368
"comparison_privateYoutube": {
369-
"title": "YouTube without targeted ads",
369+
"title": "Play YouTube without targeted ads",
370370
"note": "The description of a browser privacy feature in the comparison table."
371371
},
372372
"comparison_fullSupport": {

0 commit comments

Comments
 (0)