Reintegrating css changes from master

This commit is contained in:
jdescottes 2013-07-14 23:18:03 +02:00
parent 032c8c4485
commit 4e1deee851
2 changed files with 54 additions and 49 deletions

View File

@ -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;

View File

@ -18,7 +18,8 @@
<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">
<div class="vertical-centerer">
<ul id="tools-container" class="tools-wrapper"></ul> <ul id="tools-container" class="tools-wrapper"></ul>
<div class="palette-wrapper"> <div class="palette-wrapper">
<div class="tool-icon tool-color-picker"> <div class="tool-icon tool-color-picker">
@ -33,20 +34,22 @@
</div> </div>
</div> </div>
</div> </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 class="vertical-centerer">
<div id="settings" class="tool-icon gear-icon" title="Preferences" rel="tooltip" data-placement="left"></div> <div id="settings" class="tool-icon gear-icon" title="Preferences" 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> <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 save-icon" title="Save to gallery" onclick="pskl.app.storeSheet()" rel="tooltip" data-placement="left" ></div> <div class="tool-icon save-icon" title="Save to gallery" onclick="piskel.storeSheet()" rel="tooltip" data-placement="left" ></div>
<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 upload-cloud-icon" title="Upload as an animated GIF" onclick="piskel.uploadAsAnimatedGIF()" rel="tooltip" data-placement="left">
<span class="label">GIF</span> <span class="label">GIF</span>
</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="tool-icon upload-cloud-icon" title="Upload as a spritesheet PNG" onclick="piskel.uploadAsSpritesheetPNG()" rel="tooltip" data-placement="left">
<span class="label">PNG</span> <span class="label">PNG</span>
</div> </div>
</div> </div>
<div class="drawer"> <div class="drawer vertical-centerer">
<div class="drawer-content"> <div class="drawer-content">
<div class="settings-section"> <div class="settings-section">
<div class="settings-title"> <div class="settings-title">
@ -76,6 +79,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div id="column-wrapper" class="column-wrapper"> <div id="column-wrapper" class="column-wrapper">
<div class='column left-column'> <div class='column left-column'>
@ -179,4 +183,3 @@
<script src="js/piskel.js"></script> <script src="js/piskel.js"></script>
</body> </body>
</html> </html>