oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-08-19 12:30:54 +00:00
Code Wiki Activity

Closes #9

Browse source 
Closes #8

Use position: fixed for positioning the theater mode channel metadata view.
This commit is contained in:
SirStendec 2016-10-03 18:35:32 -04:00
parent f9e3d41e65
commit c7c07d4c58
3 changed files with 24 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ember/channel.js
View file

@ -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);
}
});
}
}*/
// ---------------

10
src/ember/layout.js
View file

@ -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)}';
}
}