From d098e402b4758dad5a486556d1ea1f6ce329cc6c Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Tue, 11 Oct 2016 23:00:05 -0400
Subject: [PATCH] 3.5.322. Fix the channel bar and the video manager player
 size.

---
 changelog.html      | 6 ++++++
 src/ember/layout.js | 2 +-
 src/main.js         | 2 +-
 style.css           | 2 --
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/changelog.html b/changelog.html
index e8c24b78..5161eb43 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,9 @@
+<div class="list-header">3.5.322 <time datetime="2016-10-03">(2016-10-11)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: The Video Manager's video player was a bit too big.</li>
+	<li>Fixed: The Channel Bar appears over the arrows to open and close the sidebars and theater mode.</li>
+</ul>
+
 <div class="list-header">3.5.321 <time datetime="2016-10-03">(2016-10-11)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Fixed: Theater mode video player height.</li>
diff --git a/src/ember/layout.js b/src/ember/layout.js
index 6f9bcbd4..f8d972e1 100644
--- a/src/ember/layout.js
+++ b/src/ember/layout.js
@@ -222,7 +222,7 @@ FFZ.prototype.setup_layout = function() {
 				height = size[1],
 				host_height = size[2];
 
-			return "<style>.app-main:not(.theatre) #player,.dynamic-player, .dynamic-player object, .dynamic-player video{width:" + width + "px !important;height:" + height + "px !important} .cn-hosted .dynamic-target-player,.cn-hosted .dynamic-target-player object,.app-main:not(.theatre) .cn-hosted #player, .cn-hosted .dynamic-target-player video{width:" + width + "px !important;height:" + host_height + "px !important}</style><style>.dynamic-player .player object, .dynamic-player .player video{width:100% !important; height:100% !important}</style>";
+			return "<style>body[data-current-path^=\"user.channel.\"] .app-main:not(.theatre) #player,.dynamic-player, .dynamic-player object, .dynamic-player video{width:" + width + "px !important;height:" + height + "px !important} .cn-hosted .dynamic-target-player,.cn-hosted .dynamic-target-player object,body[data-current-path^=\"user.channel.\"] .app-main:not(.theatre) .cn-hosted #player, .cn-hosted .dynamic-target-player video{width:" + width + "px !important;height:" + host_height + "px !important}</style><style>.dynamic-player .player object, .dynamic-player .player video{width:100% !important; height:100% !important}</style>";
 		}.property("playerSize"),
 
 		ffzPortraitWarning: function() {
diff --git a/src/main.js b/src/main.js
index a7d3d88a..1778a63d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -34,7 +34,7 @@ FFZ.msg_commands = {};
 
 // Version
 var VER = FFZ.version_info = {
-	major: 3, minor: 5, revision: 321,
+	major: 3, minor: 5, revision: 322,
 	toString: function() {
 		return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
 	}
diff --git a/style.css b/style.css
index be9b22c2..e905dcf5 100644
--- a/style.css
+++ b/style.css
@@ -3554,8 +3554,6 @@ body.ffz-bttv #ffz-feed-tabs .tabs { margin-bottom: 0 }
 body:not(.ffz-channel-bar-bottom).ffz-small-player #player .dynamic-player { margin-top: 50px }
 body:not(.ffz-channel-bar-bottom).ffz-small-player.ffz-minimal-channel-bar #player .dynamic-player { margin-top: 10px }
 
-.cn-bar-fixed { z-index: 100 }
-
 .ffz-minimal-channel-bar .cn-bar-fixed:hover { top: 0 }
 .ffz-minimal-channel-bar.ffz-channel-bar-bottom .cn-bar-fixed { top: auto; bottom: -40px }
 .ffz-minimal-channel-bar.ffz-channel-bar-bottom .cn-bar-fixed:hover { bottom: 0 }