new

2019-09-18 10:15:45 +08:00
parent 02d1678fff 4a39ba8190
commit 93eb6ec5c5
61 changed files with 7778 additions and 24 deletions
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -37,15 +37,24 @@ export default {
 }
 </script>

+<<<<<<< HEAD
 <style rel="stylesheet/scss" lang="scss">
+=======
+<style rel="stylesheet/scss" lang="scss" scoped>
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
  .app-breadcrumb.el-breadcrumb {
    display: inline-block;
    font-size: 14px;
    line-height: 50px;
    margin-left: 10px;
+<<<<<<< HEAD
    color: #fff;
    .no-redirect {
      color: #fff;
+=======
+    .no-redirect {
+      color: #97a8be;
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
      cursor: text;
    }
  }