From 0454f97dc80597c8e60891c4e709d4ce4b28f5ee Mon Sep 17 00:00:00 2001 From: Jamie Levinson Date: Tue, 17 May 2016 11:51:54 -0500 Subject: [PATCH 1/2] Fix z-index issue --- .../django-bulbs-cms/static/cms/clickventure/clickventure.css | 1 + .../django-bulbs-cms/static/cms/clickventure/clickventure.js | 2 -- .../clickventure-edit-node-toolbar.less | 1 + .../clickventure-edit-tool-fixture.js | 2 -- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/compat-builds/django-bulbs-cms/static/cms/clickventure/clickventure.css b/compat-builds/django-bulbs-cms/static/cms/clickventure/clickventure.css index 22540af..6dc96fe 100644 --- a/compat-builds/django-bulbs-cms/static/cms/clickventure/clickventure.css +++ b/compat-builds/django-bulbs-cms/static/cms/clickventure/clickventure.css @@ -86,6 +86,7 @@ clickventure-edit-node-toolbar { margin-left: 250px; position: absolute; width: 550px; + z-index: 100; } clickventure-edit-node-toolbar .clickventure-edit-node-toolbar-title { min-height: 34px; diff --git a/compat-builds/django-bulbs-cms/static/cms/clickventure/clickventure.js b/compat-builds/django-bulbs-cms/static/cms/clickventure/clickventure.js index a583521..8b5242d 100644 --- a/compat-builds/django-bulbs-cms/static/cms/clickventure/clickventure.js +++ b/compat-builds/django-bulbs-cms/static/cms/clickventure/clickventure.js @@ -1235,11 +1235,9 @@ angular.module('bulbs.clickventure.edit.toolFixture', [ elements.css('position', 'fixed'); elements.css('top', padding + 'px'); - elements.css('z-index', 1000); } else { elements.css('position', ''); elements.css('top', ''); - elements.css('z-index', ''); } })); } diff --git a/src/bulbs-cms/clickventure-edit/clickventure-edit-node-toolbar/clickventure-edit-node-toolbar.less b/src/bulbs-cms/clickventure-edit/clickventure-edit-node-toolbar/clickventure-edit-node-toolbar.less index c1cda4c..35d7200 100644 --- a/src/bulbs-cms/clickventure-edit/clickventure-edit-node-toolbar/clickventure-edit-node-toolbar.less +++ b/src/bulbs-cms/clickventure-edit/clickventure-edit-node-toolbar/clickventure-edit-node-toolbar.less @@ -4,6 +4,7 @@ clickventure-edit-node-toolbar { margin-left: 250px; position: absolute; width: 550px; + z-index: 100; .clickventure-edit-node-toolbar-title { min-height: 34px; diff --git a/src/bulbs-cms/clickventure-edit/clickventure-edit-tool-fixture/clickventure-edit-tool-fixture.js b/src/bulbs-cms/clickventure-edit/clickventure-edit-tool-fixture/clickventure-edit-tool-fixture.js index 87451ea..f20f94b 100644 --- a/src/bulbs-cms/clickventure-edit/clickventure-edit-tool-fixture/clickventure-edit-tool-fixture.js +++ b/src/bulbs-cms/clickventure-edit/clickventure-edit-tool-fixture/clickventure-edit-tool-fixture.js @@ -18,11 +18,9 @@ angular.module('bulbs.clickventure.edit.toolFixture', [ elements.css('position', 'fixed'); elements.css('top', padding + 'px'); - elements.css('z-index', 1000); } else { elements.css('position', ''); elements.css('top', ''); - elements.css('z-index', ''); } })); } From 66717d40f0330372c41fdea5d736deaa71219d43 Mon Sep 17 00:00:00 2001 From: Jamie Levinson Date: Wed, 18 May 2016 11:02:48 -0500 Subject: [PATCH 2/2] Version up --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 14a1636..0de634d 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "bulbs-component-clickventure", "description": "Frontend dependencies for Clickventure component.", - "version": "1.0.0", + "version": "1.0.1", "private": true, "ignore": [ "compat-builds",