ashatora/editor
1
0
Fork 0
mirror of https://github.com/maputnik/editor.git synced 2025-12-27 00:20:00 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/styles/_layer.scss
This commit is contained in:
orangemug
2018-11-02 17:57:42 +00:00
parent e9b5bfb572 b8ab802de5
commit b712e7f184
15 changed files with 110 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/styles/_layer.scss
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;
}

14
src/styles/_toolbar.scss
View File

@@ -100,10 +100,18 @@
background: inherit;
border-width: 0;
@extend .maputnik-toolbar-link;
}
.maputnik-toolbar-select select {
margin-left: 4px;
select {
// HACK: <https://github.com/maputnik/editor/pull/392#issuecomment-427595172>
color: $color-black !important;
margin-left: 4px;
border-width: 0;
option {
// HACK: <https://github.com/maputnik/editor/pull/392#issuecomment-427595172>
color: $color-black !important;
}
}
}
.maputnik-icon-text {