Selaa lähdekoodia

Переход на иконки line-awesome

Book Pauk 5 vuotta sitten
vanhempi
commit
74ccd4a001

+ 1 - 1
client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue

@@ -25,7 +25,7 @@
         <div v-show="mode == 'omnireader'">
             <p>Вы можете добавить в свой браузер закладку, указав в ее свойствах вместо адреса следующий код:
                 <br><strong>javascript:location.href='https://omnireader.ru/?url='+location.href;</strong>
-                <q-icon class="copy-icon" name="o_file_copy" @click="copyText('javascript:location.href=\'https://omnireader.ru/?url=\'+location.href;', 'Код для адреса закладки успешно скопирован в буфер обмена')">
+                <q-icon class="copy-icon" name="la la-copy" @click="copyText('javascript:location.href=\'https://omnireader.ru/?url=\'+location.href;', 'Код для адреса закладки успешно скопирован в буфер обмена')">
                     <q-tooltip :delay="1000" anchor="top middle" self="center middle" content-style="font-size: 80%">Скопировать</q-tooltip>                    
                 </q-icon>
 

+ 4 - 4
client/components/Reader/HelpPage/DonateHelpPage/DonateHelpPage.vue

@@ -6,7 +6,7 @@
                 <img class="logo" src="./assets/yandex.png">
                 <q-btn class="q-ml-sm q-px-sm" dense no-caps @click="donateYandexMoney">Пожертвовать</q-btn><br>
                 <div class="para">{{ yandexAddress }}
-                    <q-icon class="copy-icon" name="o_file_copy" @click="copyAddress(yandexAddress, 'Яндекс кошелек')">
+                    <q-icon class="copy-icon" name="la la-copy" @click="copyAddress(yandexAddress, 'Яндекс кошелек')">
                         <q-tooltip :delay="1000" anchor="top middle" self="center middle" content-style="font-size: 80%">Скопировать</q-tooltip>                    
                     </q-icon>
                 </div>
@@ -15,7 +15,7 @@
             <div class="address">                
                 <img class="logo" src="./assets/bitcoin.png">
                 <div class="para">{{ bitcoinAddress }}
-                    <q-icon class="copy-icon" name="o_file_copy" @click="copyAddress(bitcoinAddress, 'Bitcoin-адрес')">
+                    <q-icon class="copy-icon" name="la la-copy" @click="copyAddress(bitcoinAddress, 'Bitcoin-адрес')">
                         <q-tooltip :delay="1000" anchor="top middle" self="center middle" content-style="font-size: 80%">Скопировать</q-tooltip>                    
                     </q-icon>
                 </div>
@@ -24,7 +24,7 @@
             <div class="address">                
                 <img class="logo" src="./assets/litecoin.png">
                 <div class="para">{{ litecoinAddress }}
-                    <q-icon class="copy-icon" name="o_file_copy" @click="copyAddress(litecoinAddress, 'Litecoin-адрес')">
+                    <q-icon class="copy-icon" name="la la-copy" @click="copyAddress(litecoinAddress, 'Litecoin-адрес')">
                         <q-tooltip :delay="1000" anchor="top middle" self="center middle" content-style="font-size: 80%">Скопировать</q-tooltip>                    
                     </q-icon>
                 </div>
@@ -33,7 +33,7 @@
             <div class="address">                
                 <img class="logo" src="./assets/monero.png">
                 <div class="para">{{ moneroAddress }}
-                    <q-icon class="copy-icon" name="o_file_copy" @click="copyAddress(moneroAddress, 'Monero-адрес')">
+                    <q-icon class="copy-icon" name="la la-copy" @click="copyAddress(moneroAddress, 'Monero-адрес')">
                         <q-tooltip :delay="1000" anchor="top middle" self="center middle" content-style="font-size: 80%">Скопировать</q-tooltip>                    
                     </q-icon>
                 </div>

+ 1 - 1
client/components/Reader/LoaderPage/LoaderPage.vue

