Merge branch 'master' into pxlvxl-master

css/_import-image.scss

@@ -0,0 +1,18 @@
+#import-image {
+    ul {
+        list-style-type: none;
+        margin: 15px 0;
+        padding: 0;
+    }
+
+    .import-image-file {
+        button {
+            margin: 0;
+        }
+    }
+
+    .import-image-location-pivot {
+        display: flex;
+        align-items: center;
+    }
+}

css/pixel-editor.scss

@@ -17,4 +17,5 @@
 @import 'palette-editor';
 @import 'splash-page';
 @import "export";
-@import "save-project";
+@import "save-project";
+@import "import-image";