Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/scripts/mediaplayer.js

dashboard-ui/css/detailtable.css

@@ -11,6 +11,7 @@
     text-align: left;
     width: 100%;
     margin: 0 auto;
+    text-shadow: none!important;
 }
 
 .stretchedDetailTable {

dashboard-ui/css/librarybrowser.css

@@ -385,7 +385,7 @@ a.itemTag:hover {
     background-size: cover;
     background-position: center 15%;
     background-repeat: no-repeat;
-    height: 500px;
+    height: 550px;
     border-bottom: 1px solid #111;
     position: relative;
 }
@@ -869,6 +869,26 @@ a.itemTag:hover {
         background-color: transparent !important;
     }
 
+.unidentifiedIndicator {
+    display: block;
+    position: absolute;
+    top: 5px;
+    left: 5px;
+    text-align: center;
+    vertical-align: middle;
+    width: 24px;
+    height: 19px;
+    padding-top: 3px;
+    border-radius: 50%;
+    color: #fff;
+    background: rgb(204, 0, 0);
+    background: rgba(204, 0, 0, .8);
+}
+
+    .unidentifiedIndicator div:after {
+        background-color: transparent !important;
+    }
+
 .itemProgress {
     vertical-align: top;
     font-size: 19px;

dashboard-ui/css/metadataeditor.css

@@ -53,6 +53,9 @@
     background-repeat: no-repeat;
     background-size: contain;
     display: block;
+    /* For the box shadow so that the bottom border isnt underneath the text */
+    z-index: 100000;
+    position: relative;
 }
 
 .remotePosterImage {
@@ -84,6 +87,43 @@
     padding-right: 0!important;
 }
 
+
+.searchImage {
+    background-position: center bottom;
+    background-repeat: no-repeat;
+    background-size: contain;
+    display: block;
+}
+
+.searchBackdropImageContainer {
+    width: 160px;
+}
+
+.searchDiscImageContainer {
+    width: 150px;
+}
+
+.searchPosterImageContainer {
+    width: 140px;
+}
+
+.searchBackdropImageContainer .searchImage {
+    height: 90px;
+}
+
+.searchDiscImageContainer .searchImage {
+    height: 150px;
+}
+
+.searchPosterImageContainer .searchImage {
+    height: 210px;
+}
+
+.searchImageContainer .remoteImageDetails {
+    overflow-x: hidden;
+    text-overflow: ellipsis;
+}
+
 @media all and (min-width: 500px) {
 
     .availableImagesList {
@@ -104,6 +144,28 @@
     }
 }
 
+.libraryReportIndicator {
+    position: relative;
+    display: block;
+    text-align: center;
+    vertical-align: middle;
+    width: 24px;
+    height: 19px;
+    padding-top: 3px;
+    border-radius: 50%;
+    color: #fff;
+    background: rgb(204, 0, 0);
+    background: rgba(204, 0, 0, .8);
+}
+
+    .libraryReportIndicator div:after {
+        background-color: transparent !important;
+    }
+
+.clearLibraryReportIndicator {
+    background-color: transparent !important;
+}
+
 .editorTile {
     display: inline-block;
     margin: 5px;
@@ -134,11 +196,33 @@
     padding: 0 0 1em 0;
 }
 
+.remoteImage:hover, .searchImageContainer:hover {
+    -moz-box-shadow: 0 0 12px 7px #38c;
+    -webkit-box-shadow: 0 0 12px 7px #38c;
+    box-shadow: 0 0 12px 7px #38c;
+}
+
+.tblLibraryReport img {
+    height: 18px;
+    margin-right: 10px;
+}
+
+@media all and (min-width: 600px) {
+
+    .popupIdentify {
+        width: 400px;
+    }
+}
+
 @media all and (min-width: 700px) {
 
     .availableImagesList {
         width: 600px;
     }
+
+    .popupIdentify {
+        width: 500px;
+    }
 }
 
 @media all and (min-width: 800px) {
@@ -163,6 +247,10 @@
         float: right;
         width: 67.5%;
     }
+
+    .popupIdentify {
+        width: 600px;
+    }
 }
 
 @media all and (min-width: 900px) {
@@ -170,6 +258,10 @@
     .availableImagesList {
         width: 800px;
     }
+
+    .popupIdentify {
+        width: 700px;
+    }
 }
 
 @media all and (min-width: 1000px) {
@@ -177,6 +269,10 @@
     .availableImagesList {
         width: 900px;
     }
+
+    .popupIdentify {
+        width: 800px;
+    }
 }
 
 @media all and (min-width: 1100px) {
@@ -184,6 +280,10 @@
     .availableImagesList {
         width: 1000px;
     }
+
+    .popupIdentify {
+        width: 900px;
+    }
 }
 
 @media all and (min-width: 1200px) {
@@ -191,6 +291,10 @@
     .availableImagesList {
         width: 1100px;
     }
+
+    .popupIdentify {
+        width: 1000px;
+    }
 }
 
 @media all and (min-width: 1300px) {
@@ -225,11 +329,41 @@
     }
 }
 
+.popupIdentifyForm, .identificationSearchResults {
+    overflow-y: auto;
+}
+
+
+@media all and (min-height: 500px) {
+
+    .popupIdentifyForm, .identificationSearchResults {
+        height: 350px;
+    }
+}
+
+@media all and (min-height: 600px) {
+
+    .popupIdentifyForm, .identificationSearchResults {
+        height: 450px;
+    }
+}
+
+@media all and (min-height: 700px) {
+
+    .popupIdentifyForm, .identificationSearchResults {
+        height: 550px;
+    }
+}
+
 @media all and (min-height: 800px) {
 
     .availableImagesList {
         height: 600px;
     }
+
+    .popupIdentifyForm, .identificationSearchResults {
+        height: 600px;
+    }
 }
 
 @media all and (min-height: 900px) {
@@ -237,4 +371,8 @@
     .availableImagesList {
         height: 700px;
     }
+
+    .popupIdentifyForm, .identificationSearchResults {
+        height: 700px;
+    }
 }

dashboard-ui/css/notifications.css

@@ -182,19 +182,4 @@
     .notificationContent p {
         max-width: 350px;
     }
-}
-
-@media all and (min-width: 600px) {
-    .notificationsFlyout {
-        width: 500px;
-    }
-
-    .imgNotification, .imgNotificationInner {
-        width: 60px;
-        height: 60px;
-    }
-
-    .notificationContent p {
-        max-width: 400px;
-    }
-}
+}

dashboard-ui/css/site.css

@@ -253,7 +253,7 @@ h1 .imageLink {
     color: #fff!important;
     text-shadow: none!important;
     font-weight: 400!important;
-    font-size: 15px;
+    font-size: 14px;
 }
 
     .sidebarLinks a:hover {
@@ -268,7 +268,7 @@ h1 .imageLink {
 
 .sidebarDivider {
     height: 1px;
-    background: #444;
+    background: #404040;
     margin: .25em 0;
 }