From 424fe4d1e9415ec7b610274d14c9ea11e40256a9 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Mon, 3 Feb 2020 01:01:10 +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=20quasar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/App.vue                     |  9 -----
 .../components/Reader/HelpPage/HelpPage.vue   | 34 ++++++-------------
 .../VersionHistoryPage/VersionHistoryPage.vue |  1 +
 client/components/share/Window.vue            |  9 +++++
 client/quasar.js                              |  5 ++-
 5 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/client/components/App.vue b/client/components/App.vue
index 8e1d62a7..6e096a1b 100644
--- a/client/components/App.vue
+++ b/client/components/App.vue
@@ -243,15 +243,6 @@ body, html, #app {
     font: normal 12pt ReaderDefault;
 }
 
-.xyfit {
-    height: 100%;
-    width: 100%;
-}
-
-.flexfit {
-    flex: 1;
-}
-
 .dborder {
     border: 2px solid yellow;
 }
diff --git a/client/components/Reader/HelpPage/HelpPage.vue b/client/components/Reader/HelpPage/HelpPage.vue
index df525e57..e5db63f7 100644
--- a/client/components/Reader/HelpPage/HelpPage.vue
+++ b/client/components/Reader/HelpPage/HelpPage.vue
@@ -4,7 +4,7 @@
             Справка
         </template>
 
-        <div class="col" style="min-width: 600px; display: grid">
+        <div class="col column" style="min-width: 600px">
             <q-btn-toggle
                 v-model="selectedTab"
                 toggle-color="primary"
@@ -17,29 +17,13 @@
                     {label: 'Помочь проекту', value: 'donate'}
                 ]"
             />
-            <q-separator />
+            <div class="separator"></div>
 
-            <q-tab-panels v-model="selectedTab">
-                <q-tab-panel name="common">
-                    <CommonHelpPage></CommonHelpPage>
-                </q-tab-panel>
-
-                <q-tab-panel name="hotkeys">
-                    <HotkeysHelpPage></HotkeysHelpPage>
-                </q-tab-panel>
-
-                <q-tab-panel name="mouse">
-                    <MouseHelpPage></MouseHelpPage>
-                </q-tab-panel>
-
-                <q-tab-panel name="releases">
-                    <VersionHistoryPage></VersionHistoryPage>
-                </q-tab-panel>
-
-                <q-tab-panel name="donate">
-                    <DonateHelpPage></DonateHelpPage>
-                </q-tab-panel>
-            </q-tab-panels>
+            <CommonHelpPage v-if="selectedTab == 'common'" class="col"></CommonHelpPage>
+            <HotkeysHelpPage v-if="selectedTab == 'hotkeys'" class="col"></HotkeysHelpPage>
+            <MouseHelpPage v-if="selectedTab == 'mouse'" class="col"></MouseHelpPage>
+            <VersionHistoryPage v-if="selectedTab == 'releases'" class="col"></VersionHistoryPage>
+            <DonateHelpPage v-if="selectedTab == 'donate'" class="col"></DonateHelpPage>
         </div>
     </Window>
 </template>
@@ -92,4 +76,8 @@ class HelpPage extends Vue {
 </script>
 
 <style scoped>
+.separator {
+    height: 1px;
+    background-color: #E0E0E0;
+}
 </style>
diff --git a/client/components/Reader/HelpPage/VersionHistoryPage/VersionHistoryPage.vue b/client/components/Reader/HelpPage/VersionHistoryPage/VersionHistoryPage.vue
index 9761bf96..b8b5f3b5 100644
--- a/client/components/Reader/HelpPage/VersionHistoryPage/VersionHistoryPage.vue
+++ b/client/components/Reader/HelpPage/VersionHistoryPage/VersionHistoryPage.vue
@@ -62,6 +62,7 @@ class VersionHistoryPage extends Vue {
     overflow-y: auto;
     font-size: 120%;
     line-height: 130%;
+    position: relative;
 }
 
 h4 {
diff --git a/client/components/share/Window.vue b/client/components/share/Window.vue
index 1d4e8324..ab7b4549 100644
--- a/client/components/share/Window.vue
+++ b/client/components/share/Window.vue
@@ -120,6 +120,15 @@ class Window extends Vue {
     z-index: 50;
 }
 
+.xyfit {
+    height: 100%;
+    width: 100%;
+}
+
+.flexfit {
+    flex: 1;
+}
+
 .window {
     margin: 10px;
     background-color: #ffffff;
diff --git a/client/quasar.js b/client/quasar.js
index 494bc01d..dd5f586b 100644
--- a/client/quasar.js
+++ b/client/quasar.js
@@ -19,7 +19,7 @@ import {QIcon} from 'quasar/src/components/icon';
 import {QSlider} from 'quasar/src/components/slider';
 //import {QTabs} from 'quasar/src/components/tabs';
 //import {QTab} from 'quasar/src/components/tab';
-import {QTabPanels, QTabPanel} from 'quasar/src/components/tab-panels';
+//import {QTabPanels, QTabPanel} from 'quasar/src/components/tab-panels';
 import {QSeparator} from 'quasar/src/components/separator';
 import {QList, QItem, QItemSection, QItemLabel} from 'quasar/src/components/item';
 import {QTooltip} from 'quasar/src/components/tooltip';
@@ -34,8 +34,7 @@ const components = {
     QSlider,
     //QTabs,
     //QTab
-    QTabPanels,
-    QTabPanel,
+    //QTabPanels, QTabPanel,
     QSeparator,
     QList, QItem, QItemSection, QItemLabel,
     QTooltip,