公共样式问题

.history/src/styles/variable_20190422095438.scss

+/*
+ *  @ 文字颜色
+ */
+$active: #09f;
+$white: #fff;
+$black: #000;
+$red: #f21;
+$color_333: #333;
+$color_555: #555;
+$color_666: #666;
+$color_999: #999;
+$color_606: #606060;
+
+
+/*
+ *  @ 文字大小
+ */
+$font_30: 30px;
+$font_28: 28px;
+$font_26: 26px;
+$font_24: 24px;
+$font_22: 22px;
+$font_20: 20px;
+$font_18: 18px;
+$font_16: 16px;
+$font_14: 14px;
+$font_12: 12px;
+
+
+
+/*
+ *  @ 背景颜色
+ */
+$bg_active: #09f;
+$bg_fff: #fff;
+$bg_000: #000;
+$bg_f4f4f4: #f4f4f4;
+$bg_f5f5f5: #f5f5f5;
+$bg_f7f9fc: #f7f9fc;
+
+
+/*
+ *  @ 分割线颜色
+ */
+$sp_ddd: #ddd;
+$sp_e7eaf1: #e7eaf1;
+
+
+/*
+ *  @ 边框颜色
+ */

src/styles/variable.scss

@@ -36,11 +36,7 @@ $bg_fff: #fff;
 $bg_000: #000;
 $bg_f4f4f4: #f4f4f4;
 $bg_f5f5f5: #f5f5f5;
-<<<<<<< HEAD
 $bg_f7f9fc: #f7f9fc;
-=======
-$body-bg: #fff;
->>>>>>> 094ee096ff756aa5c604062239b08df66a43ab10
 
 
 /*