Browse Source

解决冲突

martin.ma 4 years ago
parent
commit
14f15bf405
2 changed files with 7 additions and 2 deletions
  1. 6 1
      assets/css/frontend/personal.scss
  2. 1 1
      layouts/header-fix.vue

+ 6 - 1
assets/css/frontend/personal.scss

@@ -15,6 +15,11 @@
   width: 730px;
 }
 .personal-side {
+  position: fixed;
+  left: 50%;
+  transform:translateX(-50%);
+  margin-left: 375px;
+  top: 85px;
   width: 350px;
 }
 
@@ -313,4 +318,4 @@
   display:block;
   width: 100%;
   height: 100%;
-}
+}

+ 1 - 1
layouts/header-fix.vue

@@ -88,7 +88,7 @@
     min-height: calc(100vh - 376px);
     margin:0 30px !important;
     margin-bottom: 30px !important;
-    margin-top: 103px !important;
+    margin-top: 20px !important;
   }
   .ma-header-fix{
     position:fixed!important;