Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

Conflicts: MediaBrowser.WebDashboard/dashboard-ui/scripts/mediaplayer-video.js
2015-06-07 17:23:05 -04:00
parent ec469a7b05 440bfc832a
commit 4a0f78149a
16 changed files with 433 additions and 228 deletions
@@ -44,7 +44,7 @@
 }

 .cardBox {
-    margin: 3px;
+    margin: 2px;
 }

 .largeCardMargin .cardBox {
@@ -55,7 +55,7 @@
    margin: 4px;
 }

-@media all and (max-width: 600px) {
+@media all and (max-width: 800px) {

    .cardBox {
        margin: 1px;