mirror of
https://github.com/piskelapp/piskel.git
synced 2023-08-10 21:12:52 +03:00
Reintegrating css changes from master
This commit is contained in:
jdescottes
parent
032c8c4485
commit
4e1deee851
|
|
@ -73,16 +73,18 @@ body {
|
||||||
}
|
}
|
||||||
|
|
||||||
.sticky-section {
|
.sticky-section {
|
||||||
display: table;
|
|
||||||
height: 100%;
|
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top: 0;
|
top: 0;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
z-index: 1000;
|
z-index: 1000;
|
||||||
}
|
}
|
||||||
|
|
||||||
.sticky-section .wrap,
|
.sticky-section .sticky-section-wrap {
|
||||||
.sticky-section .drawer {
|
display: table;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sticky-section .vertical-centerer {
|
||||||
display: table-cell;
|
display: table-cell;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
|
|
@ -98,7 +100,7 @@ body {
|
||||||
|
|
||||||
.right-sticky-section.sticky-section {
|
.right-sticky-section.sticky-section {
|
||||||
right: 0;
|
right: 0;
|
||||||
width: 50px;
|
width: 47px;
|
||||||
|
|
||||||
-webkit-transition: all 200ms ease-out;
|
-webkit-transition: all 200ms ease-out;
|
||||||
-moz-transition: all 200ms ease-out;
|
-moz-transition: all 200ms ease-out;
|
||||||
|
|
|
||||||
91
index.html
91
index.html
|
|
@ -18,16 +18,18 @@
|
||||||
<body>
|
<body>
|
||||||
<div id="main-wrapper" class="main-wrapper">
|
<div id="main-wrapper" class="main-wrapper">
|
||||||
<div class="sticky-section left-sticky-section" id="tool-section">
|
<div class="sticky-section left-sticky-section" id="tool-section">
|
||||||
<div class="wrap">
|
<div class="sticky-section-wrap">
|
||||||
<ul id="tools-container" class="tools-wrapper"></ul>
|
<div class="vertical-centerer">
|
||||||
<div class="palette-wrapper">
|
<ul id="tools-container" class="tools-wrapper"></ul>
|
||||||
<div class="tool-icon tool-color-picker">
|
<div class="palette-wrapper">
|
||||||
<input id="color-picker" class="color {hash:true}" type="text" value="" />
|
<div class="tool-icon tool-color-picker">
|
||||||
<input id="secondary-color-picker" class="secondary-color-picker color {hash:true}" type="text" value="" />
|
<input id="color-picker" class="color {hash:true}" type="text" value="" />
|
||||||
</div>
|
<input id="secondary-color-picker" class="secondary-color-picker color {hash:true}" type="text" value="" />
|
||||||
<div class="tool-icon tool-palette">
|
</div>
|
||||||
<div id="palette" class="palette">
|
<div class="tool-icon tool-palette">
|
||||||
<span class="tool-icon palette-color transparent-color" data-color="TRANSPARENT" title="Transparent"></span>
|
<div id="palette" class="palette">
|
||||||
|
<span class="tool-icon palette-color transparent-color" data-color="TRANSPARENT" title="Transparent"></span>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -35,42 +37,44 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="application-action-section" class="sticky-section right-sticky-section">
|
<div id="application-action-section" class="sticky-section right-sticky-section">
|
||||||
<div class="wrap">
|
<div class="sticky-section-wrap">
|
||||||
<div id="settings" class="tool-icon gear-icon" title="Preferences" rel="tooltip" data-placement="left"></div>
|
<div class="vertical-centerer">
|
||||||
<a class="tool-icon gallery-icon" title="Visit gallery" href="http://juliandescottes.github.io/piskel-website/" rel="tooltip" data-placement="left" target="_blank"></a>
|
<div id="settings" class="tool-icon gear-icon" title="Preferences" rel="tooltip" data-placement="left"></div>
|
||||||
<div class="tool-icon save-icon" title="Save to gallery" onclick="pskl.app.storeSheet()" rel="tooltip" data-placement="left" ></div>
|
<a class="tool-icon gallery-icon" title="Visit gallery" href="http://juliandescottes.github.io/piskel-website/" rel="tooltip" data-placement="left" target="_blank"></a>
|
||||||
<div class="tool-icon upload-cloud-icon" title="Upload as an animated GIF" onclick="pskl.app.uploadAsAnimatedGIF()" rel="tooltip" data-placement="left">
|
<div class="tool-icon save-icon" title="Save to gallery" onclick="piskel.storeSheet()" rel="tooltip" data-placement="left" ></div>
|
||||||
<span class="label">GIF</span>
|
<div class="tool-icon upload-cloud-icon" title="Upload as an animated GIF" onclick="piskel.uploadAsAnimatedGIF()" rel="tooltip" data-placement="left">
|
||||||
|
<span class="label">GIF</span>
|
||||||
|
</div>
|
||||||
|
<div class="tool-icon upload-cloud-icon" title="Upload as a spritesheet PNG" onclick="piskel.uploadAsSpritesheetPNG()" rel="tooltip" data-placement="left">
|
||||||
|
<span class="label">PNG</span>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="tool-icon upload-cloud-icon" title="Upload as a spritesheet PNG" onclick="pskl.app.uploadAsSpritesheetPNG()" rel="tooltip" data-placement="left">
|
<div class="drawer vertical-centerer">
|
||||||
<span class="label">PNG</span>
|
<div class="drawer-content">
|
||||||
</div>
|
<div class="settings-section">
|
||||||
</div>
|
<div class="settings-title">
|
||||||
<div class="drawer">
|
Canvas settings:
|
||||||
<div class="drawer-content">
|
</div>
|
||||||
<div class="settings-section">
|
<div class="settings-item">
|
||||||
<div class="settings-title">
|
<label>Background:</label>
|
||||||
Canvas settings:
|
<div id="background-picker-wrapper" class="background-picker-wrapper">
|
||||||
</div>
|
<div class="background-picker light-picker-background" data-background-class="light-canvas-background"
|
||||||
<div class="settings-item">
|
rel="tooltip" data-placement="bottom" title="light / high contrast">
|
||||||
<label>Background:</label>
|
</div>
|
||||||
<div id="background-picker-wrapper" class="background-picker-wrapper">
|
<div class="background-picker medium-picker-background" data-background-class="medium-canvas-background"
|
||||||
<div class="background-picker light-picker-background" data-background-class="light-canvas-background"
|
rel="tooltip" data-placement="bottom" title="medium / high contrast">
|
||||||
rel="tooltip" data-placement="bottom" title="light / high contrast">
|
</div>
|
||||||
</div>
|
<div class="background-picker lowcont-medium-picker-background" data-background-class="lowcont-medium-canvas-background"
|
||||||
<div class="background-picker medium-picker-background" data-background-class="medium-canvas-background"
|
rel="tooltip" data-placement="bottom" title="medium / low contrast">
|
||||||
rel="tooltip" data-placement="bottom" title="medium / high contrast">
|
</div>
|
||||||
</div>
|
<div class="background-picker lowcont-dark-picker-background" data-background-class="lowcont-dark-canvas-background"
|
||||||
<div class="background-picker lowcont-medium-picker-background" data-background-class="lowcont-medium-canvas-background"
|
rel="tooltip" data-placement="bottom" title="dark / low contrast">
|
||||||
rel="tooltip" data-placement="bottom" title="medium / low contrast">
|
</div>
|
||||||
</div>
|
|
||||||
<div class="background-picker lowcont-dark-picker-background" data-background-class="lowcont-dark-canvas-background"
|
|
||||||
rel="tooltip" data-placement="bottom" title="dark / low contrast">
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
<div class="settings-item">
|
||||||
<div class="settings-item">
|
<label for="show-grid">Show grid:</label> <input id="show-grid" type="checkbox"/>
|
||||||
<label for="show-grid">Show grid:</label> <input id="show-grid" type="checkbox"/>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -179,4 +183,3 @@
|
||||||
<script src="js/piskel.js"></script>
|
<script src="js/piskel.js"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user