样式

2019-09-18 12:24:50 +08:00
parent 93eb6ec5c5
commit faab73c1fa
58 changed files with 0 additions and 4278 deletions
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -37,24 +37,15 @@ 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;
    }
  }