mirror/piskel
1
0
Fork 0
mirror of https://github.com/piskelapp/piskel.git synced 2023-08-10 21:12:52 +03:00
Code Issues Projects Releases Wiki Activity

Fixed layout on FF, removed options in drawer

Browse Source
This commit is contained in:
jdescottes 2014-07-05 11:39:02 +02:00
parent a77168986a
commit 2c235e659b
3 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/css/toolbox-animated-preview.css
View File

@ -41,21 +41,22 @@
font-size: 12px; font-size: 12px;
min-width: 55px; min-width: 55px;
vertical-align: bottom; vertical-align: bottom;
line-height: 24px; line-height: 26px;
} }
.range-fps { .range-fps {
overflow: hidden; overflow: hidden;
width: 100px; width: 100px;
height : 24px; height : 26px;
margin : 0; margin : 0;
box-sizing: border-box;
} }
.preview-toggle-onion-skin { .preview-toggle-onion-skin {
font-size: 1.6rem; font-size: 1.6rem;
color: #aaa; color: #aaa;
float: left; float: left;
line-height: 24px; line-height: 26px;
height: 100%; height: 100%;
padding-left: 5px; padding-left: 5px;
padding-right: 5px; padding-right: 5px;

9
src/js/controller/settings/ApplicationSettingsController.js
View File

@ -18,10 +18,6 @@
$('#grid-width').val(gridWidth); $('#grid-width').val(gridWidth);
$('#grid-width').change(this.onGridWidthChange.bind(this)); $('#grid-width').change(this.onGridWidthChange.bind(this));
var overlay = pskl.UserSettings.get(pskl.UserSettings.OVERLAY);
$('#overlay').val(overlay);
$('#overlay').change(this.onOverlayChange.bind(this));
// Handle canvas background changes: // Handle canvas background changes:
$('#background-picker-wrapper').click(this.onBackgroundClick.bind(this)); $('#background-picker-wrapper').click(this.onBackgroundClick.bind(this));
}; };
@ -31,11 +27,6 @@
pskl.UserSettings.set(pskl.UserSettings.GRID_WIDTH, parseInt(width, 10)); pskl.UserSettings.set(pskl.UserSettings.GRID_WIDTH, parseInt(width, 10));
}; };
ns.ApplicationSettingsController.prototype.onOverlayChange = function (evt) {
var overlay = $('#overlay').val();
pskl.UserSettings.set(pskl.UserSettings.OVERLAY, overlay);
};
ns.ApplicationSettingsController.prototype.onBackgroundClick = function (evt) { ns.ApplicationSettingsController.prototype.onBackgroundClick = function (evt) {
var target = $(evt.target).closest('.background-picker'); var target = $(evt.target).closest('.background-picker');
if (target.length) { if (target.length) {

11
src/templates/settings/application.html
View File

@ -30,17 +30,6 @@
</select> </select>
</div> </div>
<div class="settings-title">
Overlay:
</div>
<div class="settings-item">
<label for="overlay">Display :</label>
<select id="overlay">
<option value="no-overlay">No overlay</option>
<option value="onion-skin">Onion skin</option>
<option value="layer-preview">Layer preview</option>
</select>
</div>
<!-- <div class="settings-item"> <!-- <div class="settings-item">
<label for="tiled-preview">Display tiled preview :</label> <label for="tiled-preview">Display tiled preview :</label>
<input type="checkbox" value="1" id="tiled-preview" name="tiled-preview-checkbox"/> <input type="checkbox" value="1" id="tiled-preview" name="tiled-preview-checkbox"/>