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

Conflicts:
	config/webpack.production.config.js
	package-lock.json
	package.json

src/styles/_components.scss

@@ -46,6 +46,7 @@
 
 // BUTTON
 .maputnik-button {
+  display: inline-block;
   cursor: pointer;
   background-color: $color-midgray;
   color: $color-lowgray;

src/styles/_modal.scss

@@ -6,6 +6,7 @@
   background-color: $color-black;
   box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.3);
   z-index: 3;
+  position: relative;
 }
 
 .maputnik-modal-section {
@@ -20,6 +21,10 @@
   flex-shrink: 0;
 }
 
+.maputnik-modal-sub-section {
+  margin-top: $margin-1;
+}
+
 .maputnik-modal-section--shrink {
   flex-shrink: 1;
 }
@@ -75,6 +80,7 @@
   position: fixed;
   align-items: center;
   justify-content: center;
+  z-index: 9;
 
   @include flex-row;
 }

src/styles/_toolbar.scss

@@ -36,12 +36,24 @@
   cursor: pointer;
   color: $color-white;
   text-decoration: none;
+  line-height: 20px;
+
+  h1 {
+    position: relative;
+  }
 
   &:hover {
     background-color: $color-midgray;
   }
 }
 
+.maputnik-toolbar-version {
+  position: absolute;
+  font-size: 10px;
+  bottom: -2px;
+  margin-left: 4px;
+}
+
 .maputnik-toolbar-action {
   @extend .maputnik-toolbar-link;
 }
@@ -56,7 +68,7 @@
 }
 
 .maputnik-toolbar-logo {
-  flex: 0 0 140px;
+  flex: 0 0 170px;
 }
 
 .maputnik-toolbar__inner {