diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index edd8f240..7f1074c7 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -55,7 +55,7 @@ further defined and clarified by project maintainers. ## Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at github@muetab.xyz. All +reported by contacting the project team at hello@muetab.com. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a99eb640..4cd0530d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,7 +23,7 @@ Here's some quick bullet points as to what your code should be like on Mue: ### Features We prefer it if you implement features from our [projects board](https://github.com/mue/mue/projects). However, if you have an idea feel free to let us know first via a GitHub issue or our Discord server (see README for invite). Here's a quick list of things to look out for: -* External APIs - Please refrain from requesting to servers not on the ``muetab.xyz``, ``derpyenterprises.org`` or ``duckduckgo.com`` domains. Whenever possible, try to create +* External APIs - Please refrain from requesting to servers not on the ``muetab.com``, ``derpyenterprises.org`` or ``duckduckgo.com`` domains. Whenever possible, try to create a "proxy" API service for requests to go through. Pull requests involving paid APIs or heavily limited free plans will be denied. * Clones - Please don't go blatantly copying features from the alternative extensions out there unless you have written permission from the original author of the project. Inspired features are fine. diff --git a/README.md b/README.md index 065985f0..e74cb52c 100644 --- a/README.md +++ b/README.md @@ -143,6 +143,4 @@ Please see our [roadmap](https://github.com/mue/mue/projects) [Opera Forum](https://forums.opera.com/topic/25046/how-to-disable-completely-the-speed-dial/14) - Portions of code to add Opera support -[Google Fonts](https://fonts.google.com) - Lexend Deca and Roboto fonts - And many thanks to [Highholding](https://discord.bio/p/highholding), [Noa Shapira](#), [Roee Lupo](https://github.com/RoeeLupo), [Jeroen](#), [Glasvegas](https://twitter.com/_glasvegas), [Anders](https://github.com/FuryingFox), [Oded Shapira](https://twitter.com/dondishdev), Jacob Tyrrell and [Nikka Lai](#) for letting us use their wonderful photographs diff --git a/package.json b/package.json index e8e3036f..9a0440dd 100644 --- a/package.json +++ b/package.json @@ -1,16 +1,16 @@ { "name": "mue", "private": true, - "author": "David \"ohlookitsderpy\" Ralph (https://derpyenterprises.org)", + "author": "David \"ohlookitsderpy\" Ralph (https://derpyenterprises.org)", "maintainers": [ - "David \"ohlookitsderpy\" Ralph (https://derpyenterprises.org)", - "Alex \"TurboMarshmello\" Sparkes (https://github.com/alexsparkes)" + "David \"ohlookitsderpy\" Ralph (https://derpyenterprises.org)", + "Alex \"TurboMarshmello\" Sparkes (https://github.com/alexsparkes)" ], "description": "Fast, open and free-to-use new tab page for most modern browsers.", "repository": { "url": "github:mue/mue" }, - "homepage": "https://muetab.xyz", + "homepage": "https://muetab.com", "bugs": "https://github.com/mue/mue/issues/new?assignees=&labels=bug&template=bug-report.md&title=%5BBUG%5D", "license": "BSD-3-Clause", "version": "4.2.1", @@ -18,6 +18,8 @@ "@material-ui/core": "4.11.0", "@material-ui/icons": "4.9.1", "@muetab/quotes": "^1.0.0", + "fontsource-lexend-deca": "^3.0.10", + "fontsource-roboto": "^3.0.3", "lodash.merge": "4.6.2", "react": "16.14.0", "react-clock": "^2.4.0", @@ -27,7 +29,7 @@ "supports-webp": "2.0.1" }, "devDependencies": { - "react-scripts": "3.4.4", + "react-scripts": "4.0.0", "node-sass": "^4.14.1" }, "scripts": { diff --git a/public/fonts/LexendDeca-Regular.woff2 b/public/fonts/LexendDeca-Regular.woff2 deleted file mode 100644 index d5651fff..00000000 Binary files a/public/fonts/LexendDeca-Regular.woff2 and /dev/null differ diff --git a/public/fonts/Roboto-Cyrillic.woff2 b/public/fonts/Roboto-Cyrillic.woff2 deleted file mode 100644 index de226b37..00000000 Binary files a/public/fonts/Roboto-Cyrillic.woff2 and /dev/null differ diff --git a/src/index.js b/src/index.js index edb71b8b..db69523f 100644 --- a/src/index.js +++ b/src/index.js @@ -5,6 +5,9 @@ import App from './App'; import './scss/index.scss'; import 'react-toastify/dist/ReactToastify.css'; // the toast css is based on default so we need to import it +import 'fontsource-lexend-deca/latin-400-normal.css'; +import 'fontsource-roboto/cyrillic-400-normal.css'; + ReactDOM.render( , document.getElementById('root') diff --git a/src/scss/index.scss b/src/scss/index.scss index cacb701b..c1bf5b4d 100644 --- a/src/scss/index.scss +++ b/src/scss/index.scss @@ -29,16 +29,6 @@ body { outline: none; } -@font-face { - font-family: 'Lexend Deca'; - src: url('/./fonts/LexendDeca-Regular.woff2') format('woff2'); -} - -@font-face { - font-family: 'Roboto'; - src: url('/./fonts/Roboto-Cyrillic.woff2') format('woff2'); -} - #center { margin-left: 2vw; margin-right: 2vw; diff --git a/src/translations/ru.json b/src/translations/ru.json index 6b02608f..eb4494ab 100644 --- a/src/translations/ru.json +++ b/src/translations/ru.json @@ -32,7 +32,9 @@ }, "quote": { "title": "Цитата", - "copy": "Кнопка копирования" + "copy": "Кнопка копирования", + "tweet": "Кнопка твита", + "favourite": "Кнопка для оценки" }, "background": { "title": "Фон", @@ -43,18 +45,25 @@ "custom_background": "Пользовательский фон", "custom_colour": "Пользовательский цвет фона", "upload": "Загрузить", - "add_colour": "Добавить цвет" + "add_colour": "Добавить цвет", + "favourite": "Любимые", + "view": "Просмотр", + "refresh": "Обновить", + "disabled": "Выключен" }, "searchbar": { "title": "Панель поиска", - "search_engine": "Поисковый движок" + "searchengine": "Поисковый движок", + "custom": "Пользовательский поисковый движок" }, "offline": "Офлайн режим", "dark": "Тёмная тема", "experimental": { "title": "Экспериментальные настройки", "webp": "Включить WebP", - "animations": "Анимации" + "animations": "Анимации", + "voicesearch": "Поиск голосом", + "nightmode": "Автоматический ночной режим" }, "language": "Язык", "apply": "Применить", @@ -72,14 +81,17 @@ "title": "Ошибка", "content": "Не удалось подключиться к серверу" }, - "loading": "Загрузка..." + "loading": "Загрузка...", + "readblog": "Прочитайте об изменениях в блоге", + "contactsupport": "Связаться с нами" }, "toasts": { "quote": "Цитата скопирована!", "reset": "Сброшено!", "installed": "Успешно установлено", "removed": "Успешно удалено", - "error": "Что-то пошло не так" + "error": "Что-то пошло не так", + "imported": "Успешно импортировано" }, "marketplace": { "photo_packs": "Наборы фото", @@ -99,6 +111,10 @@ "buttons": { "addtomue": "Добавить в Mue", "remove": "Удалить" + }, + "quoteWarning": { + "title": "Предупреждение", + "description": "Этот пакет цитат обращается к внешнему серверу и может отслеживать вас!" } }, "offline": { @@ -113,6 +129,7 @@ "title": "Здесь пусто", "description": "Зайдите в магазин, чтобы найти что-то интересное.", "button": "Перейти" - } + }, + "sideload": "Загрузить" } }