Browse Source

tablet view fix

AkiraLaine 9 years ago
parent
commit
84cef94700
3 changed files with 28 additions and 4 deletions
  1. 25 0
      app/app.css
  2. 2 3
      app/app.js
  3. 1 1
      app/templates/room.html

+ 25 - 0
app/app.css

@@ -471,6 +471,31 @@ form button:hover {
     -webkit-animation-delay: 11s;
     animation-delay: 11s;
 }
+/*Tablet view fix*/
+@media (max-width: 768px){
+    #station-main nav h3{
+        margin-left: 20% !important;
+    }
+    .bg-bubbles li:nth-child(10) {
+        display: none;
+    }
+    #song-media{
+        margin-left: 0;
+    }
+    .col-md-4{
+        margin: 15px auto;
+        width: 200px;
+    }
+    #settings{
+        margin: 0 auto !important;
+        width: 300px !important;
+        margin-bottom: 100px !important;
+    }
+    #side-panel{
+        display: none;
+    }
+}
+/*-----*/
 
 @-webkit-keyframes square {
     0% {

+ 2 - 3
app/app.js

@@ -773,7 +773,6 @@ if (Meteor.isClient) {
                                 'onReady': function(event) {
                                     event.target.seekTo(getTimeElapsed() / 1000);
                                     event.target.playVideo();
-                                    console.log("Playing YT video")
                                     event.target.setVolume(volume);
                                     resizeSeekerbar();
                                 },
@@ -855,10 +854,10 @@ if (Meteor.isServer) {
         reCAPTCHA.config({
             privatekey: '6LcVxg0TAAAAAI2fgIEEWHFxwNXeVIs8mzq5cfRM'
         });
-        var stations = [{tag: "edm", dislay: "EDM"}, {tag: "pop", display: "Pop"}]; //Rooms to be set on server startup
+        var stations = [{tag: "edm", display: "EDM"}, {tag: "pop", display: "Pop"}]; //Rooms to be set on server startup
         for(var i in stations){
             if(Rooms.find({type: stations[i]}).count() === 0){
-                createRoom(stations[i].tag, stations[i].display);
+                createRoom(stations[i].display, stations[i].tag);
             }
         }
     });

+ 1 - 1
app/templates/room.html

@@ -54,7 +54,7 @@
                             <button title="I dislike this song." type="button" id="meh-modal" class="btn btn-danger btn-lg"><i class="fa fa-meh-o"> 14</i></button>
 							<button title="Report this song!" type="button" id="song-modal" class="btn btn-warning btn-lg"><i class="fa fa-flag"></i></button> 
                             {{else}}
-                            <button title="You need to be logged to smile to this song." type="button" id="smile-modal" class="btn btn-success btn-lg" data-toggle="modal" data-target="#myModal" disabled><i class="fa fa-smile-o"> 79</i></button>
+                            <button title="You need to be logged to smile this song." type="button" id="smile-modal" class="btn btn-success btn-lg" data-toggle="modal" data-target="#myModal" disabled><i class="fa fa-smile-o"> 79</i></button>
                             <button title="You need to be logged to dislike this song." type="button" id="meh-modal" class="btn btn-danger btn-lg" data-toggle="modal" data-target="#myModal" disabled><i class="fa fa-meh-o"> 14</i></button>
 							<button title="You need to be logged to report this song!" type="button" id="song-modal" class="btn btn-warning btn-lg" data-toggle="modal" data-target="#myModal" disabled><i class="fa fa-flag"></i></button>
 							{{/if}}