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

Commit before trying new layout

Browse Source
This commit is contained in:
unsettledgames 2021-02-05 12:42:40 +01:00
parent b44eaf0d3f
commit 598bf20d46
4 changed files with 57 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
css/pixel-editor.scss
View File

@ -1554,8 +1554,6 @@ div#pb-options {
background-color: #232125 !important; background-color: #232125 !important;
opacity: 1 !important; opacity: 1 !important;
display: none !important;
#splash-input { #splash-input {
width:70%; width:70%;
height:100vh !important; height:100vh !important;
@ -1661,9 +1659,44 @@ div#pb-options {
position: absolute; position: absolute;
width:70%; width:70%;
bottom:40px; bottom:40px;
height:40px;
font-size:18px; font-size:18px;
font-weight: bold; font-weight: bold;
div.button-menu {
border:3px solid $basetextweak;
border-radius:5px;
position:relative;
display:inline-block;
padding: 0 0 0 0;
text-align:left;
-ms-transform: translateY(38%);
transform: translateY(38%);
div {
border:none;
padding:none;
margin:none;
background-color:transparent;
width:100px;
float:left;
text-align: center;
height:30px;
cursor:pointer;
p {
-ms-transform: translateY(-50%);
transform: translateY(-50%);
}
}
.bm-right {
border-left:3px solid $basetextweak;
}
.sp-interface-selected {
background-color: $basetextweak;
}
}
} }
#splash-news { #splash-news {

3
js/_onLoad.js
View File

@ -8,6 +8,5 @@ window.onload = function(){
newPixel(getValue('size-width'),getValue('size-height'), getValue('editor-mode')); newPixel(getValue('size-width'),getValue('size-height'), getValue('editor-mode'));
else else
//otherwise show the new pixel dialog //otherwise show the new pixel dialog
if (settings.showLog != undefined && !settings.showLog) showDialogue('splash', false);
showDialogue('new-pixel', false);
}; };

2
js/_settings.js
View File

@ -9,7 +9,6 @@ var settingsFromCookie = Cookies.get('pixelEditorSettings');
if(!settingsFromCookie) { if(!settingsFromCookie) {
console.log('settings cookie not found'); console.log('settings cookie not found');
settings = { settings = {
showLog: true,
switchToChangedColor: true, switchToChangedColor: true,
enableDynamicCursorOutline: true, //unused - performance enableDynamicCursorOutline: true, //unused - performance
enableBrushPreview: true, //unused - performance enableBrushPreview: true, //unused - performance
@ -39,7 +38,6 @@ function saveSettings() {
//save new settings to settings object //save new settings to settings object
settings.numberOfHistoryStates = getValue('setting-numberOfHistoryStates'); settings.numberOfHistoryStates = getValue('setting-numberOfHistoryStates');
settings.pixelGridColour = getValue('setting-pixelGridColour'); settings.pixelGridColour = getValue('setting-pixelGridColour');
settings.showLog = false;
// Filling pixel grid again if colour changed // Filling pixel grid again if colour changed
fillPixelGrid(); fillPixelGrid();

35
views/pixel-editor.hbs
View File

@ -13,7 +13,6 @@
</head> </head>
<body oncontextmenu="return false;"> <body oncontextmenu="return false;">
<div id="compatibility-warning"> <div id="compatibility-warning">
<div><div> <div><div>
<p><strong>Warning: a modern, desktop, web browser is required to use this tool.</strong></p> <p><strong>Warning: a modern, desktop, web browser is required to use this tool.</strong></p>
@ -247,9 +246,9 @@
<h2>Size</h2> <h2>Size</h2>
<input id="size-width" value="{{#if width}}{{width}}{{else}}64{{/if}}" autocomplete="off" />{{svg "x.svg" width="16" height="16" class="dimentions-x"}}<input id="size-height" value="{{#if height}}{{height}}{{else}}64{{/if}}" autocomplete="off" /> <input id="size-width" value="{{#if width}}{{width}}{{else}}64{{/if}}" autocomplete="off" />{{svg "x.svg" width="16" height="16" class="dimentions-x"}}<input id="size-height" value="{{#if height}}{{height}}{{else}}64{{/if}}" autocomplete="off" />
<h2>Palette</h2> <h2>Palette</h2>
<button id="palette-button" class="dropdown-button">Choose a palette...</button> <!--<button id="palette-button" class="dropdown-button">Choose a palette...</button>
<div id="palette-menu" class="dropdown-menu"><button id="no-palette-button">Empty Palette</button><button id="load-palette-button">Load palette...</button></div> <div id="palette-menu" class="dropdown-menu"><button id="no-palette-button">Empty Palette</button><button id="load-palette-button">Load palette...</button></div>
-->
<div id="new-pixel-warning">Creating a new pixel will discard your current one.</div> <div id="new-pixel-warning">Creating a new pixel will discard your current one.</div>
<div> <div>
<button id="create-button" class="default">Create</button> <button id="create-button" class="default">Create</button>
@ -336,10 +335,27 @@
Quickstart Quickstart
</div> </div>
<div id="sp-mode-palette">
<span>Interface mode:
<div class="button-menu">
<div class="bm-left"><p>Basic</p></div>
<div class="sp-interface-selected bm-right"><p>Advanced</p></div>
</div>
</span>
<span>Palette:
<button id="palette-button" class="dropdown-button">Choose a palette...</button>
<div id="palette-menu" class="dropdown-menu">
<button id="no-palette-button">Empty Palette</button>
<button id="load-palette-button">Load palette...</button>
</div>
</span>
</div>
<div id="sp-quickstart"> <div id="sp-quickstart">
<div class="sp-template"><p>Load</p></div> <div class="sp-template"><p>Load</p></div>
<div class="sp-template"><p><span>New</span> custom</p></div> <div class="sp-template"><p><span>New</span> custom</p></div>
<div class="sp-template"><p><span>New</span> Gameboy</p></div> <div class="sp-template" onclick="newPixel()"><p><span>New</span> Gameboy</p></div>
<div class="sp-template"><p><span>New</span> C64</p></div> <div class="sp-template"><p><span>New</span> C64</p></div>
<div class="sp-template"><p><span>New</span> Pico8</p></div> <div class="sp-template"><p><span>New</span> Pico8</p></div>
<div class="sp-template"><p><span>New</span> 32x32</p></div> <div class="sp-template"><p><span>New</span> 32x32</p></div>
@ -348,17 +364,6 @@
<div class="sp-template"><p><span>New</span> 256x256</p></div> <div class="sp-template"><p><span>New</span> 256x256</p></div>
<div class="sp-template"><p><span>New</span> 512x512</p></div> <div class="sp-template"><p><span>New</span> 512x512</p></div>
</div> </div>
<div id="sp-mode-palette">
<span>Interface mode:
<span class="button-menu">
<button>Basic mode</button>
<button class="button-menu-selected">Advanced mode</button>
</span>
</span>
<span>Palette: </span>
</div>
</div> </div>
</div> </div>
</div> </div>