Merge remote-tracking branch 'upstream/3.0' into 3.0

package.json

@@ -24,7 +24,7 @@
     "q": "^1.1.2",
     "sanitize-html": "git://github.com/calzoneman/sanitize-html",
     "serve-static": "^1.8.1",
-    "socket.io": "^1.3.2",
+    "socket.io": "^1.3.3",
     "yamljs": "^0.1.6"
   }
 }

templates/footer.jade

@@ -3,8 +3,8 @@ mixin footer
     .container
       p.text-muted.credit.
         Copyright &copy; 2013-2015 Calvin Montgomery&nbsp;&middot;&nbsp;<a href="https://github.com/calzoneman/sync">GitHub</a>&nbsp;&middot;&nbsp;<a href="/useragreement">User Agreement</a>&nbsp;&middot;&nbsp;<a href="/contact">Contact</a>&nbsp;&middot;&nbsp;<a href="https://github.com/calzoneman/sync/wiki">Wiki</a>
-  script(src="//code.jquery.com/jquery-1.11.0.min.js")
+  script(src="/js/jquery-1.11.0.min.js")
   // Must be included before jQuery-UI since jQuery-UI overrides jQuery.fn.button
   // I should really abandon this crap one day
-  script(src="//code.jquery.com/ui/1.10.3/jquery-ui.js")
+  script(src="/js/jquery-ui.js")
   script(src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js")

www/css/cytube.css

@@ -24,7 +24,6 @@
 
 #messagebuffer {
     width: auto;
-    padding-left: 5px;
 }
 
 #userlist {
@@ -80,6 +79,7 @@
 .drink {
     margin: 10px 10px;
     padding: 10px 0px;
+    border: 2px solid;
 }
 
 #drinkcount {
@@ -589,5 +589,6 @@ table td {
     line-height: 22px;
     padding: 2px;
     font-size: 8pt;
+    border: 1px solid;
     border-top-width: 0;
-}
+}

www/css/themes/bootstrap-theme.min.css

@@ -28,10 +28,6 @@ footer {
     background-color: #eeeeee !important;
 }
 
-.queue_active {
-    background-color: #d9edf7;
-}
-
 .profile-box, .user-dropdown {
     background-color: #ffffff;
 }
@@ -66,6 +62,10 @@ footer {
 }
 
 .queue_entry {
-    border: 1px solid #aaaaaa;
+    border-color: #aaaaaa;
     background-color: #ffffff;
-}
+}
+
+.queue_entry.queue_active {
+    background-color: #d9edf7;
+}

www/css/themes/cyborg.css

@@ -39,10 +39,6 @@ input.form-control[type="email"], textarea.form-control {
     color: #c8c8c8;
 }
 
-.queue_active {
-    background-color: #333333;
-}
-
 .profile-box, .user-dropdown {
     color: #c8c8c8;
     background-color: #2d2d2d;
@@ -78,6 +74,10 @@ input.form-control[type="email"], textarea.form-control {
 }
 
 .queue_entry {
-    border: 1px solid #aaaaaa;
+    border-color: #aaaaaa;
     background-color: #060606;
-}
+}
+
+.queue_entry.queue_active {
+    background-color: #333333;
+}

www/css/themes/light.css

@@ -22,10 +22,6 @@ footer {
     background-color: #eeeeee !important;
 }
 
-.queue_active {
-    background-color: #d9edf7;
-}
-
 .profile-box, .user-dropdown {
     background-color: #ffffff;
 }
@@ -60,6 +56,10 @@ footer {
 }
 
 .queue_entry {
-    border: 1px solid #aaaaaa;
+    border-color: #aaaaaa;
     background-color: #ffffff;
 }
+
+.queue_entry.queue_active {
+    background-color: #d9edf7;
+}

www/css/themes/modern.css

@@ -129,8 +129,7 @@ input.form-control[type="email"], textarea.form-control {
 }
 
 .queue_entry {
-    border: 1px solid #000000;
-    border-top-width: 0;
+    border-color: #000000;
     background-color: #272b30;
 }
 

www/css/themes/slate.css

@@ -90,6 +90,6 @@ input.form-control[type="email"], textarea.form-control {
 }
 
 .queue_entry {
-  border: 1px solid #aaaaaa;
+  border-color: #aaaaaa;
   background-color: #272b30;
-}
+}