diff --git a/src/scripts/components/main/menu/menu.styl b/src/scripts/components/main/menu/menu.styl index bfc44c53e..d721ee393 100644 --- a/src/scripts/components/main/menu/menu.styl +++ b/src/scripts/components/main/menu/menu.styl @@ -85,7 +85,10 @@ .logo padding: emCalc(10px) emCalc(22px) +<<<<<<< HEAD background-color: $black +======= +>>>>>>> New Version 0.10.0 (#693) img width: emCalc(80px) diff --git a/src/scripts/components/main/menu/menu.tsx b/src/scripts/components/main/menu/menu.tsx index a6fb2b2b5..ab9400563 100644 --- a/src/scripts/components/main/menu/menu.tsx +++ b/src/scripts/components/main/menu/menu.tsx @@ -166,6 +166,12 @@ const Menu: FunctionComponent = () => {
  • +
  • + +
  • +
  • + +
  • )}