样式

2019-09-18 12:24:50 +08:00
parent 93eb6ec5c5
commit faab73c1fa
58 changed files with 0 additions and 4278 deletions
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -1,10 +1,4 @@
 //sidebar
-<<<<<<< HEAD
 $menuBg:#152c7c;
 $subMenuBg:rgb(29,53,149);
 $menuHover:rgb(40,114,199);
-=======
-$menuBg:#304156;
-$subMenuBg:#3d3780;
-$menuHover:#9892E4;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d