@@ -14,7 +14,7 @@
         <div class="col-auto column justify-start items-center no-wrap overflow-hidden">
             <q-input ref="input" class="full-width q-px-xs" style="max-width: 700px" outlined dense bg-color="white" v-model="bookUrl" placeholder="URL книги">
                 <template v-slot:append>
-                    <q-btn round dense flat icon="o_done" @click="submitUrl"/>
+                    <q-btn round dense flat icon="la la-check" @click="submitUrl"/>
                 </template>
             </q-input>
 

+ 12 - 12
client/components/Reader/Reader.vue

@@ -3,57 +3,57 @@
         <div ref="header" class="header" v-show="toolBarActive">
             <div ref="buttons" class="row justify-between no-wrap">
                 <button ref="loader" class="tool-button" :class="buttonActiveClass('loader')" @click="buttonClick('loader')" v-ripple>
-                    <q-icon name="o_arrow_back" size="30px"/>
+                    <q-icon name="la la-arrow-left" size="30px"/>
                     <q-tooltip :delay="1500" anchor="bottom right" content-style="font-size: 80%">Загрузить книгу</q-tooltip>
                 </button>
 
                 <div>
                     <button ref="undoAction" v-show="showToolButton['undoAction']" class="tool-button" :class="buttonActiveClass('undoAction')" @click="buttonClick('undoAction')" v-ripple>
-                        <q-icon name="o_arrow_back_ios" size="25px"/>
+                        <q-icon name="la la-angle-left" size="30px"/>
                         <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">Действие назад</q-tooltip>
                     </button>
                     <button ref="redoAction" v-show="showToolButton['redoAction']" class="tool-button" :class="buttonActiveClass('redoAction')" @click="buttonClick('redoAction')" v-ripple>
-                        <q-icon name="o_arrow_forward_ios" size="25px"/>
+                        <q-icon name="la la-angle-right" size="30px"/>
                         <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">Действие вперед</q-tooltip>
                     </button>
                     <div class="space"></div>
                     <button ref="fullScreen" v-show="showToolButton['fullScreen']" class="tool-button" :class="buttonActiveClass('fullScreen')" @click="buttonClick('fullScreen')" v-ripple>
-                        <q-icon :name="(fullScreenActive ? 'o_fullscreen_exit': 'o_fullscreen')" size="38px"/>
+                        <q-icon :name="(fullScreenActive ? 'la la-compress-arrows-alt': 'la la-expand-arrows-alt')" size="30px"/>
                         <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">На весь экран</q-tooltip>
                     </button>
                     <button ref="scrolling" v-show="showToolButton['scrolling']" class="tool-button" :class="buttonActiveClass('scrolling')" @click="buttonClick('scrolling')" v-ripple>
-                        <q-icon name="o_line_weight" size="32px"/>
+                        <q-icon name="la la-film" size="32px"/>
                         <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">Плавный скроллинг</q-tooltip>
                     </button>
                     <button ref="setPosition" v-show="showToolButton['setPosition']" class="tool-button" :class="buttonActiveClass('setPosition')" @click="buttonClick('setPosition')" v-ripple>
-                        <q-icon name="o_fast_forward" size="34px"/>
+                        <q-icon name="la la-angle-double-right" size="30px"/>
                         <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">На страницу</q-tooltip>
                     </button>
                     <button ref="search" v-show="showToolButton['search']" class="tool-button" :class="buttonActiveClass('search')" @click="buttonClick('search')" v-ripple>
-                        <q-icon name="o_search" size="34px"/>
+                        <q-icon name="la la-search" size="30px"/>
                         <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">Найти в тексте</q-tooltip>
                     </button>
                     <button ref="copyText" v-show="showToolButton['copyText']" class="tool-button" :class="buttonActiveClass('copyText')" @click="buttonClick('copyText')" v-ripple>
-                        <q-icon name="o_open_in_new" size="34px"/>
+                        <q-icon name="la la-external-link-square-alt" size="34px"/>
                         <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">Скопировать текст со страницы</q-tooltip>
                     </button>
                     <button ref="refresh" v-show="showToolButton['refresh']" class="tool-button" :class="buttonActiveClass('refresh')" @click="buttonClick('refresh')" v-ripple>
