new

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