Merge branch 'v30'

Author: evanpelle

index.html

@@ -208,11 +208,11 @@
           inline
           class="hidden w-full h-full page-content relative z-50"
         ></join-lobby-modal>
-        <territory-patterns-modal
+        <store-modal
           id="page-item-store"
           inline
           class="hidden w-full h-full page-content relative z-50"
-        ></territory-patterns-modal>
+        ></store-modal>
         <user-setting
           id="page-settings"
           inline
@@ -249,6 +249,11 @@
           inline
           class="hidden w-full h-full page-content relative z-50"
         ></flag-input-modal>
+        <territory-patterns-modal
+          id="territory-patterns-modal"
+          inline
+          class="hidden w-full h-full page-content relative z-50"
+        ></territory-patterns-modal>
         <ranked-modal
           id="page-ranked"
           inline
@@ -263,9 +268,6 @@
       </div>
 
       <!-- Global Modals -->
-      <territory-patterns-modal
-        id="territory-patterns-modal"
-      ></territory-patterns-modal>
     </div>
 
     <!-- Game components -->