Merge pull request #25 from theonion/fix-z-index

Fix z-index issue
theonion · May 18, 2016 · 6f8f9d6 · 6f8f9d6
2 parents 0fba58c + 66717d4
commit 6f8f9d6
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 5 deletions.
diff --git 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",

diff --git 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
@@ -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/...-cms/clickventure-edit/clickventure-edit-node-toolbar/clickventure-edit-node-toolbar.less b/...-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/...bs-cms/clickventure-edit/clickventure-edit-tool-fixture/clickventure-edit-tool-fixture.js b/...bs-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', '');
             }
           }));
         }