完善

723a46fd · 郭铭瑶 · a48d946c · 723a46fd · 723a46fd · 723a46fd
Commit 723a46fd authored Nov 12, 2019 by 郭铭瑶 🤘
Show whitespace changes
Inline Side-by-side

Showing with 20 additions and 5 deletions

index.html index.html +16 -1

App.vue src/App.vue +2 -2

header.vue src/views/header.vue +1 -1

main.vue src/views/main.vue +1 -1

No files found.
--- a/index.html
+++ b/index.html
 <!DOCTYPE html>
-<html>
+<html id="html">
  <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
    <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
    <title>dashboard</title>
+    <style>
+      html {
+        font-size: 0.8vw;
+      }
+    </style>
  </head>
  <body>
    <div id="app"></div>
    <!-- built files will be auto injected -->
  </body>
 </html>
+<script>
+// (function() {
+//   function setWidth() {
+//     const width = document.body.clientWidth
+//     document.getElementById('html').style.fontSize = (width / 120).toFixed(1) + 'px'
+//   }
+//   window.onload = setWidth()
+//   window.onresize = setWidth
+// })()
+</script>
--- a/src/App.vue
+++ b/src/App.vue
@@ -6,7 +6,7 @@

 <script>
 export default {
-  name: 'App'
+  name: 'App',
 }
 </script>

@@ -23,7 +23,6 @@ html, body
  background #000
  width 100%
  height 100%
-  font-size 1vw
  user-select none
 #app
  font-family DIN, 'Avenir', Helvetica, Arial, sans-serif
@@ -31,6 +30,7 @@ html, body
  -moz-osx-font-smoothing grayscale
  width 100%
  height 100%
+  font-size 1rem
  overflow: hidden
  color $fontColor
 </style>
--- a/src/views/header.vue
+++ b/src/views/header.vue
@@ -9,7 +9,7 @@
          </p>
          <p>{{item.name}}</p>
        </div>
-        <Divider :key="item.name" class="divider" type="vertical"/>
+        <Divider :key="'d' + item.name" class="divider" type="vertical"/>
      </template>
    </div>
  </div>

--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -113,7 +113,7 @@ export default {
    'box2 box3 box4'\
    'box5 box3 box4'\
    'box6 box6 box6'
-  grid-template-rows 1fr 3fr 3fr 2fr
+  grid-template-rows auto 3fr 3fr 2fr
  grid-template-columns 1fr 1fr 1fr
  grid-gap 0.8rem
  padding 1rem