Merge branch 'dev' into order

# Conflicts:
#	src/assets/dance/logo3.png

@@ -980,7 +980,7 @@ const goGuide = () => {
   margin: 0 0 30px;
   margin: 0 0 30px;
 
 
   img {
   img {
-    width: 100%
+    width: 100%;height: 100%;object-fit: contain;
   }
   }
 }
 }