ashatora/editor
1
0
Fork 0
mirror of https://github.com/maputnik/editor.git synced 2026-01-06 13:30:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into fix/web-driver-tests-v8

Browse Source 
Conflicts:
	src/styles/index.scss
This commit is contained in:
orangemug
2018-04-16 15:31:27 +01:00
parent c4b92fa0a9 b60df8b074
commit 78a7f152e7
7 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/styles/index.scss
View File

@@ -36,6 +36,7 @@ $toolbar-offset: 0;
@import 'zoomproperty';
@import 'popup';
@import 'map';
@import 'react-collapse';
/**
* Hacks for webdriverio isVisibleWithinViewport