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

Grid spacing: css nits, remove unused variable, string case fix

Browse Source
This commit is contained in:
juliandescottes 2018-02-18 13:23:37 +01:00 committed by Julian Descottes
parent 3e450c3d77
commit 779761628e
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/css/settings-application.css
View File

@ -73,11 +73,35 @@
flex-shrink: 0; flex-shrink: 0;
} }
.settings-item-grid-size .size-picker-option { .grid-spacing-container .size-picker-option[data-size='1'] {
padding: 7px;
}
.grid-spacing-container .size-picker-option[data-size='2'] {
padding: 6px;
}
.grid-spacing-container .size-picker-option[data-size='4'] {
padding: 5px;
}
.grid-spacing-container .size-picker-option[data-size='8'] {
padding: 4px;
}
.grid-spacing-container .size-picker-option[data-size='16'] {
padding: 3px;
}
.grid-spacing-container .size-picker-option[data-size='32'] {
padding: 2px;
}
.grid-spacing-container .size-picker-option[data-size='64'] {
padding: 1px;
}
.settings-item-grid-size .size-picker-option,
.settings-item-grid-spacing .size-picker-option {
border-color: #888; border-color: #888;
} }
.settings-item-grid-size .size-picker-option:not(.selected):hover { .settings-item-grid-size .size-picker-option:not(.selected):hover,
.settings-item-grid-spacing .size-picker-option:not(.selected):hover {
border-color: white; border-color: white;
} }

1
src/js/rendering/frame/FrameRenderer.js
View File

@ -333,7 +333,6 @@
displayContext.scale(1 / z, 1 / z); displayContext.scale(1 / z, 1 / z);
var drawOrClear; var drawOrClear;
var drawing = true;
if (gridColor === Constants.TRANSPARENT_COLOR) { if (gridColor === Constants.TRANSPARENT_COLOR) {
drawOrClear = displayContext.clearRect.bind(displayContext); drawOrClear = displayContext.clearRect.bind(displayContext);
} else { } else {

4
src/templates/settings/preferences/grid.html
View File

@ -20,8 +20,8 @@
</div> </div>
</div> </div>
<div class="settings-item settings-item-grid-spacing"> <div class="settings-item settings-item-grid-spacing">
<label>Grid Spacing</label> <label>Grid spacing</label>
<div class="grid-spacing-container spacing-picker-container"> <div class="grid-spacing-container size-picker-container">
<div class="size-picker-option" <div class="size-picker-option"
title="1px" rel="tooltip" data-placement="top" data-size="1"></div> title="1px" rel="tooltip" data-placement="top" data-size="1"></div>
<div class="size-picker-option" <div class="size-picker-option"