Resolved conflicts with the previous pull request

This commit is contained in:
unsettledgames
2021-08-14 22:47:49 +02:00
parent a773bba05c
commit 017ef3b6f5
9 changed files with 41 additions and 285 deletions

View File

@ -36,8 +36,8 @@
{{> changelog}}
{{> credits}}
{{> settings}}
{{> pixel-export-popup}}
{{> save-project-popup}}
{{> pixel-export}}
{{> save-project}}
</div>
<script src="/pixel-editor/pixel-editor.js"></script>

View File

@ -5,7 +5,7 @@
<div class="export-configuration">
<h2>File Name</h2>
<input id="file-name" autocomplete="off" />
<input id="export-file-name" autocomplete="off"/>
</div>
<div class="popup-actions">