From c6a61dc8c81854c543b6f7a0ef353944ed3fc3f3 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Mon, 3 Feb 2020 02:20:46 +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                      | 18 +++++++++++++-----
 client/components/Reader/Reader.vue            |  6 +++---
 client/components/Reader/TextPage/TextPage.vue |  2 +-
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/client/components/App.vue b/client/components/App.vue
index 84dc6909..31b17fc9 100644
--- a/client/components/App.vue
+++ b/client/components/App.vue
@@ -1,5 +1,5 @@
 <template>
-    <q-layout view="lhr lpr lfr">
+    <!--q-layout view="lhr lpr lfr">
         <q-drawer v-model="showAsideBar" :width="asideWidth">
             <div class="app-name"><span v-html="appName"></span></div>
             <q-btn class="el-button-collapse" @click="toggleCollapse"></q-btn>
@@ -12,7 +12,7 @@
 
                     <q-item-section>Inbox</q-item-section>
                 </q-item>
-            </q-list>
+            </q-list-->
             <!--el-menu class="el-menu-vertical" :default-active="rootRoute" :collapse="isCollapse" router>
               <el-menu-item index="/cardindex">
                 <i class="el-icon-search"></i>
@@ -43,14 +43,19 @@
                 <span :class="itemTitleClass('/help')" slot="title">{{ this.itemRuText['/help'] }}</span>
               </el-menu-item>
             </el-menu-->
-        </q-drawer>
+        <!--/q-drawer>
 
         <q-page-container>
             <keep-alive>
                 <router-view></router-view>
             </keep-alive>
         </q-page-container>
-    </q-layout>
+    </q-layout-->
+    <div class="fit row">
+        <keep-alive>
+            <router-view class="col"></router-view>
+        </keep-alive>
+    </div>
 </template>
 
 <script>
@@ -240,9 +245,12 @@ class App extends Vue {
 </style>
 
 <style>
-body, html, #app {
+body, html, #app {    
     margin: 0;
     padding: 0;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
     font: normal 12pt ReaderDefault;
 }
 
diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue
index 6e895b95..cbbd6f25 100644
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -1,6 +1,6 @@
 <template>
-    <q-page class="column no-wrap">
-        <div  ref="header" class="header" v-show="toolBarActive">
+    <div class="column no-wrap">
+        <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"/>
@@ -148,7 +148,7 @@
             </el-dialog>
 
         </div>
-    </q-page>
+    </div>
 </template>
 
 <script>
diff --git a/client/components/Reader/TextPage/TextPage.vue b/client/components/Reader/TextPage/TextPage.vue
index 29d2325c..27fff390 100644
--- a/client/components/Reader/TextPage/TextPage.vue
+++ b/client/components/Reader/TextPage/TextPage.vue
@@ -133,7 +133,7 @@ class TextPage extends Vue {
 
         this.$root.$on('resize', async() => {
             this.$nextTick(this.onResize);
-            await sleep(300);
+            await sleep(500);
             this.$nextTick(this.onResize);
         });
     }