瀏覽代碼

Made homepage display station displays at all time.

KrisVos130 9 年之前
父節點
當前提交
837ad5b17f
共有 5 個文件被更改,包括 41 次插入56 次删除
  1. 4 1
      app/app.css
  2. 24 27
      app/templates/dashboard.html
  3. 13 26
      app/templates/home.html
  4. 0 1
      app/templates/login.html
  5. 0 1
      app/templates/register.html

+ 4 - 1
app/app.css

@@ -191,7 +191,7 @@ ul {
   background-color: transparent;
   font-weight: 900;
 }
-.loginlanding {
+.homepage {
   background: #50a3a2;
   background: -webkit-linear-gradient(top left, #50a3a2 0%, #53e3a6 100%);
   background: linear-gradient(to bottom right, #50a3a2 0%, #53e3a6 100%);
@@ -877,3 +877,6 @@ footer a:hover{
   margin-top: 10px;
   margin-left: 10px;
 }
+#loginregistercontainer {
+  margin-bottom: 100px;
+}

+ 24 - 27
app/templates/dashboard.html

@@ -1,33 +1,30 @@
 <template name="dashboard">
-    <div class="landing">
-      {{> header}}
-        <div class="row">
-           {{#each rooms}}
-              <div class="col-md-4 col-sm-6 col-xs-12">
-                  <div class="station">
-                      <h3>{{type}}</h3>
-                      {{#with type=type}}
-                        <h5>{{currentSong.song.title}}</h5>
-                        <h6>{{currentSong.song.artist}}</h6>
-                      {{/with}}
-                      <a href="/{{type}}" class="station_link"></a>
-                  </div>
+    <div class="row">
+       {{#each rooms}}
+          <div class="col-md-4 col-sm-6 col-xs-12">
+              <div class="station">
+                  <h3>{{type}}</h3>
+                  {{#with type=type}}
+                    <h5>{{currentSong.song.title}}</h5>
+                    <h6>{{currentSong.song.artist}}</h6>
+                  {{/with}}
+                  <a href="/{{type}}" class="station_link"></a>
               </div>
-           {{/each}}
-        </div>
-        <ul class="bg-bubbles">
-            <li></li>
-            <li></li>
-            <li></li>
-            <li></li>
-            <li></li>
-            <li></li>
-            <li></li>
-            <li></li>
-            <li></li>
-            <li></li>
-        </ul>
+          </div>
+       {{/each}}
     </div>
+    <ul class="bg-bubbles">
+        <li></li>
+        <li></li>
+        <li></li>
+        <li></li>
+        <li></li>
+        <li></li>
+        <li></li>
+        <li></li>
+        <li></li>
+        <li></li>
+    </ul>
 
     <script type="text/javascript">
         window.doorbellOptions = {

+ 13 - 26
app/templates/home.html

@@ -1,31 +1,18 @@
 <template name="home">
-    {{#if currentUser}}
-    <div id="dashboard">
+    <div class="homepage">
+        {{> header}}
+        {{#if currentUser}}
+        {{else}}
+            <div id="loginregistercontainer">
+                <div id="login-view">
+                    {{> login}}
+                </div>
+                <div id="register-view" style="display:none">
+                    {{> register}}
+                </div>
+            </div>
+        {{/if}}
         {{> dashboard}}
         {{> footer}}
     </div>
-    {{else}}
-    <div class="loginlanding">
-        <div id="login-view">
-            {{> login}}
-        </div>
-        <div id="register-view" style="display:none">
-            {{> register}}
-        </div>
-
-        <ul class="bg-bubbles">
-            <li></li>
-            <li></li>
-            <li></li>
-            <li></li>
-            <li></li>
-            <li></li>
-            <li></li>
-            <li></li>
-            <li></li>
-            <li></li>
-        </ul>
-    </div>
-    {{> footer}}
-    {{/if}}
 </template>

+ 0 - 1
app/templates/login.html

@@ -1,5 +1,4 @@
 <template name="login">
-  {{> header}}
     <div class="container">
         <button class="button" id="register">Sign Up</button>
         <h1>Login</h1>

+ 0 - 1
app/templates/register.html

@@ -1,5 +1,4 @@
 <template name="register">
-  {{> header}}
     <div class="container">
         <button class="button" id="login">Login</button>
         <h1>Sign Up</h1>