Adding moar icons + anim preview + code removal

This commit is contained in:
grosbouddha 2013-06-12 18:39:33 +02:00
parent 31062a70a9
commit 5de77dc6fb
19 changed files with 22291 additions and 31 deletions

View file

@ -1,17 +0,0 @@
.preview-container {
background : white;
border : 0px Solid black;
border-radius:5px 0px 0px 5px;
box-shadow : 0px 0px 2px rgba(0,0,0,0.2);
font-size: 0;
}
.preview-container canvas {
border : 0px Solid transparent;
}
#preview-fps {
width : 200px;
}

View file

@ -98,6 +98,11 @@
border-style: solid; border-style: solid;
} }
/**
* Drag n drop styles.
*/
.preview-tile.ui-draggable-dragging { .preview-tile.ui-draggable-dragging {
opacity: 0.3; opacity: 0.3;
} }

View file

@ -3,6 +3,7 @@
body { body {
background: -webkit-radial-gradient(circle, #000, #373737); background: -webkit-radial-gradient(circle, #000, #373737);
} }
/** /**
* Application layout * Application layout
*/ */
@ -46,7 +47,6 @@ body {
.right-column { .right-column {
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
background: blue;
margin-left: 10px; margin-left: 10px;
} }
@ -81,6 +81,39 @@ body {
z-index: 10; z-index: 10;
} }
/**
* Animated preview styles.
*/
.preview-container {
border : 0px Solid black;
border-radius:5px 0px 0px 5px;
box-shadow : 0px 0px 2px rgba(0,0,0,0.2);
font-size: 0;
}
.preview-container canvas {
border : 0px Solid transparent;
}
.display-fps {
float: left;
color: #aaa;
font-size: 12px;
min-width: 55px;
vertical-align: bottom;
line-height: 24px;
}
.range-fps {
overflow: hidden;
}
.application-actions {
margin-top: 35px;
}
/** /**
* User messages * User messages
*/ */

View file

@ -17,8 +17,8 @@
margin: 1px; margin: 1px;
background-color: rgba(200,200,200, .1); background-color: rgba(200,200,200, .1);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: 9px 9px; background-position: 12px 12px;
background-size: 28px; background-size: 24px 24px;
} }
.tool-icon.selected { .tool-icon.selected {
@ -41,7 +41,9 @@
} }
.tool-icon.tool-vertical-mirror-pen { .tool-icon.tool-vertical-mirror-pen {
background-image: url(../img/tools_legacy/vertical-mirror-pen.png); background-image: url(../img/tools/mirror.png);
background-position: 0px 10px;
background-size: 38px 27px;
} }
.tool-icon.tool-paint-bucket { .tool-icon.tool-paint-bucket {
@ -49,15 +51,17 @@
} }
.tool-icon.tool-eraser { .tool-icon.tool-eraser {
background-image: url(../img/tools_legacy/eraser.png); background-image: url(../img/tools/eraser.png);
} }
.tool-icon.tool-stroke { .tool-icon.tool-stroke {
background-image: url(../img/tools_legacy/stroke.png); background-image: url(../img/tools/stroke.png);
} }
.tool-icon.tool-rectangle { .tool-icon.tool-rectangle {
background-image: url(../img/tools_legacy/rectangle.png); background-image: url(../img/tools/rectangle.png);
background-position: 12px 14px;
background-size: 24px 20px;
} }
.tool-icon.tool-circle { .tool-icon.tool-circle {
@ -66,10 +70,14 @@
.tool-icon.tool-move { .tool-icon.tool-move {
background-image: url(../img/tools/hand.png); background-image: url(../img/tools/hand.png);
background-position: 12px 12px;
background-size: 24px 24px;
} }
.tool-icon.tool-rectangle-select { .tool-icon.tool-rectangle-select {
background-image: url(../img/tools_legacy/select.png); background-image: url(../img/tools/rectangle_selection.png);
background-position: 12px 14px;
background-size: 24px 20px;
} }
.tool-icon.tool-shape-select { .tool-icon.tool-shape-select {
@ -78,6 +86,8 @@
.tool-icon.tool-colorpicker { .tool-icon.tool-colorpicker {
background-image: url(../img/tools/eyedropper.png); background-image: url(../img/tools/eyedropper.png);
background-position: 12px 12px;
background-size: 23px 23px;
} }
/* /*

View file

Before

Width:  |  Height:  |  Size: 223 B

After

Width:  |  Height:  |  Size: 223 B

BIN
img/tools/eraser-dark.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 909 B

BIN
img/tools/eraser.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1,010 B

BIN
img/tools/mirror.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 253 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 245 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 376 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 372 B

BIN
img/tools/stroke.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

View file

@ -14,7 +14,6 @@
<link rel="stylesheet/less" type="text/css" href="css/bootstrap/bootstrap.css"> <link rel="stylesheet/less" type="text/css" href="css/bootstrap/bootstrap.css">
<link rel="stylesheet/less" type="text/css" href="css/bootstrap/bootstrap-tooltip-custom.css"> <link rel="stylesheet/less" type="text/css" href="css/bootstrap/bootstrap-tooltip-custom.css">
<link rel="stylesheet/less" type="text/css" href="css/preview-film-section.less"> <link rel="stylesheet/less" type="text/css" href="css/preview-film-section.less">
<link rel="stylesheet/less" type="text/css" href="css/preview-animation-section.less">
<script src="js/lib/less-1.3.3-min.js" type="text/javascript"></script> <script src="js/lib/less-1.3.3-min.js" type="text/javascript"></script>
</head> </head>
@ -64,18 +63,22 @@
<div id='preview-canvas-container' class="canvas-container"> <div id='preview-canvas-container' class="canvas-container">
<div class="canvas-background"></div> <div class="canvas-background"></div>
</div> </div>
<input id="preview-fps" type="range" min="1" max="24" value="12" style="width:200px;"/> <div>
<span id="display-fps">12 FPS</span> <span id="display-fps" class="display-fps">12 FPS</span>
<input id="preview-fps" class="range-fps" type="range" min="1" max="24" value="12"/>
</div>
</div> </div>
<div class="menubar"> <div class="application-actions">
<ul> <ul>
<!-- TODO: Remove that from here or change CSS class naming since <!-- TODO: Remove that from here or change CSS class naming since
they are framesheet level actions, not tools --> they are framesheet level actions, not tools -->
<li class="tool-icon tool-save" data-tool-id="tool-save" title="Save" onclick="piskel.storeSheet()" rel="tooltip" data-placement="bottom" ></li> <li class="tool-icon tool-save" data-tool-id="tool-save" title="Save" onclick="piskel.storeSheet()" rel="tooltip" data-placement="bottom" ></li>
<li class="tool-icon tool-export" data-tool-id="tool-export" title="Export" onclick="piskel.exportToPNG()" rel="tooltip" data-placement="bottom" ></li> <li class="tool-icon tool-export" data-tool-id="tool-export" title="Export to PNG framesheet" onclick="piskel.exportToPNG()" rel="tooltip" data-placement="bottom" ></li>
<li class="tool-icon tool-upload" data-tool-id="tool-upload" title="Upload as GIF" onclick="piskel.uploadAsGIF()" rel="tooltip" data-placement="bottom" ></li> <li class="tool-icon tool-upload" data-tool-id="tool-upload" title="Export to animated GIF" onclick="piskel.uploadAsGIF()" rel="tooltip" data-placement="bottom" ></li>
<li class="tool-icon tool-add-frame" id="add-frame-button" data-tool-id="tool-add-frame" title="Add a frame" rel="tooltip" data-placement="bottom" ></li> <li class="tool-icon tool-add-frame" id="add-frame-button" data-tool-id="tool-add-frame" title="Add a frame" rel="tooltip" data-placement="bottom" ></li>
</ul> </ul>
</div> </div>

4398
resources/eraser.ai Normal file

File diff suppressed because it is too large Load diff

4415
resources/mirror.ai Normal file

File diff suppressed because it is too large Load diff

4537
resources/rectangle.ai Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

4384
resources/stroke.ai Normal file

File diff suppressed because it is too large Load diff