-                        <q-icon name="o_sync" size="34px"/>
+                        <q-icon name="la la-sync" size="30px"/>
                         <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">Принудительно обновить книгу в обход кэша</q-tooltip>
                     </button>
                     <div class="space"></div>
                     <button ref="offlineMode" v-show="showToolButton['offlineMode']" class="tool-button" :class="buttonActiveClass('offlineMode')" @click="buttonClick('offlineMode')" v-ripple>
-                        <q-icon name="o_link_off" size="32px"/>
+                        <q-icon name="la la-unlink" size="30px"/>
                         <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">Автономный режим (без интернета)</q-tooltip>
                     </button>
                     <button ref="recentBooks" v-show="showToolButton['recentBooks']" class="tool-button" :class="buttonActiveClass('recentBooks')" @click="buttonClick('recentBooks')" v-ripple>
-                        <q-icon name="o_library_books" size="32px"/>
+                        <q-icon name="la la-book-open" size="32px"/>
                         <q-tooltip :delay="1500" anchor="bottom middle" content-style="font-size: 80%">Открыть недавние</q-tooltip>
                     </button>
                 </div>
 
                 <button ref="settings" class="tool-button" :class="buttonActiveClass('settings')" @click="buttonClick('settings')" v-ripple>
-                    <q-icon name="o_settings" size="30px"/>
+                    <q-icon name="la la-cog" size="32px"/>
                     <q-tooltip :delay="1500" anchor="bottom left" content-style="font-size: 80%">Настроить</q-tooltip>
                 </button>
             </div>

+ 2 - 6
client/components/Reader/SearchPage/SearchPage.vue

@@ -18,8 +18,8 @@
                 <div style="position: absolute; right: 10px; margin-top: 10px; font-size: 16px;">{{ foundText }}</div>
             </div>
             <q-btn-group v-show="!initStep" class="button-group row no-wrap">
-                <q-btn class="button" dense stretch @click="showNext"><q-icon class="icon" name="o_expand_more" dense size="30px"/></q-btn>
-                <q-btn class="button" dense stretch @click="showPrev"><q-icon class="icon" name="o_expand_less" dense size="30px"/></q-btn>
+                <q-btn class="button" dense stretch @click="showNext"><q-icon style="top: -6px" name="la la-angle-down" dense size="22px"/></q-btn>
+                <q-btn class="button" dense stretch @click="showPrev"><q-icon style="top: -4px" class="icon" name="la la-angle-up" dense size="22px"/></q-btn>
             </q-btn-group>
         </div>
     </Window>
@@ -212,8 +212,4 @@ class SearchPage extends Vue {
     padding: 9px 17px 9px 17px;
     width: 50px;
 }
-
-.icon {
-    top: -9px;
-}
 </style>

+ 1 - 1
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, 'Загрузка шрифта &nbsp;<i class="material-icons-outlined icon-rotate" style="font-size: 150%">grade</i>');
+                close = notify.info(this, 'Загрузка шрифта &nbsp;<i class="la la-snowflake icon-rotate" style="font-size: 150%"></i>');
         })();
 
         if (!this.fontsLoaded)

+ 1 - 1
client/components/share/Window.vue

@@ -5,7 +5,7 @@
                 <div ref="header" class="header row justify-end" @mousedown.prevent.stop="onMouseDown"
                     @touchstart.stop="onTouchStart" @touchend.stop="onTouchEnd" @touchmove.stop="onTouchMove">
                     <span class="header-text col"><slot name="header"></slot></span>
-                    <span class="close-button row justify-center items-center" @mousedown.stop @click="close"><q-icon name="o_close" size="18px"/></span>
+                    <span class="close-button row justify-center items-center" @mousedown.stop @click="close"><q-icon name="la la-times" size="16px"/></span>
                 </div>
 
                 <slot></slot>

+ 4 - 4
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});
 }

+ 5 - 1
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);