diff --git a/public/css/master.css b/public/css/master.css index 42902b0..c39d12b 100755 --- a/public/css/master.css +++ b/public/css/master.css @@ -50,6 +50,27 @@ background-color: #E6EBFA !important; .scrollBoxHeight2{ height: calc(100% - 55px); } + +.scrollBoxHeight3{ + height: calc(100% - 215px); +} +@media (min-width: 644px) { + .scrollBoxHeight3 { + height: calc(100% - 215px); } } +@media (max-device-width: 643px) { + .scrollBoxHeight3 { + height: calc(100% - 55px); } } + +.album-art-left-container{ + display: none; +} +@media (min-width: 644px) { + .album-art-left-container { + display: none; } } +@media (max-device-width: 643px) { + .album-art-left-container { + display: block;} } + .playerControls{ height: 90px; } @@ -421,6 +442,16 @@ h3 { .metadata-panel-text { color: #999999; + margin-bottom: 10px; + margin-top: 0px; + text-shadow: -1px 0 #333333, 0 1px #333333, 1px 0 black, 0 -1px #333333; + color: white; + font-family: 'Jura', sans-serif; + + font-weight: bold; + font-style: normal; + font-size: 18px; + line-height: 100%; } .noselect { @@ -432,3 +463,31 @@ h3 { user-select: none; /* Non-prefixed version, currently supported by Chrome and Opera */ } + + + +.meta-box{ + width: 100%; + height: 160px; + background: linear-gradient(to bottom right, #605C50, #333333) +} + +.meta-album-art{ + height: 100%; + width: 150px; + float: left; +} + +.meta-spacer{ + width: 5px; + float: left; + height:5px; +} + + +.meta-info{ + height: 100%; + width: calc(100% - 155px); + float: left; + +} diff --git a/public/css/mstream-player.css b/public/css/mstream-player.css index 5ac9937..f4c1995 100644 --- a/public/css/mstream-player.css +++ b/public/css/mstream-player.css @@ -238,8 +238,6 @@ fill: rgb(255, 255, 255); .player-spacer{ height: 5px; width: 100%; - background-color: #333333; - overflow: hidden; } .fill-white{ diff --git a/public/js/mstream.vue-player-controls.js b/public/js/mstream.vue-player-controls.js index b36bbdf..57c93ed 100644 --- a/public/js/mstream.vue-player-controls.js +++ b/public/js/mstream.vue-player-controls.js @@ -186,6 +186,21 @@ var VUEPLAYER = function() { }); + var mainOverlay = new Vue({ + el: '#meta-box', + data: { + meta: MSTREAMPLAYER.playerStats.metadata + }, + computed: { + albumArtPath: function(){ + if(!this.meta['album-art']){ + return '/public/img/default.png'; + } + return '/album-art/' + this.meta['album-art']; + } + } + }); + // Button Events document.getElementById( "progress-bar" ).addEventListener("click",function(event) { var relativeClickPosition = event.clientX - this.getBoundingClientRect().left; diff --git a/public/mstream.html b/public/mstream.html index a6458a9..2233c10 100755 --- a/public/mstream.html +++ b/public/mstream.html @@ -125,12 +125,9 @@ - - - × @@ -183,14 +180,7 @@