cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-16 18:38:25 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Techywarrior 2013-04-03 15:55:43 -07:00
commit deaf1fce2c
3 changed files with 37 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dashboard-ui/css/librarybrowser.css
View File

@ -81,7 +81,7 @@
} }
.ehsContent { .ehsContent {
max-width: 800px; max-width: 900px;
} }
.libraryItemsGridContainer { .libraryItemsGridContainer {
@ -97,7 +97,7 @@
@media all and (min-width: 1920px) { @media all and (min-width: 1920px) {
.ehsContent { .ehsContent {
max-width: 1000px; max-width: 1300px;
} }
.libraryItemsGridContainer { .libraryItemsGridContainer {
padding: 0 25%; padding: 0 25%;

76
dashboard-ui/css/site.css
View File

@ -407,11 +407,6 @@ form, .readOnlyContent {
padding-bottom: 56px; padding-bottom: 56px;
} }
.posterViewItemWithDualText .posterViewItemText {
text-align: left;
color: #fff;
}
.posterViewItemWithNoText { .posterViewItemWithNoText {
padding-bottom: 0!important; padding-bottom: 0!important;
} }
@ -445,7 +440,7 @@ form, .readOnlyContent {
text-wrap: none; text-wrap: none;
white-space: nowrap; white-space: nowrap;
margin: 0; margin: 0;
padding: 4px 4px 0; padding: 4px 5px 0;
position: absolute; position: absolute;
bottom: 0; bottom: 0;
left: 0; left: 0;
@ -455,6 +450,14 @@ form, .readOnlyContent {
text-shadow: none; text-shadow: none;
} }
.posterViewItemWithDualText .posterViewItemText {
text-align: left;
color: #fff;
padding-top: 5px;
height: 23px;
}
.posterViewItemPrimaryText { .posterViewItemPrimaryText {
bottom: 28px; bottom: 28px;
} }
@ -467,18 +470,6 @@ form, .readOnlyContent {
@media all and (min-width: 750px) { @media all and (min-width: 750px) {
.posterViewItemWithDualText {
padding-bottom: 58px;
}
.posterViewItemText {
padding-top: 5px;
}
.posterViewItemPrimaryText {
bottom: 29px;
}
.posterViewItem img { .posterViewItem img {
max-width: 190px; max-width: 190px;
max-height: 160px; max-height: 160px;
@ -489,36 +480,35 @@ form, .readOnlyContent {
.posterViewItem { .posterViewItem {
font-size: 16px; font-size: 16px;
padding-bottom: 29px;
} }
.posterViewItem img { .posterViewItem img {
max-width: 250px; max-width: 270px;
max-height: 200px; max-height: 220px;
} }
} }
@media all and (min-width: 1920px) { @media all and (min-width: 1920px) {
.posterViewItemText {
height: 25px!important;
}
.posterViewItem { .posterViewItem {
font-size: 18px; font-size: 18px;
padding-bottom: 33px; padding-bottom: 29px;
} }
.posterViewItemWithDualText { .posterViewItemWithDualText {
padding-bottom: 66px; padding-bottom: 60px;
} }
.posterViewItemPrimaryText { .posterViewItemPrimaryText {
bottom: 33px; bottom: 30px;
}
.posterViewItemText {
height: 28px;
} }
.posterViewItem img { .posterViewItem img {
max-width: 300px; max-width: 310px;
max-height: 250px; max-height: 250px;
} }
} }
@ -702,20 +692,21 @@ progress {
} }
.userItemRating { .userItemRating {
height: 24px; height: 24px;
width: 24px; width: 24px;
margin-right: 1em; margin-right: 1em;
overflow: hidden; overflow: hidden;
display: inline-block; display: inline-block;
} }
.imgUserItemRating { .imgUserItemRating {
height: 24px; height: 24px;
cursor: pointer; cursor: pointer;
} }
.imgUserItemRating:hover { .imgUserItemRating:hover {
opacity: .5; opacity: .5;
} }
@media all and (min-width: 650px) { @media all and (min-width: 650px) {
.itemImageBlock { .itemImageBlock {
@ -788,9 +779,10 @@ progress {
display: inline-block; display: inline-block;
position: relative; position: relative;
} }
#mediaElement.video {
width: 270px; #mediaElement.video {
} width: 270px;
}
#nowPlayingBar #mediaInfo, #nowPlayingBar #mediaInfo div { #nowPlayingBar #mediaInfo, #nowPlayingBar #mediaInfo div {
margin-left: 10px; margin-left: 10px;

1
dashboard-ui/scripts/videojsextensions.js Normal file
View File

@ -0,0 +1 @@