样式

src/views/layout/components/AppMain.vue

@@ -26,10 +26,6 @@ export default {
   /*50 = navbar  */
   position: relative;
   overflow: hidden;
-<<<<<<< HEAD
   /*min-height:calc(100vh - 50px);background: url('../../../../static/bg.jpg') repeat;*/
-=======
-  min-height:calc(100vh - 50px);background: url('../../../../static/bg.jpg') repeat;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 }
 </style>

src/views/layout/components/Navbar.vue

@@ -1,9 +1,5 @@
 <template>
-<<<<<<< HEAD
   <el-menu class="navbar" mode="horizontal" style="background: rgb(87,177,253)!important;">
-=======
-  <el-menu class="navbar" mode="horizontal" style="background: rgb(163,173,182)!important;">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
     <breadcrumb />
     <el-dropdown class="avatar-container" trigger="click">

src/views/layout/components/Sidebar/index.vue

@@ -7,11 +7,7 @@
         :default-active="$route.path"
         :collapse="isCollapse"
         mode="vertical"
-<<<<<<< HEAD
         background-color="#152c7c"
-=======
-        background-color="#304156"
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         text-color="#cccccc"
         active-text-color="#409EFF"
         style="height:calc(100% - 124px)"
@@ -61,13 +57,8 @@ export default {
 <style lang="scss" scoped>
   .img-wrapper{
     img{
-<<<<<<< HEAD
       width: 180px;
       margin: 20px 10px 20px 10px;
-=======
-      width: 84px;
-      margin: 20px 60px 20px 60px;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     }
   }
 </style>

src/views/layout/components/TagsView.vue

@@ -1,10 +1,6 @@
 <template>
   <div class="tags-view-container">
-<<<<<<< HEAD
     <scroll-pane ref="scrollPane" class="tags-view-wrapper" style="background: rgb(255,255,255)!important;">
-=======
-    <scroll-pane ref="scrollPane" class="tags-view-wrapper" style="background: rgb(163,173,182)!important;">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <router-link v-for="tag in Array.from(visitedViews)" ref="tag" :class="isActive(tag)?'active':''" :to="tag.path" :key="tag.path" class="tags-view-item" @contextmenu.prevent.native="openMenu(tag,$event)" >
         {{ tag.title }}
         <span class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)"/>
@@ -138,15 +134,9 @@ export default {
         position: relative;
         height: 26px;
         line-height: 26px;
-<<<<<<< HEAD
         border: 1px solid rgb(52,119,190);
         color:  rgb(52,119,190);
         background: white;
-=======
-        border: 1px solid #3d3780;
-        color: #3d3780;
-        background: inherit;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         padding: 0 8px;
         font-size: 12px;
         margin-left: 5px;
@@ -155,11 +145,7 @@ export default {
           margin-left: 15px;
         }
         &.active {
-<<<<<<< HEAD
           background-color: rgb(52,119,190);
-=======
-          background-color: #3d3780;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           color: #ffffff;
           border-color: #ffffff;
           &::before {