yunxing %!s(int64=4) %!d(string=hai) anos
pai
achega
65b495b650
Modificáronse 1 ficheiros con 0 adicións e 20 borrados
  1. 0 20
      src/components/edit/left_toolbar.vue

+ 0 - 20
src/components/edit/left_toolbar.vue

@@ -623,30 +623,10 @@ export default {
             .ant-table-small {
                 border: none !important;
             }
-<<<<<<< HEAD
-=======
-          }
-          .active-li {
-            background: #e1f2ff;
-          }
->>>>>>> 4409220714b34bc8a4ee05f63e1ff80af76a9f55
         }
     }
     .border-top {
         border-top: 1px solid #c3c7cb;
     }
-<<<<<<< HEAD
-=======
-  }
-  .border-top {
-    /*border-top: 1px solid #c3c7cb;*/
-  }
-  .border-line{
-    width: 48px;
-    height: 2px;
-    background: #C3C7CB ;
-    margin: 0 auto;
-  }
->>>>>>> 4409220714b34bc8a4ee05f63e1ff80af76a9f55
 }
 </style>