Skip to content

Commit

Permalink
Merge branch 'master' into 1.23.x
Browse files Browse the repository at this point in the history
  • Loading branch information
PalmerAL committed Feb 18, 2022
2 parents c1fc809 + a296f03 commit 475513b
Show file tree
Hide file tree
Showing 10 changed files with 597 additions and 293 deletions.
9 changes: 2 additions & 7 deletions css/newTabPage.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,9 @@ body:not(.is-ntp) #ntp-content {
#ntp-background {
/*max-height: max(100%, 72vw);*/
width: 100%;
min-width: 150vh;
max-width: 100vw;
position: absolute;
top: -99999px;
left: -99999px;
right: -99999px;
bottom: -99999px;
height: 100%;
margin: auto;
object-fit: cover;
}

#ntp-background-controls {
Expand Down
4 changes: 3 additions & 1 deletion js/preload/siteUnbreak.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ if (process.isMainFrame) {
`)
}

if ((window.location.hostname === 'google.com' || window.location.hostname.endsWith('.google.com')) && window.location.hostname !== 'hangouts.google.com') {
if ((window.location.hostname === 'google.com' || window.location.hostname.endsWith('.google.com')) && window.location.hostname !== 'hangouts.google.com' && window.location.hostname !== 'drive.google.com') {
/* define window.chrome
this is necessary because some websites (such as the Google Drive file viewer, see issue #378) check for a
Chrome user agent, and then do things like if(chrome.<module>) {}
Expand All @@ -30,6 +30,8 @@ if ((window.location.hostname === 'google.com' || window.location.hostname.endsW
However, if window.chrome exists, hangouts will attempt to connect to an extension and break
(https://github.com/minbrowser/min/issues/1051)
so don't enable it there
As of 2/7/22, this also breaks drive, so disable it there also
*/

scriptsToRun.push(`
Expand Down
2 changes: 2 additions & 0 deletions js/searchbar/bangsPlugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,8 @@ function initialize () {
registerCustomBang({
phrase: `!${bang.phrase}`,
snippet: `${bang.snippet}` ?? '',
// isAction: true - skip search text entry if the bang does not include a search parameter
isAction: !bang.redirect.includes('%s'),
fn: function (text) {
searchbar.openURL(bang.redirect.replace('%s', encodeURIComponent(text)))
}
Expand Down
2 changes: 1 addition & 1 deletion localization/languages/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@
"passwordManagerSetupStep2": "Затем перетащите инструмент в поле ниже:",
"passwordManagerSetupDragBox": "Перетащите инструмент сюда",
"passwordManagerSetupInstalling": "Установка...",
"passwordManagerBitwardenSignIn": null, //missing translation
"passwordManagerBitwardenSignIn": "Чтобы подключить свою учетную запись Bitwarden, перейдите на страницу vault.bitwarden.com/#/settings/account, прокрутите вниз и выберите \"Показать ключ API\". Затем вставьте значения в поля ниже.",
"passwordManagerSetupSignIn": "Войдите в свой менеджер паролей, чтобы начать использовать автозаполнение. Ваши учетные данные не будут храниться где-либо внутри Min.",
"disableAutofill": "Отключить автозаполнение",
"passwordManagerSetupUnlockError": "Не удалось разблокировать хранилище паролей: ",
Expand Down
291 changes: 291 additions & 0 deletions localization/languages/sr.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion localization/languages/uk.json
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@
"passwordManagerSetupStep2": "Потім перетягніть інструмент у поле нижче:",
"passwordManagerSetupDragBox": "Перетягніть інструмент сюди",
"passwordManagerSetupInstalling": "Встановлення...",
"passwordManagerBitwardenSignIn": null, //missing translation
"passwordManagerBitwardenSignIn": "Щоб підключити свій обліковий запис Bitwarden, перейдіть на сторінку vault.bitwarden.com/#/settings/account, прокрутіть униз і виберіть \"Переглянути ключ API\". Потім вставте значення в поля нижче.",
"passwordManagerSetupSignIn": "Увійдіть до менеджера паролів, щоб почати використовувати автозаповнення. Ваші облікові дані не зберігатимуться ніде в межах Min.",
"disableAutofill": "Вимкнути автозаповнення",
"passwordManagerSetupUnlockError": "Не вдалося розблокувати сховище паролів: ",
Expand Down
560 changes: 283 additions & 277 deletions localization/languages/vi.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"name": "min",
"productName": "Min",
"author": "PalmerAL",
"version": "1.23.0",
"version": "1.23.1",
"description": "A fast, minimal browser that protects your privacy",
"electronVersion": "16.0.7",
"electronVersion": "16.0.9",
"main": "main.build.js",
"standard": {
"globals": [
Expand Down Expand Up @@ -47,7 +47,7 @@
"chokidar": "^3.4.0",
"concurrently": "^5.2.0",
"decomment": "^0.9.0",
"electron": "^16.0.7",
"electron": "16.0.9",
"electron-installer-windows": "^3.0.0",
"electron-packager": "^15.1.0",
"electron-rebuild": "^3.2.7",
Expand Down
12 changes: 10 additions & 2 deletions reader/readerContent.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ body,
html {
padding: 0;
margin: 0;
font-size: 19.5px;
font-size: 19px;
color: rgb(15, 15, 15);
}

Expand Down Expand Up @@ -202,8 +202,16 @@ th li {
text-align: left;
}

sup {
/* https://css-tricks.com/snippets/css/prevent-superscripts-and-subscripts-from-affecting-line-height/ */
sup, sub {
font-size: 0.75em;
vertical-align: baseline;
position: relative;
top: -0.4em;
}

sub {
top: 0.4em;
}

/* printing */
Expand Down
2 changes: 1 addition & 1 deletion scripts/createPackage.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const ignoredDirs = [
'localization/',
// parts of modules that aren't needed
'node_modules/@types/',
'node_modules/pdfjs-dist/es5',
'node_modules/pdfjs-dist/legacy',
'node_modules/pdfjs-dist/lib',
/node_modules\/[^/\n]+\/test\//g
]
Expand Down

0 comments on commit 475513b

Please sign in to comment.