From 8b4c972f773f20ff1fc5ad2ae58923ba9ef3fc8d Mon Sep 17 00:00:00 2001
From: Peng-YM <1048217874pengym@gmail.com>
Date: Wed, 26 Aug 2020 21:33:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E7=A7=BB=E5=8A=A8=E7=AB=AFwe?=
 =?UTF-8?q?b=20app?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

样式来自Chavyleung
---
 backend/.idea/workspace.xml                 | 10 +++--
 web/src/App.vue                             |  3 +-
 web/src/components/BottomNav.vue            |  2 +-
 web/src/{views => components}/ProxyList.vue |  0
 web/src/components/TopToolbar.vue           |  2 +-
 web/src/css/app.css                         | 48 +++++++++++++++++++++
 web/src/views/Subscription.vue              |  2 +-
 7 files changed, 58 insertions(+), 9 deletions(-)
 rename web/src/{views => components}/ProxyList.vue (100%)
 create mode 100644 web/src/css/app.css

diff --git a/backend/.idea/workspace.xml b/backend/.idea/workspace.xml
index a7d753c..7bc83b5 100644
--- a/backend/.idea/workspace.xml
+++ b/backend/.idea/workspace.xml
@@ -20,11 +20,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="8b97a098-48b2-4e64-a9ef-522fe2d30b52" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/../web/src/css/app.css" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/sub-store.js" beforeDir="false" afterPath="$PROJECT_DIR$/sub-store.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../web/public/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/../web/public/index.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../web/src/App.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../web/src/App.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../web/src/config.js" beforeDir="false" afterPath="$PROJECT_DIR$/../web/src/config.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../web/src/components/BottomNav.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../web/src/components/BottomNav.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../web/src/components/TopToolbar.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../web/src/components/TopToolbar.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../web/src/views/ProxyList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../web/src/components/ProxyList.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/../web/src/views/Subscription.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../web/src/views/Subscription.vue" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -80,7 +82,7 @@
       <workItem from="1598235270977" duration="126000" />
       <workItem from="1598235738199" duration="3192000" />
       <workItem from="1598323737081" duration="1913000" />
-      <workItem from="1598442849645" duration="4206000" />
+      <workItem from="1598442849645" duration="4231000" />
     </task>
     <servers />
   </component>
diff --git a/web/src/App.vue b/web/src/App.vue
index 7aa38e7..1370ce6 100644
--- a/web/src/App.vue
+++ b/web/src/App.vue
@@ -74,7 +74,6 @@ export default {
   }
 }
 </script>
-
 <style>
-
+@import "css/app.css";
 </style>
\ No newline at end of file
diff --git a/web/src/components/BottomNav.vue b/web/src/components/BottomNav.vue
index 7400d15..029fb9e 100644
--- a/web/src/components/BottomNav.vue
+++ b/web/src/components/BottomNav.vue
@@ -34,4 +34,4 @@ export default {
     }
   }
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/web/src/views/ProxyList.vue b/web/src/components/ProxyList.vue
similarity index 100%
rename from web/src/views/ProxyList.vue
rename to web/src/components/ProxyList.vue
diff --git a/web/src/components/TopToolbar.vue b/web/src/components/TopToolbar.vue
index c3949a1..ccf0262 100644
--- a/web/src/components/TopToolbar.vue
+++ b/web/src/components/TopToolbar.vue
@@ -63,4 +63,4 @@ export default {
     }
   }
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/web/src/css/app.css b/web/src/css/app.css
new file mode 100644
index 0000000..2fbcf4c
--- /dev/null
+++ b/web/src/css/app.css
@@ -0,0 +1,48 @@
+[v-cloak] {
+    display: none;
+}
+.text-pre-wrap {
+    white-space: pre-wrap !important;
+}
+.v-navigation-drawer {
+    padding-top: constant(safe-area-inset-top) !important;
+    padding-top: env(safe-area-inset-top) !important;
+}
+.v-bottom-sheet.v-dialog--fullscreen {
+    padding-top: constant(safe-area-inset-top) !important;
+    padding-top: env(safe-area-inset-top) !important;
+}
+.v-app-bar {
+    height: auto !important;
+    padding-top: constant(safe-area-inset-top) !important;
+    padding-top: env(safe-area-inset-top) !important;
+}
+.v-toolbar {
+    height: auto !important;
+    padding-top: constant(safe-area-inset-top) !important;
+    padding-top: env(safe-area-inset-top) !important;
+}
+.v-toolbar__content {
+    padding-left: 12px !important;
+    padding-right: 12px !important;
+}
+.v-main {
+    margin-top: constant(safe-area-inset-top) !important;
+    margin-top: env(safe-area-inset-top) !important;
+    margin-bottom: constant(safe-area-inset-bottom) !important;
+    margin-bottom: env(safe-area-inset-bottom) !important;
+}
+.v-main .container {
+    height: 100%;
+}
+.v-bottom-navigation,
+.v-bottom-sheet {
+    padding-bottom: constant(safe-area-inset-bottom);
+    padding-bottom: env(safe-area-inset-bottom);
+}
+.v-bottom-navigation {
+    box-sizing: content-box;
+}
+.v-bottom-navigation button {
+    box-sizing: border-box;
+}
\ No newline at end of file
diff --git a/web/src/views/Subscription.vue b/web/src/views/Subscription.vue
index 2568828..890b472 100644
--- a/web/src/views/Subscription.vue
+++ b/web/src/views/Subscription.vue
@@ -141,7 +141,7 @@
 </template>
 
 <script>
-import ProxyList from "@/views/ProxyList";
+import ProxyList from "@/components/ProxyList";
 import {BACKEND_BASE} from "@/config";
 import {axios} from "@/utils";