mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

now playing bar fixes

Browse source
This commit is contained in:
Luke Pulverenti 2013-12-28 02:09:05 -05:00
parent 2047f4bd49
commit 84eb8fc047
6 changed files with 19 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

15
dashboard-ui/css/librarybrowser.css
View file

@ -4,7 +4,7 @@
} }
.libraryPage { .libraryPage {
padding-top: 46px !important; padding-top: 48px !important;
} }
.ui-panel fieldset + fieldset { .ui-panel fieldset + fieldset {
@ -17,15 +17,12 @@
} }
.viewMenuBar { .viewMenuBar {
background: #404040;
background-image: linear-gradient(#404040,#2d2d2d);
font-weight: bold; font-weight: bold;
position: fixed; position: fixed;
right: 0; right: 0;
left: 0; left: 0;
z-index: 1000; z-index: 1000;
top: 0; top: 0;
border-bottom: 1px solid #111;
padding-left: 10px; padding-left: 10px;
} }
@ -116,13 +113,14 @@
.libraryViewNav { .libraryViewNav {
text-align: center; text-align: center;
background-image: linear-gradient(#404040,#2d2d2d); background-image: linear-gradient(#333,#333);
border-bottom: 1px solid #111; border-bottom: 1px solid #111;
border-top: 0; border-top: 1px solid #000;
font-family: sans-serif, Arial;
} }
.libraryViewNav .ui-btn-active { .libraryViewNav .ui-btn-active {
border: 0; border: 0!important;
background-color: #38c; background-color: #38c;
} }
@ -131,6 +129,7 @@
padding: .6em 1em; padding: .6em 1em;
color: #eee!important; color: #eee!important;
text-decoration: none; text-decoration: none;
margin: 1px 0;
} }
.libraryViewNav a:hover { .libraryViewNav a:hover {
@ -523,7 +522,7 @@ a.itemTag:hover {
.libraryPanelHeader span { .libraryPanelHeader span {
color: #fff; color: #fff;
vertical-align: middle; vertical-align: middle;
font-size: 14px; font-size: 15px;
font-weight: 300; font-weight: 300;
} }

7
dashboard-ui/css/mediaplayer.css
View file

@ -1,6 +1,4 @@
 /* Now playing bar */
/* Now playing bar */
.nowPlayingBar { .nowPlayingBar {
padding: 6px 0 12px 0; padding: 6px 0 12px 0;
border-top: 2px solid green; border-top: 2px solid green;
@ -129,6 +127,9 @@
.sliderContainer .ui-slider-track { .sliderContainer .ui-slider-track {
margin-left: 15px !important; margin-left: 15px !important;
}
.highPosition .ui-slider-track {
z-index: 100000; z-index: 100000;
} }

2
dashboard-ui/css/metadataeditor.css
View file

@ -92,7 +92,7 @@
.editPageSidebar { .editPageSidebar {
position: fixed; position: fixed;
top: 36px; top: 48px;
bottom: 0; bottom: 0;
left: 0; left: 0;
width: 27.5%; width: 27.5%;

1
dashboard-ui/index.html
View file

@ -11,7 +11,6 @@
<tr> <tr>
<td> <td>
<br />
<br /> <br />
<div id="views"> <div id="views">
</div> </div>

6
dashboard-ui/scripts/librarymenu.js
View file

@ -10,7 +10,7 @@
function renderHeader(page, user) { function renderHeader(page, user) {
var html = '<div class="viewMenuBar">'; var html = '<div class="viewMenuBar ui-bar-b">';
html += '<button type="button" data-icon="bars" data-iconpos="notext" data-inline="true" title="Menu" class="libraryMenuButton" onclick="LibraryMenu.showLibraryMenu($(this).parents(\'.page\'));">Menu</button>'; html += '<button type="button" data-icon="bars" data-iconpos="notext" data-inline="true" title="Menu" class="libraryMenuButton" onclick="LibraryMenu.showLibraryMenu($(this).parents(\'.page\'));">Menu</button>';
@ -221,12 +221,8 @@
var link = links[i]; var link = links[i];
if (selectedIndex == i) {
html += '<li><a class="selectedLibraryPanelLink libraryPanelLink" href="' + link.href + '">' + link.text + '</a></li>';
} else {
html += '<li><a class="libraryPanelLink" href="' + link.href + '">' + link.text + '</a></li>'; html += '<li><a class="libraryPanelLink" href="' + link.href + '">' + link.text + '</a></li>';
} }
}
html += '</ul>'; html += '</ul>';
html += '</div>'; html += '</div>';

7
dashboard-ui/scripts/mediaplayer.js
View file

@ -48,7 +48,7 @@
idleState = true; idleState = true;
$('.itemVideo').on('mousemove keydown scroll', idleHandler).trigger('mousemove'); $('.itemVideo').on('mousemove keydown scroll', idleHandler).trigger('mousemove');
} else { } else {
$(".mediaButton,.currentTime,.nowPlayingMediaInfo,.mediaSlider,.barBackground", nowPlayingBar).removeClass("highPosition"); $(".mediaButton,.currentTime,.nowPlayingMediaInfo,.sliderContainer,.barBackground", nowPlayingBar).removeClass("highPosition");
$('.itemVideo').removeClass('fullscreenVideo'); $('.itemVideo').removeClass('fullscreenVideo');
} }
@ -218,7 +218,6 @@
volumeSlider = $('.volumeSlider').on('slidestop', function () { volumeSlider = $('.volumeSlider').on('slidestop', function () {
document.title += '1';
var vol = this.value; var vol = this.value;
updateVolumeButtons(vol); updateVolumeButtons(vol);
@ -699,12 +698,12 @@
window.clearTimeout(timeout); window.clearTimeout(timeout);
} }
if (idleState == true) { if (idleState == true) {
$(".mediaButton,.currentTime,.nowPlayingMediaInfo,.mediaSlider,.barBackground", nowPlayingBar).addClass("highPosition"); $(".mediaButton,.currentTime,.nowPlayingMediaInfo,.sliderContainer,.barBackground", nowPlayingBar).addClass("highPosition");
} }
idleState = false; idleState = false;
timeout = window.setTimeout(function () { timeout = window.setTimeout(function () {
idleState = true; idleState = true;
$(".mediaButton,.currentTime,.nowPlayingMediaInfo,.mediaSlider,.barBackground", nowPlayingBar).removeClass("highPosition"); $(".mediaButton,.currentTime,.nowPlayingMediaInfo,.sliderContainer,.barBackground", nowPlayingBar).removeClass("highPosition");
}, 4000); }, 4000);
} }