2 Commits cfce925c52 ... fa7a8aa25f

Auteur SHA1 Message Date
  cl fa7a8aa25f Merge branch 'master' of http://121.40.40.223:3000/zizhong.wang/SesameDevelopment il y a 6 ans
  cl b0ce7aedf0 // il y a 6 ans
3 fichiers modifiés avec 13 ajouts et 21 suppressions
  1. 1 1
      package-lock.json
  2. 5 14
      src/App.vue
  3. 7 6
      src/views/About.vue

+ 1 - 1
package-lock.json

@@ -2162,7 +2162,7 @@
     },
     "babel-runtime": {
       "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.26.0.tgz",
       "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
       "dev": true,
       "requires": {

+ 5 - 14
src/App.vue

@@ -57,7 +57,9 @@
     height: 40px !important;
     backgroundColor: blue;
   }
-
+  html{
+    font-size:5px !important;
+  }
   #nav {
     height: 40px !important;
   }
@@ -211,7 +213,8 @@
 
 <script>
 /* eslint-disable */
-document.getElementsByTagName("html")[0].style.fontSize=document.body.clientWidth/200+'px'
+// document.getElementsByTagName("html")[0].style.fontSize =
+//   document.body.clientWidth / 200 + "px";
 export default {
   name: "app",
   data() {
@@ -220,17 +223,5 @@ export default {
       screenWidth: document.body.clientWidth
     };
   },
-  mounted() {
-    const that = this;
-    window.onresize = () => {
-      // console.log("object");
-      return (() => {
-        window.screenWidth = document.body.clientWidth;
-        that.screenWidth = window.screenWidth;
-        document.getElementsByTagName("html")[0].style.fontSize=screenWidth/200+'px';
-      })();
-    };
-  },
 };
-
 </script>

+ 7 - 6
src/views/About.vue

@@ -193,7 +193,7 @@ export default {
     float: left !important;
   }
   .righttext h2{
-    margin-top: -7rem!important;
+    margin-top: -6rem!important;
   }
   .headline {
     margin-left: 45% !important;
@@ -317,7 +317,7 @@ export default {
   color: rgb(154, 154, 154);
 }
 .headline p {
-  font-size: 3.3rem;
+  font-size: 3.1rem;
   color: rgb(0, 102, 153);
   font-weight: 600;
   margin-top: 0px;
@@ -373,8 +373,9 @@ export default {
   padding-bottom: 7px;
 }
 .head p {
-  width: 125px;
-  padding-left: 18px;
+  width: 10rem;
+  padding-left: 1.2rem;
+  font-size: 2.2rem;
   display: flex;
   justify-content: flex-start;
   border-bottom: 1px solid rgb(121, 121, 121);
@@ -401,13 +402,13 @@ export default {
   width: 200px;
   /* width: 20%; */
   /* margin-left: 20px; */
-  margin-top: 100px;
+  margin-top: 8rem;
   display: flex;
   flex-direction: row;
   justify-content: flex-start;
 }
 .rightcontent {
-  margin-top: 60px;
+  margin-top: 5rem;
   width: 80%;
 }
 .leftmenu img {