提交

jydocs-pc/src/App.vue

@@ -63,40 +63,25 @@ export default {
     background-color: #fff;
   }
 }
-<<<<<<< HEAD
-<<<<<<< HEAD
-.in-app{
-=======
+
 .in-app.docs-app{
->>>>>>> 498fd4dc36d751d688e55949cbaa31de6285dc99
   width: 100%;
   min-width: 1012px !important;
   background-color: rgb(242, 242, 244) ;
   .docs-app-main{
-<<<<<<< HEAD
-        width: auto!important;
-        min-width: auto!important;
-      }
-
-=======
-=======
-    width: auto !important;
-    min-width: auto !important;
+      width: auto!important;
+      min-width: auto!important;
+   }
   }
-}
->>>>>>> 498fd4dc36d751d688e55949cbaa31de6285dc99
+
 ::-webkit-scrollbar {
   /*滚动条整体样式*/
   width: 8px;
 }
-
 ::-webkit-scrollbar-thumb {
   /*滚动条里面小方块*/
   border-radius: 3px;
   background-color: #e0e0e0;
-<<<<<<< HEAD
->>>>>>> master
-=======
->>>>>>> 498fd4dc36d751d688e55949cbaa31de6285dc99
+
 }
 </style>