Skip to content
This repository has been archived by the owner on Jun 19, 2018. It is now read-only.

Commit

Permalink
fix(events): use lower z-index to prevent conflict with mdDialog
Browse files Browse the repository at this point in the history
Closes #264
  • Loading branch information
Matt Lewis committed Jan 22, 2016
1 parent 0c617e8 commit 5ef9369
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/directives/mwlDraggable.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ angular
}

translateElement(elm, 'translate(' + x + 'px, ' + y + 'px)')
.css('z-index', 1000)
.css('z-index', 50)
.attr('data-x', x)
.attr('data-y', y);

Expand Down
2 changes: 1 addition & 1 deletion src/less/month.less
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
position: absolute;
bottom: 0;
left: 0;
z-index: 1000;
z-index: 50;
}
.cal-slide-content ul.unstyled {
margin-bottom: 0;
Expand Down
2 changes: 1 addition & 1 deletion test/unit/directives/mwlDraggable.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ describe('mwlDraggable directive', function() {

draggableOptions.onstart(event);
draggableOptions.onmove(event);
expect(angular.element(event.target).css('z-index')).to.equal('1000');
expect(angular.element(event.target).css('z-index')).to.equal('50');
expect(angular.element(event.target).attr('data-y')).to.equal('30');
expect(angular.element(event.target).attr('data-x')).to.equal('0');
expect(scope.onDrag).to.have.been.calledWith(0, 1);
Expand Down

0 comments on commit 5ef9369

Please sign in to comment.