diff --git a/src/ember/channel.js b/src/ember/channel.js index 684a0a82..b6a09a85 100644 --- a/src/ember/channel.js +++ b/src/ember/channel.js @@ -31,9 +31,9 @@ FFZ.prototype.setup_channel = function() { this.update_views('component:channel-redesign', this.modify_channel_redesign); this.update_views('component:channel-redesign/live', this.modify_channel_live); - this.log("Hooking the Ember Channel Index component."); + /*this.log("Hooking the Ember Channel Index component."); if ( ! this.update_views('component:legacy-channel', this.modify_channel_index) ) - return; + return;*/ var f = this, Channel = utils.ember_lookup('controller:channel'); @@ -568,7 +568,7 @@ FFZ.prototype.modify_channel_redesign = function(view) { } -FFZ.prototype.modify_channel_index = function(view) { +/*FFZ.prototype.modify_channel_index = function(view) { var f = this; utils.ember_reopen_view(view, { ffz_init: function() { @@ -1105,7 +1105,7 @@ FFZ.prototype.modify_channel_index = function(view) { el.innerHTML = utils.time_to_string(uptime, false, false, false, f.settings.stream_uptime === 1 || f.settings.stream_uptime === 3); } }); -} +}*/ // --------------- diff --git a/src/ember/layout.js b/src/ember/layout.js index 48d52326..3283c4aa 100644 --- a/src/ember/layout.js +++ b/src/ember/layout.js @@ -272,6 +272,7 @@ FFZ.prototype.setup_layout = function() { theatre_chat_height = window_height - theatre_video_height, theatre_video_top = video_below ? theatre_chat_height : 0, + theatre_video_bottom = window_height - (theatre_video_top + theatre_video_height), theatre_chat_top = video_below ? 0 : theatre_video_height; out += 'top: ' + video_top + 'px;right: 0}' + @@ -313,7 +314,10 @@ FFZ.prototype.setup_layout = function() { '.ffz-channel-bar-bottom .cn-bar {' + 'bottom: ' + video_bottom + 'px}' + 'body:not(.ffz-sidebar-swap) .cn-bar-fixed { right: 0 !important }' + - 'body.ffz-sidebar-swap .cn-bar-fixed { left: 0 !important }'; + 'body.ffz-sidebar-swap .cn-bar-fixed { left: 0 !important }' + + '.ffz-theater-stats .app-main.theatre .cn-metabar__more {' + + 'max-width: calc(100% - 300px);' + + 'bottom: ' + (theatre_video_bottom + 55) + 'px !important}'; } else { out += 'top: 0; right: ' + width + 'px}' + @@ -332,7 +336,9 @@ FFZ.prototype.setup_layout = function() { 'body:not(.ffz-sidebar-swap) #main_col:not(.expandRight) .cn-bar-fixed {' + 'right: ' + width + 'px}' + 'body.ffz-sidebar-swap #main_col:not(.expandRight) .cn-bar-fixed {' + - 'left: ' + width + 'px !important}'; + 'left: ' + width + 'px !important}' + + '.ffz-theater-stats .app-main.theatre .cn-metabar__more {' + + 'max-width: calc(100% - ' + (width + 300) + 'px)}'; } } diff --git a/style.css b/style.css index ce229a3f..b8c33b8a 100644 --- a/style.css +++ b/style.css @@ -279,7 +279,7 @@ body.ffz-bttv-dark .ffz-ui-toggle.blue.live:hover svg.svg-emoticons path { fill: display: block } -.ffz-theater-stats .app-main.theatre .player-column:focus #hostmode > div.clearfix, +/*.ffz-theater-stats .app-main.theatre .player-column:focus #hostmode > div.clearfix, .ffz-theater-stats .app-main.theatre .player-column:hover #hostmode > div.clearfix { margin-bottom: 30px; } @@ -287,56 +287,32 @@ body.ffz-bttv-dark .ffz-ui-toggle.blue.live:hover svg.svg-emoticons path { fill: .ffz-theater-stats .app-main.theatre #channel .player-column:focus .archive_info + .stats-and-actions, .ffz-theater-stats .app-main.theatre #channel .player-column:hover .archive_info + .stats-and-actions { display: none; -} +}*/ .ffz-theater-stats .app-main.theatre .player-column:hover + .metadata-box .cn-metabar__more, .ffz-theater-stats .app-main.theatre .player-column:focus + .metadata-box .cn-metabar__more, .ffz-theater-stats .app-main.theatre .cn-metabar__more:hover, -.ffz-theater-stats .app-main.theatre .cn-metabar__more:focus, +.ffz-theater-stats .app-main.theatre .cn-metabar__more:focus /*, .ffz-theater-stats .app-main.theatre .player-column:focus #hostmode > div.clearfix, .ffz-theater-stats .app-main.theatre .player-column:hover #hostmode > div.clearfix, .ffz-theater-stats .app-main.theatre .player-column:focus .stats-and-actions, -.ffz-theater-stats .app-main.theatre .player-column:hover .stats-and-actions { - background-color: #19191f; +.ffz-theater-stats .app-main.theatre .player-column:hover .stats-and-actions */ { + background-color: rgba(25,25,31,0.95); color: #aaa; - position: absolute; + position: fixed; bottom: 55px; - margin-right: 150px; left: 10px; + + width: auto; + z-index: 7; padding: 10px; - opacity: 0.95; } -.ffz-theater-stats .app-main.theatre .player-column:hover + .metadata-box .cn-metabar__more, -.ffz-theater-stats .app-main.theatre .player-column:focus + .metadata-box .cn-metabar__more, -.ffz-theater-stats .app-main.theatre .cn-metabar__more:hover, -.ffz-theater-stats .app-main.theatre .cn-metabar__more:focus { - width: calc(100% - 20px); - margin-bottom: 40px; -} - -.ffz-theater-stats.ffz-theatre-conversations .app-main.theatre .player-column:focus #hostmode > div.clearfix, -.ffz-theater-stats.ffz-theatre-conversations .app-main.theatre .player-column:hover #hostmode > div.clearfix, -.ffz-theater-stats.ffz-theatre-conversations .app-main.theatre .player-column:focus .stats-and-actions, -.ffz-theater-stats.ffz-theatre-conversations .app-main.theatre .player-column:hover .stats-and-actions, - -.ffz-theater-stats.ffz-theatre-conversations .app-main.theatre .player-column:hover + .metadata-box .cn-metabar__more, -.ffz-theater-stats.ffz-theatre-conversations .app-main.theatre .player-column:focus + .metadata-box .cn-metabar__more, -.ffz-theater-stats.ffz-theatre-conversations .app-main.theatre .cn-metabar__more:hover, -.ffz-theater-stats.ffz-theatre-conversations .app-main.theatre .cn-metabar__more:focus, -.ffz-theater-stats.ffz-top-conversations .app-main.theatre .player-column:hover + .metadata-box .cn-metabar__more, -.ffz-theater-stats.ffz-top-conversations .app-main.theatre .player-column:focus + .metadata-box .cn-metabar__more, -.ffz-theater-stats.ffz-top-conversations .app-main.theatre .cn-metabar__more:hover, -.ffz-theater-stats.ffz-top-conversations .app-main.theatre .cn-metabar__more:focus, -.ffz-theater-stats.ffz-top-conversations .app-main.theatre .player-column:focus #hostmode > div.clearfix, -.ffz-theater-stats.ffz-top-conversations .app-main.theatre .player-column:hover #hostmode > div.clearfix, -.ffz-theater-stats.ffz-top-conversations .app-main.theatre .player-column:focus .stats-and-actions, -.ffz-theater-stats.ffz-top-conversations .app-main.theatre .player-column:hover .stats-and-actions { - bottom: 15px; -} +.ffz-theater-stats .app-main.theatre .cn-metabar__more span, +.ffz-theater-stats .app-main.theatre .cn-metabar__more div { flex-grow: 0 !important } .ffz-theater-stats .app-main.theatre .channel-stats .stat { color: #aaa; } @@ -2927,7 +2903,7 @@ body:not(.ffz-top-conversations) .conversations-list-bottom-bar { body:not(.ffz-tags-on-channel) .tw-title--tall { height: 60px } -body:not(.ffz-tags-on-channel) #broadcast-meta .ct-tags, +/*body:not(.ffz-tags-on-channel) #broadcast-meta .ct-tags,*/ .cn-metabar__title .ct-tags, /*body:not(.ffz-creative-showcase) .ct-banner-handler .tower > div:last-child,*/ body:not(.ffz-creative-showcase) .ct-spotlight-container { display: none; }