Merge remote-tracking branch 'origin/master'

rk

昨天 4a7c8d6ac4d2c38ac0c0145a54ab07b7ad5615f3

1
2
3
4
5
6
7
8
@import "variables";
/* theme color */
$--color-primary: $primary-color;
 
/* icon font path, required */
$--font-path: '~element-ui/lib/theme-chalk/fonts';
 
@import "~element-ui/packages/theme-chalk/src/index";