瀏覽代碼

Fixed Akira's derp

KrisVos130 9 年之前
父節點
當前提交
102a2df12b
共有 3 個文件被更改,包括 31 次插入33 次删除
  1. 20 25
      app/app.css
  2. 3 0
      app/app.html
  3. 8 8
      app/app.js

+ 20 - 25
app/app.css

@@ -298,40 +298,35 @@ footer a:hover{
 .button:hover {
   background-color: #f5f7f9;
 }
-#dashboard #name-container{
-  background-color: rgba(255,255,255,0.5);
-  width: 300px;
-  height: 60px;
-}
-#dashboard h1{
-  margin-left: 20px;
-  line-height: 60px;
-  color: white;
-  font-weight: 600;
-}
-#dashboard .logout{
+
+.logout{
   margin-left: 20px;
   cursor: pointer;
 }
-#dashboard .station{
-  
-}
-#dashboard .station:hover{
+.station{
   background-color: rgba(102,205,170,0.7);
+  height: 300px;
+  width: 300px;
+  border-radius: 100%;
+}
+.station-top{
+  height: 200px;
 }
-#dashboard .station .station-name{
+.station:hover{
 
 }
-#dashboard .station .song-info{
-  text-align: center;
+.station .station-name-container{
+  background-color: rgba(102,205,200,1);
+  border-radius: 20px;
+  width: 275px;
 }
-#dashboard .station .song-title{
+.station .station-name{
   font-size: 2.5em;
+  color: white;
+  text-align: center;
+  font-weight: 600;
 }
-#dashboard .station .song-artist{
-  font-size: 2em;
-}
-#dashboard .station .button-tunein{
+.station .button-tunein{
   outline: 0;
   border: 0;
   border: 2px solid white;
@@ -345,7 +340,7 @@ footer a:hover{
   display: block;
   margin: 0 auto;
 }
-#dashboard .station .controls{
+.station .controls{
   font-size: 2em;
   display: block;
   text-align: center;

+ 3 - 0
app/app.html

@@ -50,6 +50,9 @@
 
 <template name="dashboard">
   <div class="landing">
+    <div class="station">
+      
+    </div>
 
     <ul class="bg-bubbles">
     	<li></li>

+ 8 - 8
app/app.js

@@ -1,6 +1,6 @@
 History = new Mongo.Collection("history");
 
-if (Meteor.isClient) {  
+if (Meteor.isClient) {
     var hpSound = undefined;
     Template.register.events({
         "submit form": function(e){
@@ -92,7 +92,7 @@ if (Meteor.isClient) {
             $("#stop").show();
         }
     });
-  
+
     Template.Room.helpers({
         type: function() {
             var parts = location.href.split('/');
@@ -103,7 +103,7 @@ if (Meteor.isClient) {
             return Session.get("duration");
         }
     });
-  
+    
     Template.Room.onCreated(function () {
         var currentSong = undefined;
         var _sound = undefined;
@@ -112,7 +112,7 @@ if (Meteor.isClient) {
         function getTimeElapsed() {
             if (currentSong !== undefined) {
                 return Date.now() - currentSong.started;
-            } 
+            }
             return 0;
         }
 
@@ -129,7 +129,7 @@ if (Meteor.isClient) {
                 });
             }
         }
-        
+
         Meteor.subscribe("history");
         Meteor.setInterval(function() {
             var data = undefined;
@@ -149,7 +149,7 @@ if (Meteor.isClient) {
     });
 }
 
-if (Meteor.isServer) {    
+if (Meteor.isServer) {
     var startedAt = Date.now();
     var songs = [{id: 172055891, duration: 20}, {id: 194153620, duration: 60}];
     var currentSong = 0;
@@ -173,7 +173,7 @@ if (Meteor.isServer) {
             skipSong();
         }, songs[currentSong].duration * 1000);
     }
-    
+
     ServiceConfiguration.configurations.remove({
         service: "facebook"
     });
@@ -193,7 +193,7 @@ if (Meteor.isServer) {
         clientId: "dcecd720f47c0e4001f7",
         secret: "375939d001ef1a0ca67c11dbf8fb9aeaa551e01b"
     });
-  
+
     songTimer();
 
     Meteor.publish("history", function() {