From bc4fbff53040ae88302478c01cb4547b5db39445 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Wed, 6 Jul 2016 13:32:34 +0200 Subject: [PATCH] Update sw-visibility command --- src/canvas/view/CanvasView.js | 3 ++- src/commands/view/SwitchVisibility.js | 13 +++++-------- styles/css/main.css | 2 +- styles/scss/main.scss | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/canvas/view/CanvasView.js b/src/canvas/view/CanvasView.js index e076726a1..4f89bbc52 100644 --- a/src/canvas/view/CanvasView.js +++ b/src/canvas/view/CanvasView.js @@ -35,8 +35,9 @@ function(Backbone, FrameView) { var conf = this.config.em.get('Config'); body.append(wrap.render()).append(cssc.render()); var protCss = conf.protectedCss; + var frameCss = '.' + this.ppfx + 'dashed *{outline: 1px dashed rgba(170,170,170,0.7); outline-offset: -2px;}'; if(protCss) - body.append(''); + body.append(''); } }, diff --git a/src/commands/view/SwitchVisibility.js b/src/commands/view/SwitchVisibility.js index 703b334b5..0ba984516 100644 --- a/src/commands/view/SwitchVisibility.js +++ b/src/commands/view/SwitchVisibility.js @@ -1,16 +1,13 @@ define(function() { - /** - * @class SwitchVisibility - * @private - * */ return { - run: function() { - this.$canvas.addClass(this.pfx + 'dashed'); + run: function(ed) { + ed.Canvas.getBody().className = this.ppfx + 'dashed'; }, - stop: function() { - this.$canvas.removeClass(this.pfx + 'dashed'); + stop: function(ed) { + ed.Canvas.getBody().className = ""; } + }; }); \ No newline at end of file diff --git a/styles/css/main.css b/styles/css/main.css index e0cee4780..1f11f3e31 100644 --- a/styles/css/main.css +++ b/styles/css/main.css @@ -2784,7 +2784,7 @@ ol.example li.placeholder:before { height: 100%; width: 100%; pointer-events: 'none'; - padding: 1px; + padding: 1.5px; outline: none; } /********* PANELS **********/ diff --git a/styles/scss/main.scss b/styles/scss/main.scss index 03a0a9827..1b0066bf3 100644 --- a/styles/scss/main.scss +++ b/styles/scss/main.scss @@ -264,7 +264,7 @@ ol.example li.placeholder:before {position: absolute;} box-shadow: 0 0 3px rgba(0, 0, 0, 0.2); height: 100%; width: 100%; pointer-events: 'none'; - padding: 1px; + padding: 1.5px; outline: none; }