diff --git a/dashboard-ui/bower_components/doc-ready/.bower.json b/dashboard-ui/bower_components/doc-ready/.bower.json index d4d75eca65..adda4287b4 100644 --- a/dashboard-ui/bower_components/doc-ready/.bower.json +++ b/dashboard-ui/bower_components/doc-ready/.bower.json @@ -39,6 +39,6 @@ "commit": "cec8e49744a1e18b14a711eea77e201bb70de544" }, "_source": "git://github.com/desandro/doc-ready.git", - "_target": "~1.0.4", + "_target": "1.0.x", "_originalSource": "doc-ready" } \ No newline at end of file diff --git a/dashboard-ui/css/mediaplayer.css b/dashboard-ui/css/mediaplayer.css deleted file mode 100644 index bc085f1a70..0000000000 --- a/dashboard-ui/css/mediaplayer.css +++ /dev/null @@ -1,71 +0,0 @@ -#mediaElement { - display: inline-block; - position: relative; -} - -.nowPlayingText { - display: inline-block; - font-weight: normal; - position: relative; - top: -7px; - margin: 0 0 0 3px; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - vertical-align: middle; - text-align: left; - font-size: 15px; - max-width: 130px; -} - -.mediaButton.infoButton { - width: 34px; - height: 34px; -} - -.mediaButton.active { - color: #52B54B; -} - -@media (min-width: 500px) { - .nowPlayingText { - max-width: 180px; - } -} - -@media (min-width: 600px) { - .nowPlayingText { - max-width: 200px; - } -} - -@media (min-width: 800px) { - .nowPlayingText { - margin-right: 30px; - } -} - -.mediaButton img { - height: 24px; -} - -.currentTime { - display: inline-block; - vertical-align: middle; - max-width: 110px; - margin-right: 2em; - font-weight: normal; -} - -.mediaPlayerAudioContainer { - position: fixed; - top: 40%; - text-align: center; - left: 0; - right: 0; -} - -.mediaPlayerAudioContainerInner { - padding: 1em; - background: #222; -} diff --git a/dashboard-ui/css/nowplayingbar.css b/dashboard-ui/css/nowplayingbar.css index cd9b569e0a..afcc137438 100644 --- a/dashboard-ui/css/nowplayingbar.css +++ b/dashboard-ui/css/nowplayingbar.css @@ -1,4 +1,58 @@ -/* Now playing bar */ +.nowPlayingText { + display: inline-block; + font-weight: normal; + position: relative; + top: -7px; + margin: 0 0 0 3px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + vertical-align: middle; + text-align: left; + font-size: 15px; + max-width: 130px; +} + +.mediaButton.infoButton { + width: 34px; + height: 34px; +} + +.mediaButton.active { + color: #52B54B; +} + +@media (min-width: 500px) { + .nowPlayingText { + max-width: 180px; + } +} + +@media (min-width: 600px) { + .nowPlayingText { + max-width: 200px; + } +} + +@media (min-width: 800px) { + .nowPlayingText { + margin-right: 30px; + } +} + +.mediaButton img { + height: 24px; +} + +.currentTime { + display: inline-block; + vertical-align: middle; + max-width: 110px; + margin-right: 2em; + font-weight: normal; +} + +/* Now playing bar */ .nowPlayingBar { border-top: 1px solid #444; text-align: center; diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index e0de443044..e3072b7352 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -664,19 +664,6 @@ div[data-role="controlgroup"] a.ui-btn-active { transform: translateY(-205%); } -.largePanel { - width: 270px !important; -} - -/* Make panels larger */ -.largePanelModalOpen.ui-panel-dismiss-position-right { - right: 270px !important; -} - -.largePanelModalOpen.ui-panel-dismiss-position-left { - left: 270px !important; -} - .checkboxContainer { white-space: nowrap; } @@ -696,22 +683,6 @@ div[data-role="controlgroup"] a.ui-btn-active { padding: .7em .5em; } -@media all and (min-width: 340px) { - - .largePanel { - width: 300px !important; - } - - /* Make panels larger */ - .largePanelModalOpen.ui-panel-dismiss-position-right { - right: 300px !important; - } - - .largePanelModalOpen.ui-panel-dismiss-position-left { - left: 300px !important; - } -} - textarea { width: 100%; } diff --git a/dashboard-ui/scripts/channelitems.js b/dashboard-ui/scripts/channelitems.js index 2ad5c61aa1..7c8e1a5bdc 100644 --- a/dashboard-ui/scripts/channelitems.js +++ b/dashboard-ui/scripts/channelitems.js @@ -223,7 +223,7 @@ $('.alphabetPicker', page).alphaValue(query.NameStartsWith); } - pageIdOn.on('pageinit', "channelItemsPage", function () { + pageIdOn('pageinit', "channelItemsPage", function () { var page = this; diff --git a/dashboard-ui/scripts/htmlmediarenderer.js b/dashboard-ui/scripts/htmlmediarenderer.js index 7bae78a762..d26f226d9c 100644 --- a/dashboard-ui/scripts/htmlmediarenderer.js +++ b/dashboard-ui/scripts/htmlmediarenderer.js @@ -160,9 +160,9 @@ var requiresControls = !MediaPlayer.canAutoPlayAudio(); if (requiresControls) { - html += '