소스 검색

removed loading screen

unknown 9 년 전
부모
커밋
b976a65793
3개의 변경된 파일13개의 추가작업 그리고 38개의 파일을 삭제
  1. 0 16
      app/app.css
  2. 0 5
      app/templates/loading.html
  3. 13 17
      app/templates/room.html

+ 0 - 16
app/app.css

@@ -470,30 +470,14 @@ footer a:hover{
 .pl-container h4{
   text-decoration: underline;
 }
-
-
-#spinner {
-  font-size: 200px;
-  color: bisque;
-}
-
-#spinner-container {
-  margin-left: auto;
-  margin-right: auto;
-  width: 200px;
-  margin-top: 10%;
-}
-
 #croom_container {
   margin-left: auto;
   margin-right: auto;
   width: 304px !important;
 }
-
 #croom_label {
   color: white;
 }
-
 #croom {
   width: 304px !important;
 }

+ 0 - 5
app/templates/loading.html

@@ -1,5 +0,0 @@
-<template name="loading">
-    <div id="spinner-container">
-        <i class="fa fa-spinner fa-pulse" id="spinner"></i>
-    </div>
-</template>

+ 13 - 17
app/templates/room.html

@@ -14,24 +14,20 @@
 
         <div width="960" height="540" id="player">
         </div>
-        {{#if loaded}}
-            <h1 class="room-name">{{{type}}}</h1>
-            <h2 class="room-title">{{{title}}}</h2>
-            <h2 class="room-artist">{{{artist}}}</h2>
-            <div id="seeker-container">
-                <div id="seeker-bar"></div>
-            </div>
-            {{> playlist}}
-            <input type="text" id="song-input">
-            <button type="button" id="search-song" class="button">Search</button>
-            <div id="song-results"></div>
-            <!--src="http://www.youtube.com/embed/XGSy3_Czz8k?autoplay=1&controls=0&autohide=1">-->
+        <h1 class="room-name">{{{type}}}</h1>
+        <h2 class="room-title">{{{title}}}</h2>
+        <h2 class="room-artist">{{{artist}}}</h2>
+        <div id="seeker-container">
+            <div id="seeker-bar"></div>
+        </div>
+        {{> playlist}}
+        <input type="text" id="song-input">
+        <button type="button" id="search-song" class="button">Search</button>
+        <div id="song-results"></div>
+        <!--src="http://www.youtube.com/embed/XGSy3_Czz8k?autoplay=1&controls=0&autohide=1">-->
 
-            <div width="960" height="540" id="player">
-            </div>
-        {{else}}
-            {{> loading}}
-        {{/if}}
+        <div width="960" height="540" id="player">
+        </div>
         <ul class="bg-bubbles">
             <li></li>
             <li></li>