diff --git a/css/style.css b/css/style.css index 78615689..7d94ec42 100644 --- a/css/style.css +++ b/css/style.css @@ -141,20 +141,20 @@ body { * User messages */ .user-message { - position: absolute; - right: 0; - bottom: 0; - background-color: #F9EDBE; - padding: 10px 47px; - border-top-left-radius: 7px; - color: #222; - border: #F0C36D 1px solid; - border-right: 0; - border-bottom: 0; - font-weight: bold; - font-size: 13px; - z-index: 10000; - max-width: 300px; + position: absolute; + right: 0; + bottom: 0; + background-color: #F9EDBE; + padding: 10px 47px; + border-top-left-radius: 7px; + color: #222; + border: #F0C36D 1px solid; + border-right: 0; + border-bottom: 0; + font-weight: bold; + font-size: 13px; + z-index: 10000; + max-width: 300px; } .user-message .close { diff --git a/img/actions/add.png b/img/actions/add.png deleted file mode 100755 index 3c03e4d3..00000000 Binary files a/img/actions/add.png and /dev/null differ diff --git a/img/actions/delete.png b/img/actions/delete.png deleted file mode 100755 index adcb19c6..00000000 Binary files a/img/actions/delete.png and /dev/null differ diff --git a/img/actions/duplicate.png b/img/actions/duplicate.png deleted file mode 100755 index 38b6955e..00000000 Binary files a/img/actions/duplicate.png and /dev/null differ diff --git a/img/actions/image-export.png b/img/actions/image-export.png deleted file mode 100644 index d94df7f8..00000000 Binary files a/img/actions/image-export.png and /dev/null differ diff --git a/index.html b/index.html index 92403dbc..18c2799e 100644 --- a/index.html +++ b/index.html @@ -64,7 +64,6 @@
-
@@ -82,7 +81,6 @@
-
@@ -101,7 +99,7 @@ - + diff --git a/js/controller/DrawingController.js b/js/controller/DrawingController.js index f0932409..bfd1acfa 100644 --- a/js/controller/DrawingController.js +++ b/js/controller/DrawingController.js @@ -77,7 +77,9 @@ ns.DrawingController.prototype.startDPIUpdateTimer_ = function () { - if (this.dpiUpdateTimer) window.clearInterval(this.dpiUpdateTimer); + if (this.dpiUpdateTimer) { + window.clearInterval(this.dpiUpdateTimer); + } this.dpiUpdateTimer = window.setTimeout($.proxy(this.updateDPI_, this), 200); }, @@ -258,25 +260,10 @@ leftSectionWidth = $('.left-column').width(), rightSectionWidth = $('.right-column').width(), availableViewportWidth = $('body').width() - leftSectionWidth - rightSectionWidth, - //previewHeight = $(".preview-container").height(), - //previewWidth = $(".preview-container").width(), framePixelHeight = this.framesheet.getCurrentFrame().getHeight(), framePixelWidth = this.framesheet.getCurrentFrame().getWidth(); var dpi = pskl.PixelUtils.calculateDPI(availableViewportHeight, availableViewportWidth, framePixelHeight, framePixelWidth); - /* - var drawingCanvasHeight = dpi * framePixelHeight; - var drawingCanvasWidth = dpi * framePixelWidth; - */ - // Check if preview and drawing canvas overlap - /* - var heightGap = drawingCanvasHeight + previewHeight - availableViewportHeight, - widthGap = drawingCanvasWidth + previewWidth - availableViewportWidth; - if (heightGap > 0 && widthGap > 0) { - // Calculate the DPI change needed to bridge height and width gap - var gapDPI = pskl.PixelUtils.calculateDPI(heightGap, widthGap, framePixelHeight, framePixelWidth); - // substract gap dpi to initial dpi - dpi -= (gapDPI + 1); - }*/ + return dpi; };