mirror of
https://github.com/piskelapp/piskel.git
synced 2023-08-10 21:12:52 +03:00
merge-import proto
This commit is contained in:
juliandescottes
parent
816639f51b
commit
d7c6231e78
4206
css/piskel-style-packaged-2017-05-10-01-32.css
Normal file
4206
css/piskel-style-packaged-2017-05-10-01-32.css
Normal file
File diff suppressed because it is too large
Load Diff
29
index.html
29
index.html
@ -537,7 +537,7 @@
|
||||
<script type="text/template" id="cheatsheet-shortcut-template">
|
||||
<li class="cheatsheet-shortcut {{className}}" data-shortcut-id="{{id}}">
|
||||
<div class="cheatsheet-icon {{icon}}"></div>
|
||||
<span class="cheatsheet-key" rel="tooltip" data-placement="top" title="{{title}}">{{key}}</span>
|
||||
<span class="cheatsheet-key" rel="tooltip" data-placement="top" title="{{title}}">{{!key!}}</span>
|
||||
<span class="cheatsheet-description">{{description}}</span>
|
||||
</li>
|
||||
</script>
|
||||
@ -593,7 +593,6 @@
|
||||
</div>
|
||||
</form>
|
||||
<div class="import-step-buttons">
|
||||
<button class="import-cancel-button button">cancel</button>
|
||||
<button class="import-back-button button">back</button>
|
||||
<button class="import-next-button button button-primary">next</button>
|
||||
</div>
|
||||
@ -610,20 +609,19 @@
|
||||
<div class="import-step-content">
|
||||
<div class="import-mode">
|
||||
<div class="import-mode-title">How do you want to import the new content?</div>
|
||||
<label class="import-mode-option">
|
||||
<input type="radio" checked="checked" name="import-mode" id="select-mode-replace" value="replace"/>
|
||||
<span>Replace your current sprite</span>
|
||||
</label>
|
||||
<label class="import-mode-option">
|
||||
<input type="radio" name="import-mode" id="select-mode-merge" value="merge"/>
|
||||
<span>Merge with your current sprite</span>
|
||||
</label>
|
||||
<div class="import-mode-section">
|
||||
<span class="import-mode-section-description">Combine the imported content and your existing sprite.</span>
|
||||
<button class="import-mode-merge-button button-primary button">Merge</button>
|
||||
</div>
|
||||
<div class="import-mode-section">
|
||||
<span class="import-mode-section-description">Replace your current sprite by the imported content.</span>
|
||||
<button class="import-mode-replace-button button-primary button">Replace</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="import-step-buttons">
|
||||
<button class="import-cancel-button button">cancel</button>
|
||||
<button class="import-back-button button">back</button>
|
||||
<button class="import-next-button button button-primary">next</button>
|
||||
<button style="display: none" class="import-next-button button button-primary">next</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -663,7 +661,6 @@
|
||||
<div class="import-resize-anchor-container"></div>
|
||||
</div>
|
||||
<div class="import-step-buttons">
|
||||
<button class="import-cancel-button button">cancel</button>
|
||||
<button class="import-back-button button">back</button>
|
||||
<button class="import-next-button button button-primary">next</button>
|
||||
</div>
|
||||
@ -724,7 +721,6 @@
|
||||
</label>
|
||||
</div>
|
||||
<div class="import-step-buttons">
|
||||
<button class="import-cancel-button button">cancel</button>
|
||||
<button class="import-back-button button">back</button>
|
||||
<button class="import-next-button button button-primary">import</button>
|
||||
</div>
|
||||
@ -736,7 +732,6 @@
|
||||
<div class="import-step-container">
|
||||
<div>THIS IS AN INVALID FILEZ</div>
|
||||
<div class="import-step-buttons">
|
||||
<button class="import-cancel-button button">cancel</button>
|
||||
<button class="import-back-button button">back</button>
|
||||
<button class="import-next-button button button-primary">next</button>
|
||||
</div>
|
||||
@ -1183,9 +1178,9 @@
|
||||
(function () {
|
||||
|
||||
/**
|
||||
* See @Gruntfile.js => after build, -2017-05-06-11-54 is replaced by the build version
|
||||
* See @Gruntfile.js => after build, -2017-05-10-01-32 is replaced by the build version
|
||||
*/
|
||||
var version = '-2017-05-06-11-54';
|
||||
var version = '-2017-05-10-01-32';
|
||||
var versionHasNotBeenReplaced = version.indexOf('@@') === 0;
|
||||
if (versionHasNotBeenReplaced) {
|
||||
version = '';
|
||||
|
||||
32592
js/piskel-packaged-2017-05-10-01-32.js
Normal file
32592
js/piskel-packaged-2017-05-10-01-32.js
Normal file
File diff suppressed because one or more lines are too long
18
js/piskel-packaged-min-2017-05-10-01-32.js
Normal file
18
js/piskel-packaged-min-2017-05-10-01-32.js
Normal file
File diff suppressed because one or more lines are too long
@ -489,7 +489,7 @@
|
||||
<script type="text/template" id="cheatsheet-shortcut-template">
|
||||
<li class="cheatsheet-shortcut {{className}}" data-shortcut-id="{{id}}">
|
||||
<div class="cheatsheet-icon {{icon}}"></div>
|
||||
<span class="cheatsheet-key" rel="tooltip" data-placement="top" title="{{title}}">{{key}}</span>
|
||||
<span class="cheatsheet-key" rel="tooltip" data-placement="top" title="{{title}}">{{!key!}}</span>
|
||||
<span class="cheatsheet-description">{{description}}</span>
|
||||
</li>
|
||||
</script>
|
||||
@ -545,7 +545,6 @@
|
||||
</div>
|
||||
</form>
|
||||
<div class="import-step-buttons">
|
||||
<button class="import-cancel-button button">cancel</button>
|
||||
<button class="import-back-button button">back</button>
|
||||
<button class="import-next-button button button-primary">next</button>
|
||||
</div>
|
||||
@ -562,20 +561,19 @@
|
||||
<div class="import-step-content">
|
||||
<div class="import-mode">
|
||||
<div class="import-mode-title">How do you want to import the new content?</div>
|
||||
<label class="import-mode-option">
|
||||
<input type="radio" checked="checked" name="import-mode" id="select-mode-replace" value="replace"/>
|
||||
<span>Replace your current sprite</span>
|
||||
</label>
|
||||
<label class="import-mode-option">
|
||||
<input type="radio" name="import-mode" id="select-mode-merge" value="merge"/>
|
||||
<span>Merge with your current sprite</span>
|
||||
</label>
|
||||
<div class="import-mode-section">
|
||||
<span class="import-mode-section-description">Combine the imported content and your existing sprite.</span>
|
||||
<button class="import-mode-merge-button button-primary button">Merge</button>
|
||||
</div>
|
||||
<div class="import-mode-section">
|
||||
<span class="import-mode-section-description">Replace your current sprite by the imported content.</span>
|
||||
<button class="import-mode-replace-button button-primary button">Replace</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="import-step-buttons">
|
||||
<button class="import-cancel-button button">cancel</button>
|
||||
<button class="import-back-button button">back</button>
|
||||
<button class="import-next-button button button-primary">next</button>
|
||||
<button style="display: none" class="import-next-button button button-primary">next</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -615,7 +613,6 @@
|
||||
<div class="import-resize-anchor-container"></div>
|
||||
</div>
|
||||
<div class="import-step-buttons">
|
||||
<button class="import-cancel-button button">cancel</button>
|
||||
<button class="import-back-button button">back</button>
|
||||
<button class="import-next-button button button-primary">next</button>
|
||||
</div>
|
||||
@ -676,7 +673,6 @@
|
||||
</label>
|
||||
</div>
|
||||
<div class="import-step-buttons">
|
||||
<button class="import-cancel-button button">cancel</button>
|
||||
<button class="import-back-button button">back</button>
|
||||
<button class="import-next-button button button-primary">import</button>
|
||||
</div>
|
||||
@ -688,7 +684,6 @@
|
||||
<div class="import-step-container">
|
||||
<div>THIS IS AN INVALID FILEZ</div>
|
||||
<div class="import-step-buttons">
|
||||
<button class="import-cancel-button button">cancel</button>
|
||||
<button class="import-back-button button">back</button>
|
||||
<button class="import-next-button button button-primary">next</button>
|
||||
</div>
|
||||
@ -1135,9 +1130,9 @@
|
||||
(function () {
|
||||
|
||||
/**
|
||||
* See @Gruntfile.js => after build, -2017-05-06-11-54 is replaced by the build version
|
||||
* See @Gruntfile.js => after build, -2017-05-10-01-32 is replaced by the build version
|
||||
*/
|
||||
var version = '-2017-05-06-11-54';
|
||||
var version = '-2017-05-10-01-32';
|
||||
var versionHasNotBeenReplaced = version.indexOf('@@') === 0;
|
||||
if (versionHasNotBeenReplaced) {
|
||||
version = '';
|
||||
|
||||
Loading…
Reference in New Issue
Block a user