From 4b270bce8b9d3f7e843a57795a427cf1ab214e8e Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sun, 2 Feb 2020 23:15:59 +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 +++++
 .../CommonHelpPage/CommonHelpPage.vue         |  1 -
 .../DonateHelpPage/DonateHelpPage.vue         |  3 --
 .../components/Reader/HelpPage/HelpPage.vue   |  5 +--
 .../HotkeysHelpPage/HotkeysHelpPage.vue       |  1 -
 .../HelpPage/MouseHelpPage/MouseHelpPage.vue  |  1 -
 .../VersionHistoryPage/VersionHistoryPage.vue |  1 -
 client/components/Reader/Reader.vue           |  2 +-
 client/components/share/Window.vue            | 33 +++++--------------
 9 files changed, 21 insertions(+), 35 deletions(-)

diff --git a/client/components/App.vue b/client/components/App.vue
index 6e096a1b..8e1d62a7 100644
--- a/client/components/App.vue
+++ b/client/components/App.vue
@@ -243,6 +243,15 @@ 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/CommonHelpPage/CommonHelpPage.vue b/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue
index 28ebd44c..09d44bdb 100644
--- a/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue
+++ b/client/components/Reader/HelpPage/CommonHelpPage/CommonHelpPage.vue
@@ -70,7 +70,6 @@ class CommonHelpPage extends Vue {
 
 <style scoped>
 .page {
-    flex: 1;
     padding: 15px;
     overflow-y: auto;
     font-size: 120%;
diff --git a/client/components/Reader/HelpPage/DonateHelpPage/DonateHelpPage.vue b/client/components/Reader/HelpPage/DonateHelpPage/DonateHelpPage.vue
index 4ae7dbfb..3d0f272a 100644
--- a/client/components/Reader/HelpPage/DonateHelpPage/DonateHelpPage.vue
+++ b/client/components/Reader/HelpPage/DonateHelpPage/DonateHelpPage.vue
@@ -88,12 +88,10 @@ class DonateHelpPage extends Vue {
 
 <style scoped>
 .page {
-    flex: 1;
     padding: 15px;
     overflow-y: auto;
     font-size: 120%;
     line-height: 130%;
-    display: flex;
 }
 
 .p {
@@ -103,7 +101,6 @@ class DonateHelpPage extends Vue {
 }
 
 .box {
-    flex: 1;
     max-width: 550px;
     overflow-wrap: break-word;
 }
diff --git a/client/components/Reader/HelpPage/HelpPage.vue b/client/components/Reader/HelpPage/HelpPage.vue
index d683e876..df525e57 100644
--- a/client/components/Reader/HelpPage/HelpPage.vue
+++ b/client/components/Reader/HelpPage/HelpPage.vue
@@ -4,7 +4,7 @@
             Справка
         </template>
 
-        <div class="fit" style="min-width: 600px">
+        <div class="col" style="min-width: 600px; display: grid">
             <q-btn-toggle
                 v-model="selectedTab"
                 toggle-color="primary"
@@ -18,7 +18,8 @@
                 ]"
             />
             <q-separator />
-            <q-tab-panels class="fit" v-model="selectedTab">
+
+            <q-tab-panels v-model="selectedTab">
                 <q-tab-panel name="common">
                     <CommonHelpPage></CommonHelpPage>
                 </q-tab-panel>
diff --git a/client/components/Reader/HelpPage/HotkeysHelpPage/HotkeysHelpPage.vue b/client/components/Reader/HelpPage/HotkeysHelpPage/HotkeysHelpPage.vue
index 811c0669..5f309e1f 100644
--- a/client/components/Reader/HelpPage/HotkeysHelpPage/HotkeysHelpPage.vue
+++ b/client/components/Reader/HelpPage/HotkeysHelpPage/HotkeysHelpPage.vue
@@ -42,7 +42,6 @@ class HotkeysHelpPage extends Vue {
 
 <style scoped>
 .page {
-    flex: 1;
     padding: 15px;
     overflow-y: auto;
     font-size: 120%;
diff --git a/client/components/Reader/HelpPage/MouseHelpPage/MouseHelpPage.vue b/client/components/Reader/HelpPage/MouseHelpPage/MouseHelpPage.vue
index bd250ab8..d85abf36 100644
--- a/client/components/Reader/HelpPage/MouseHelpPage/MouseHelpPage.vue
+++ b/client/components/Reader/HelpPage/MouseHelpPage/MouseHelpPage.vue
@@ -49,7 +49,6 @@ class MouseHelpPage extends Vue {
 
 <style scoped>
 .page {
-    flex: 1;
     padding: 15px;
     overflow-y: auto;
     font-size: 120%;
diff --git a/client/components/Reader/HelpPage/VersionHistoryPage/VersionHistoryPage.vue b/client/components/Reader/HelpPage/VersionHistoryPage/VersionHistoryPage.vue
index 3b42f24e..9761bf96 100644
--- a/client/components/Reader/HelpPage/VersionHistoryPage/VersionHistoryPage.vue
+++ b/client/components/Reader/HelpPage/VersionHistoryPage/VersionHistoryPage.vue
@@ -58,7 +58,6 @@ class VersionHistoryPage extends Vue {
 
 <style scoped>
 .page {
-    flex: 1;
     padding: 15px;
     overflow-y: auto;
     font-size: 120%;
diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue
index e666b88a..1b9ceaa6 100644
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -59,7 +59,7 @@
             </div>
         </div>
 
-        <div class="col row main">
+        <div class="main col row relative-position">
             <keep-alive>
                 <component ref="page" :is="activePage"
                     @load-book="loadBook"
diff --git a/client/components/share/Window.vue b/client/components/share/Window.vue
index 8295b6f7..1d4e8324 100644
--- a/client/components/share/Window.vue
+++ b/client/components/share/Window.vue
@@ -1,12 +1,13 @@
 <template>
-    <div ref="main" class="main" @click="close" @mouseup="onMouseUp" @mousemove="onMouseMove">
-        <div ref="windowBox" class="windowBox" @click.stop>
-            <div class="window">
-                <div ref="header" class="header" @mousedown.prevent.stop="onMouseDown"
+    <div ref="main" class="main xyfit absolute" @click="close" @mouseup="onMouseUp" @mousemove="onMouseMove">
+        <div ref="windowBox" class="xyfit absolute flex no-wrap" @click.stop>
+            <div class="window flexfit column no-wrap">
+                <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"><slot name="header"></slot></span>
-                    <span class="close-button" @mousedown.stop @click="close"><i class="el-icon-close"></i></span>
+                    <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>
                 </div>
+
                 <slot></slot>
             </div>
         </div>
@@ -116,23 +117,10 @@ class Window extends Vue {
 
 <style scoped>
 .main {
-    position: absolute;
-    width: 100%;
-    height: 100%;
     z-index: 50;
 }
 
-.windowBox {
-    position: absolute;
-    display: flex;
-    height: 100%;
-    width: 100%;
-}
-
 .window {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
     margin: 10px;
     background-color: #ffffff;
     border: 3px double black;
@@ -141,15 +129,12 @@ class Window extends Vue {
 }
 
 .header {
-    display: flex;
-    justify-content: flex-end;
     background: linear-gradient(to bottom right, green, #59B04F);
     align-items: center;
     height: 30px;
 }
 
 .header-text {
-    flex: 1;
     margin-left: 10px;
     margin-right: 10px;
     color: #E8E8E8;
@@ -157,9 +142,6 @@ class Window extends Vue {
 }
 
 .close-button {
-    display: flex;
-    justify-content: center;
-    align-items: center;
     width: 30px;
     height: 30px;
     cursor: pointer;
@@ -168,4 +150,5 @@ class Window extends Vue {
 .close-button:hover {
     background-color: #69C05F;
 }
+
 </style>
\ No newline at end of file