feat(linCms): 解决冲突

lucienstar · lucienstar · commit c1b8cdba0689 · 2019-06-27T14:12:26.000+08:00
diff --git a/src/assets/styles/realize/element-variables.scss b/src/assets/styles/realize/element-variables.scss
@@ -837,9 +837,9 @@ $typeMap: (primary:#3963BC,
   border: 1px solid #97B8FF;
   background-color: #ECF1FF;
   @include e(title) {
-    line-height: 24px;
     color: #3963BC;
   }
+
   @include e(content) {
     color: #3963BC;
   }
@@ -848,7 +848,7 @@ $typeMap: (primary:#3963BC,
   }
 }
 
-
+/* select */
 @include b(select) {
   .el-tag {
     background-color: #3963bc !important;

Original file line number	Diff line number	Diff line change
`@@ -837,9 +837,9 @@ $typeMap: (primary:#3963BC,`
`837`	`837`	`border: 1px solid #97B8FF;`
`838`	`838`	`background-color: #ECF1FF;`
`839`	`839`	`@include e(title) {`
`840`		`- line-height: 24px;`
`841`	`840`	`color: #3963BC;`
`842`	`841`	`}`
	`842`	`+`
`843`	`843`	`@include e(content) {`
`844`	`844`	`color: #3963BC;`
`845`	`845`	`}`
`@@ -848,7 +848,7 @@ $typeMap: (primary:#3963BC,`
`848`	`848`	`}`
`849`	`849`	`}`
`850`	`850`
`851`		`-`
	`851`	`+/* select */`
`852`	`852`	`@include b(select) {`
`853`	`853`	`.el-tag {`
`854`	`854`	`background-color: #3963bc !important;`