From 74ccd4a0013c460b0decb6d1c710640193a76233 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Wed, 5 Feb 2020 15:27:26 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=85=D0=BE=D0=B4=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BA=D0=B8=20line-awes?= =?UTF-8?q?ome?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommonHelpPage/CommonHelpPage.vue | 2 +- .../DonateHelpPage/DonateHelpPage.vue | 8 +++---- .../Reader/LoaderPage/LoaderPage.vue | 2 +- client/components/Reader/Reader.vue | 24 +++++++++---------- .../Reader/SearchPage/SearchPage.vue | 8 ++----- .../components/Reader/TextPage/TextPage.vue | 2 +- client/components/share/Window.vue | 2 +- client/components/share/notify.js | 8 +++---- client/quasar.js | 6 ++++- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue b/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue index d4880edf..4e0ea557 100644 --- a/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue +++ b/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue @@ -25,7 +25,7 @@

Вы можете добавить в свой браузер закладку, указав в ее свойствах вместо адреса следующий код:
javascript:location.href='https://omnireader.ru/?url='+location.href; - + Скопировать diff --git a/client/components/Reader/HelpPage/DonateHelpPage/DonateHelpPage.vue b/client/components/Reader/HelpPage/DonateHelpPage/DonateHelpPage.vue index 380d0ce4..044cff35 100644 --- a/client/components/Reader/HelpPage/DonateHelpPage/DonateHelpPage.vue +++ b/client/components/Reader/HelpPage/DonateHelpPage/DonateHelpPage.vue @@ -6,7 +6,7 @@ Пожертвовать

{{ yandexAddress }} - + Скопировать
@@ -15,7 +15,7 @@
{{ bitcoinAddress }} - + Скопировать
@@ -24,7 +24,7 @@
{{ litecoinAddress }} - + Скопировать
@@ -33,7 +33,7 @@
{{ moneroAddress }} - + Скопировать
diff --git a/client/components/Reader/LoaderPage/LoaderPage.vue b/client/components/Reader/LoaderPage/LoaderPage.vue index fb4e25fb..10014025 100644 --- a/client/components/Reader/LoaderPage/LoaderPage.vue +++ b/client/components/Reader/LoaderPage/LoaderPage.vue @@ -14,7 +14,7 @@
diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue index cc2543cc..8efe6831 100644 --- a/client/components/Reader/Reader.vue +++ b/client/components/Reader/Reader.vue @@ -3,57 +3,57 @@
diff --git a/client/components/Reader/SearchPage/SearchPage.vue b/client/components/Reader/SearchPage/SearchPage.vue index d0ef2f60..08396b88 100644 --- a/client/components/Reader/SearchPage/SearchPage.vue +++ b/client/components/Reader/SearchPage/SearchPage.vue @@ -18,8 +18,8 @@
{{ foundText }}
- - + +
@@ -212,8 +212,4 @@ class SearchPage extends Vue { padding: 9px 17px 9px 17px; width: 50px; } - -.icon { - top: -9px; -} \ No newline at end of file diff --git a/client/components/Reader/TextPage/TextPage.vue b/client/components/Reader/TextPage/TextPage.vue index 857ba7ef..38c64827 100644 --- a/client/components/Reader/TextPage/TextPage.vue +++ b/client/components/Reader/TextPage/TextPage.vue @@ -284,7 +284,7 @@ class TextPage extends Vue { (async() => { await sleep(500); if (this.fontsLoading) - close = notify.info(this, 'Загрузка шрифта  grade'); + close = notify.info(this, 'Загрузка шрифта  '); })(); if (!this.fontsLoaded) diff --git a/client/components/share/Window.vue b/client/components/share/Window.vue index 771c9350..af8be10c 100644 --- a/client/components/share/Window.vue +++ b/client/components/share/Window.vue @@ -5,7 +5,7 @@
- +
diff --git a/client/components/share/notify.js b/client/components/share/notify.js index de7c81cc..e9b8a13a 100644 --- a/client/components/share/notify.js +++ b/client/components/share/notify.js @@ -15,7 +15,7 @@ export function notify(vue, opts) { color, textColor: iconColor, icon, - actions: [{icon: 'o_close', color: 'black'}], + actions: [{icon: 'la la-times', color: 'black'}], html: true, message: @@ -27,13 +27,13 @@ export function notify(vue, opts) { } export function success(vue, message, caption) { - notify(vue, {color: 'positive', icon: 'o_check_circle', message, caption}); + notify(vue, {color: 'positive', icon: 'la la-check-circle', message, caption}); } export function error(vue, message, caption) { - notify(vue, {color: 'negative', icon: 'o_error_outline', messageColor: 'yellow', message, caption}); + notify(vue, {color: 'negative', icon: 'la la-exclamation-circle', messageColor: 'yellow', message, caption}); } export function info(vue, message, caption) { - notify(vue, {color: 'info', icon: 'o_notifications', message, caption}); + notify(vue, {color: 'info', icon: 'la la-bell', message, caption}); } diff --git a/client/quasar.js b/client/quasar.js index f7e9ae5f..c78baf62 100644 --- a/client/quasar.js +++ b/client/quasar.js @@ -65,7 +65,11 @@ Vue.use(Quasar, { config, components, directives, plugins }); //icons //import '@quasar/extras/material-icons/material-icons.css'; -import '@quasar/extras/material-icons-outlined/material-icons-outlined.css'; +//import '@quasar/extras/material-icons-outlined/material-icons-outlined.css'; //import '@quasar/extras/fontawesome-v5/fontawesome-v5.css'; + +//import '@quasar/extras/material-icons-outlined/material-icons-outlined.css'; +import '@quasar/extras/line-awesome/line-awesome.css'; + //import fontawesomeV5 from 'quasar/icon-set/fontawesome-v5.js' //Quasar.iconSet.set(fontawesomeV5);