diff --git a/MediaBrowser.WebDashboard/Html/css/site.css b/MediaBrowser.WebDashboard/Html/css/site.css index c9b2089c73..186266c4dc 100644 --- a/MediaBrowser.WebDashboard/Html/css/site.css +++ b/MediaBrowser.WebDashboard/Html/css/site.css @@ -425,7 +425,6 @@ form, .readOnlyContent { font-size: 15px; padding: 0; position: relative; - padding-bottom: 28px; } .posterViewItem a { @@ -436,7 +435,7 @@ form, .readOnlyContent { .posterViewItem img { max-width: 155px; - max-height: 148px; + max-height: 155px; vertical-align: bottom; } @@ -454,19 +453,25 @@ form, .readOnlyContent { .posterViewItemText { text-overflow: ellipsis; overflow: hidden; - text-wrap: none; white-space: nowrap; margin: 0; - padding: 4px 2px 0; - position: absolute; + padding: 4px 0px 0; bottom: 0; left: 0; right: 0; - height: 24px; background: #181818; text-shadow: none; + max-width: 155px; } + .posterViewItemText div{ + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + margin: 0px 4px; + height: 24px; + } + .posterViewItem:hover, .userItem:hover { -moz-box-shadow: 0 0 20px 3px #2572EB; -webkit-box-shadow: 0 0 20px 3px #2572EB; @@ -477,11 +482,11 @@ form, .readOnlyContent { .posterViewItem { font-size: 16px; - padding-bottom: 29px; } .posterViewItemText { padding-top: 5px; + max-width: 190px; } .posterViewItem img { @@ -496,129 +501,33 @@ form, .readOnlyContent { font-size: 17px; } - .posterViewItem img { - max-width: 280px; - max-height: 250px; - } + .posterViewItem img { + max-width: 280px; + max-height: 280px; + } + + .posterViewItemText { + max-width: 280px; + } } @media all and (min-width: 1920px) { .posterViewItem { font-size: 19px; - padding-bottom: 33px; } - .posterViewItemText { + .posterViewItemText div{ height: 28px; } .posterViewItem img { max-width: 352px; - max-height: 300px; - } -} - -.userItem { - display: inline-block; - margin: 5px; - font-size: 15px; - text-align: left; -} - -.userItemImage { - height: 100px; - width: 100px; - vertical-align: bottom; -} - -.userItemContent { - display: inline-block; - height: 100px; - width: 180px; - float: right; - text-shadow: none; - font-family: 'Segoe UI Light', 'Open Sans', Arial; -} - -.userItemContentInner { - padding: 15px 5px 5px 10px; - color: #fff; -} - -.userItemHeader { - margin: 0 0 10px; - font-size: 16px; - text-overflow: ellipsis; - overflow: hidden; - text-wrap: avoid; - font-family: 'Segoe UI Semilight', 'Open Sans', Arial; -} - -@media all and (min-width: 750px) { - - .userItem { - font-size: 16px; - } - - .userItemContentInner { - padding: 30px 20px 20px; - } - - .userItemImage { - height: 140px; - width: 140px; - } - - .userItemContent { - height: 140px; - width: 210px; + max-height: 352px; } - .userItemHeader { - font-size: 26px; - } -} - -@media all and (min-width: 1200px) { - - .userItem { - font-size: 18px; - } - - .userItemImage { - height: 180px; - width: 180px; - } - - .userItemContent { - height: 180px; - width: 270px; - } - - .userItemHeader { - font-size: 32px; - } -} - -@media all and (min-width: 1920px) { - - .userItem { - font-size: 20px; - } - - .userItemImage { - height: 240px; - width: 240px; - } - - .userItemContent { - height: 240px; - width: 360px; - } - - .userItemHeader { - font-size: 40px; + .posterViewItemText { + max-width: 352px; } } diff --git a/MediaBrowser.WebDashboard/Html/login.html b/MediaBrowser.WebDashboard/Html/login.html index 4cb73c06ef..36c453d555 100644 --- a/MediaBrowser.WebDashboard/Html/login.html +++ b/MediaBrowser.WebDashboard/Html/login.html @@ -7,7 +7,7 @@
' + user.Name + '
'; - html += '' + LoginPage.getLastSeenText(user.LastActivityDate) + '
'; + html += '