From fa1fe1a918ba453f2626bbb7b7f9e0db9fcafc7d Mon Sep 17 00:00:00 2001
From: Greg Fodor <gfodor@gmail.com>
Date: Wed, 21 Mar 2018 10:13:01 -0700
Subject: [PATCH] Move stylesheets and fonts under assets
---
src/{ => assets}/fonts/zilla-slab_latin-ext.woff2 | Bin
src/{ => assets}/fonts/zilla-slab_latin.woff2 | Bin
src/{ => assets/stylesheets}/fonts.scss | 4 ++--
src/{ => assets/stylesheets}/loader.scss | 0
src/{ => assets/stylesheets}/room.scss | 4 ++--
src/room.js | 4 ++--
6 files changed, 6 insertions(+), 6 deletions(-)
rename src/{ => assets}/fonts/zilla-slab_latin-ext.woff2 (100%)
rename src/{ => assets}/fonts/zilla-slab_latin.woff2 (100%)
rename src/{ => assets/stylesheets}/fonts.scss (68%)
rename src/{ => assets/stylesheets}/loader.scss (100%)
rename src/{ => assets/stylesheets}/room.scss (99%)
diff --git a/src/fonts/zilla-slab_latin-ext.woff2 b/src/assets/fonts/zilla-slab_latin-ext.woff2
similarity index 100%
rename from src/fonts/zilla-slab_latin-ext.woff2
rename to src/assets/fonts/zilla-slab_latin-ext.woff2
diff --git a/src/fonts/zilla-slab_latin.woff2 b/src/assets/fonts/zilla-slab_latin.woff2
similarity index 100%
rename from src/fonts/zilla-slab_latin.woff2
rename to src/assets/fonts/zilla-slab_latin.woff2
diff --git a/src/fonts.scss b/src/assets/stylesheets/fonts.scss
similarity index 68%
rename from src/fonts.scss
rename to src/assets/stylesheets/fonts.scss
index a6910ed3b..1ec1b6c12 100644
--- a/src/fonts.scss
+++ b/src/assets/stylesheets/fonts.scss
@@ -3,7 +3,7 @@
font-family: 'Zilla Slab';
font-style: normal;
font-weight: 400;
- src: local('Zilla Slab'), local('ZillaSlab-Regular'), url('./fonts/zilla-slab_latin-ext.woff2') format('woff2');
+ src: local('Zilla Slab'), local('ZillaSlab-Regular'), url('../fonts/zilla-slab_latin-ext.woff2') format('woff2');
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
}
@@ -12,6 +12,6 @@
font-family: 'Zilla Slab';
font-style: normal;
font-weight: 400;
- src: local('Zilla Slab'), local('ZillaSlab-Regular'), url('./fonts/zilla-slab_latin.woff2') format('woff2');
+ src: local('Zilla Slab'), local('ZillaSlab-Regular'), url('../fonts/zilla-slab_latin.woff2') format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
diff --git a/src/loader.scss b/src/assets/stylesheets/loader.scss
similarity index 100%
rename from src/loader.scss
rename to src/assets/stylesheets/loader.scss
diff --git a/src/room.scss b/src/assets/stylesheets/room.scss
similarity index 99%
rename from src/room.scss
rename to src/assets/stylesheets/room.scss
index c79e990d5..e7c543d50 100644
--- a/src/room.scss
+++ b/src/assets/stylesheets/room.scss
@@ -1,5 +1,5 @@
-@import 'src/fonts';
-@import 'src/loader';
+@import 'fonts';
+@import 'loader';
$dark-transparent: rgba(0, 0, 0, 0.4);
$darker-transparent: rgba(0, 0, 0, 0.6);
diff --git a/src/room.js b/src/room.js
index 9aea754c2..eee34df54 100644
--- a/src/room.js
+++ b/src/room.js
@@ -1,4 +1,4 @@
-import "./room.scss";
+import "./assets/stylesheets/room.scss";
import queryString from "query-string";
import { patchWebGLRenderingContext } from "./utils/webgl";
@@ -131,7 +131,7 @@ function setNameTagFromStore() {
async function enterScene(mediaStream, enterInVR) {
const scene = document.querySelector("a-scene");
document.querySelector("a-scene canvas").classList.remove("blurred")
- scene.setAttribute("networked-scene", "adapter: janus; audio: true; debug: true; onConnect: App.onConnect; connectOnLoad: false;");
+ scene.setAttribute("networked-scene", "adapter: janus; audio: true; debug: true; connectOnLoad: false;");
registerNetworkSchemas();
if (enterInVR) {
--
GitLab