From 2c235e659bd81880bed8908a5a581401ec10658f Mon Sep 17 00:00:00 2001 From: jdescottes Date: Sat, 5 Jul 2014 11:39:02 +0200 Subject: [PATCH] Fixed layout on FF, removed options in drawer --- src/css/toolbox-animated-preview.css | 7 ++++--- .../settings/ApplicationSettingsController.js | 9 --------- src/templates/settings/application.html | 11 ----------- 3 files changed, 4 insertions(+), 23 deletions(-) diff --git a/src/css/toolbox-animated-preview.css b/src/css/toolbox-animated-preview.css index 04ac857e..559e0ddf 100644 --- a/src/css/toolbox-animated-preview.css +++ b/src/css/toolbox-animated-preview.css @@ -41,21 +41,22 @@ font-size: 12px; min-width: 55px; vertical-align: bottom; - line-height: 24px; + line-height: 26px; } .range-fps { overflow: hidden; width: 100px; - height : 24px; + height : 26px; margin : 0; + box-sizing: border-box; } .preview-toggle-onion-skin { font-size: 1.6rem; color: #aaa; float: left; - line-height: 24px; + line-height: 26px; height: 100%; padding-left: 5px; padding-right: 5px; diff --git a/src/js/controller/settings/ApplicationSettingsController.js b/src/js/controller/settings/ApplicationSettingsController.js index 746dc66e..4364005f 100644 --- a/src/js/controller/settings/ApplicationSettingsController.js +++ b/src/js/controller/settings/ApplicationSettingsController.js @@ -18,10 +18,6 @@ $('#grid-width').val(gridWidth); $('#grid-width').change(this.onGridWidthChange.bind(this)); - var overlay = pskl.UserSettings.get(pskl.UserSettings.OVERLAY); - $('#overlay').val(overlay); - $('#overlay').change(this.onOverlayChange.bind(this)); - // Handle canvas background changes: $('#background-picker-wrapper').click(this.onBackgroundClick.bind(this)); }; @@ -31,11 +27,6 @@ pskl.UserSettings.set(pskl.UserSettings.GRID_WIDTH, parseInt(width, 10)); }; - ns.ApplicationSettingsController.prototype.onOverlayChange = function (evt) { - var overlay = $('#overlay').val(); - pskl.UserSettings.set(pskl.UserSettings.OVERLAY, overlay); - }; - ns.ApplicationSettingsController.prototype.onBackgroundClick = function (evt) { var target = $(evt.target).closest('.background-picker'); if (target.length) { diff --git a/src/templates/settings/application.html b/src/templates/settings/application.html index 77f6ca06..22c72076 100644 --- a/src/templates/settings/application.html +++ b/src/templates/settings/application.html @@ -30,17 +30,6 @@ -
- Overlay: -
-
- - -