Merge remote-tracking branch 'upstream/master' into feature/layer-list-ui-handle

Conflicts:
	src/styles/_layer.scss
This commit is contained in:
orangemug
2018-11-02 17:57:42 +00:00
15 changed files with 110 additions and 49 deletions

View File

@@ -206,6 +206,11 @@
.more-menu {
position: relative;
svg {
width: 22px;
height: 22px;
}
&__menu {
position: absolute;
z-index: 9999;
@@ -241,3 +246,9 @@
}
}
// Clone of the element which is sorted
.sortableHelper {
font-family: $font-family;
z-index: 9999;
border: none;
}