From e5d52044321dfb56d34109f1fd0df33a0e3edd28 Mon Sep 17 00:00:00 2001
From: johnshaughnessy <johnfshaughnessy@gmail.com>
Date: Fri, 3 Aug 2018 10:41:05 -0700
Subject: [PATCH] Support different screen sizes and uploaded glb files.
---
src/assets/stylesheets/create-object-dialog.scss | 3 +++
src/components/media-loader.js | 1 +
2 files changed, 4 insertions(+)
diff --git a/src/assets/stylesheets/create-object-dialog.scss b/src/assets/stylesheets/create-object-dialog.scss
index 9486b858b..3474e0b33 100644
--- a/src/assets/stylesheets/create-object-dialog.scss
+++ b/src/assets/stylesheets/create-object-dialog.scss
@@ -37,6 +37,8 @@
font-size: 1.3em;
padding-left: 8%;
padding-right: 0%;
+ width: 80%;
+ white-space: nowrap;
}
:local(.fileNameLabel) {
@@ -45,6 +47,7 @@
align-self: center;
padding-left: 8%;
padding-right: 0%;
+ width: 80%;
}
:local(.form) {
diff --git a/src/components/media-loader.js b/src/components/media-loader.js
index b97074439..012fe14c4 100644
--- a/src/components/media-loader.js
+++ b/src/components/media-loader.js
@@ -85,6 +85,7 @@ AFRAME.registerComponent("media-loader", {
this.el.setAttribute("image-plus", { src: blobUrl || raw, contentType });
this.el.setAttribute("position-at-box-shape-border", { target: ".delete-button", dirs: ["forward", "back"] });
} else if (
+ contentType.indexOf("application/octet-stream") !== -1 ||
contentType.indexOf("x-zip-compressed") !== -1 ||
contentType.startsWith("model/gltf") ||
url.endsWith(".gltf") ||
--
GitLab