From 6832ed3cc90e3a7c62dcba988550a904f7c127f0 Mon Sep 17 00:00:00 2001
From: SirStendec <sir@stendec.me>
Date: Tue, 6 Dec 2016 21:34:09 -0500
Subject: [PATCH] 3.5.390. Dark theme tweaks for the resub button and channel
 feed. A bit of work for adding notification control to friend cards. Closes
 #61

---
 changelog.html         | 11 +++++------
 dark.css               | 13 +++++++++++++
 old_changes.html       |  6 ++++++
 src/ember/following.js | 32 ++++++++++++++++++++++++++++++--
 src/main.js            |  2 +-
 5 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/changelog.html b/changelog.html
index 783fe37a..fe4d3968 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,3 +1,8 @@
+<div class="list-header">3.5.390 <time datetime="2016-12-06">(2016-12-06)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Fixed: Dark theme CSS tweaks.</li>
+</ul>
+
 <div class="list-header">3.5.389 <time datetime="2016-12-03">(2016-12-03)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Added: Setting to move the Latest Uploads to the bottom of the Following page or to hide it outright.</li>
@@ -54,11 +59,5 @@
 	<li>Fixed: Hook the new scrolling logic in the Ember service layout.</li>
 </ul>
 
-<div class="list-header">3.5.379 <time datetime="2016-11-23">(2016-11-23)</time></div>
-<ul class="chat-menu-content menu-side-padding">
-	<li>Changed: Minor refactor to bits rendering.</li>
-	<li>API Changed: Badge classes now use <code>name_key</code> rather than <code>id</code> for badges added through the API to give them predictable classes.</li>
-</ul>
-
 <div class="list-header" id="ffz-old-news-button"><a href="#">View Older</a></div>
 <div id="ffz-old-news"></div>
\ No newline at end of file
diff --git a/dark.css b/dark.css
index f6078bab..5e664288 100644
--- a/dark.css
+++ b/dark.css
@@ -97,6 +97,7 @@
 .ffz-dark #stats_and_description .stat { color: #808080 }
 .ffz-dark #stats_and_description .stat:not(#channel_viewer_count) { -webkit-filter: invert(100%) }
 
+.ffz-dark .profile-card__content,
 .ffz-dark .member.js-playing a { color: #fff !important }
 .ffz-dark .member { box-shadow: none !important }
 .ffz-dark .member.live { background-color: #222; }
@@ -219,6 +220,7 @@ body.ffz-dark:not([data-page="teams#show"]),
 .ffz-dark .balloon--left:after { box-shadow: 1px -1px 0 rgba(255,255,255,0.2) }
 .ffz-dark .balloon--right:after { box-shadow: -1px 1px 0 rgba(255,255,255,0.2) }
 
+.ffz-dark .filter-bar__balloon-footer,
 .ffz-dark .balloon__footer {
 	background-color: rgb(25,25,25);
 	border: 1px solid rgba(255,255,255,0.2);
@@ -1436,6 +1438,16 @@ body.ffz-dark:not([data-page="teams#show"]),
 	box-shadow:inset 0 1px 0 #474747;
 }
 
+.ffz-dark .activity-create {
+	background-color: #101010;
+	box-shadow: inset 0 0 0 1px #474747;
+}
+
+.ffz-dark .activity-create--focus {
+	background-color: #1d1d1d;
+	box-shadow: inset 0 0 0 1px #474747;
+}
+
 .ffz-dark .activity-add-comment__textarea:before {
 	background: #1d1d1d;
 	border-left-color: #474747;
@@ -1505,6 +1517,7 @@ body.ffz-dark:not([data-page="teams#show"]),
 }
 
 
+.ffz-dark .cn-bar__button--resubscribe,
 .ffz-dark .button--icon.cn-bar__button--subscribed {
 	background-color: #161616;
 	box-shadow: 0 0 0 1px rgba(255,255,255,0.065) inset;
diff --git a/old_changes.html b/old_changes.html
index 96678639..0883fd76 100644
--- a/old_changes.html
+++ b/old_changes.html
@@ -1,3 +1,9 @@
+<div class="list-header">3.5.379 <time datetime="2016-11-23">(2016-11-23)</time></div>
+<ul class="chat-menu-content menu-side-padding">
+	<li>Changed: Minor refactor to bits rendering.</li>
+	<li>API Changed: Badge classes now use <code>name_key</code> rather than <code>id</code> for badges added through the API to give them predictable classes.</li>
+</ul>
+
 <div class="list-header">3.5.378 <time datetime="2016-11-23">(2016-11-23)</time></div>
 <ul class="chat-menu-content menu-side-padding">
 	<li>Fixed: Chat breaking when trying to access data for a badge that ended up not loading.</li>
diff --git a/src/ember/following.js b/src/ember/following.js
index b4a58283..5e63c342 100644
--- a/src/ember/following.js
+++ b/src/ember/following.js
@@ -132,6 +132,7 @@ FFZ.prototype.modify_twitch_profile_card = function(component) {
 		ffzUpdate: function() {
 			var el = this.get('element'),
 				t_el = el.querySelector('.ffz-followed-since'),
+				//notif_el = el.querySelector('.ffz-followed-notifications'),
 
 				channel_id = this.get('ffzParentModel.model.id'),
 				is_following = this.get('ffzParentModel.relationshipName') === 'following',
@@ -148,7 +149,9 @@ FFZ.prototype.modify_twitch_profile_card = function(component) {
 
 			if ( ! data || ! el ) {
 				if ( t_el )
-					t_el.parentElement.removeChild(t_el);
+					jQuery(t_el).remove();
+				/*if ( notif_el )
+					jQuery(notif_el).remove();*/
 				return false;
 			}
 
@@ -157,7 +160,8 @@ FFZ.prototype.modify_twitch_profile_card = function(component) {
 				t_el = el.querySelector('.ffz-followed-since')
 
 				update_time = function() {
-					var now = Date.now() - (f._ws_server_offset || 0),
+					var data = user_cache[user_id],
+						now = Date.now() - (f._ws_server_offset || 0),
 						age = data && data[0] ? Math.floor((now - data[0].getTime()) / 1000) : undefined;
 
 					if ( age !== undefined ) {
@@ -175,6 +179,30 @@ FFZ.prototype.modify_twitch_profile_card = function(component) {
 
 			update_time();
 
+			/*if ( ! mine || ! is_following ) {
+				if ( notif_el )
+					jQuery(notif_el).remove();
+				return;
+			}
+
+			if ( ! notif_el ) {
+				notif_el = createElement('button', 'ffz-followed-notifications button html-tooltip');
+				var cont = el.querySelector('.profile-card__actions');
+				if ( ! cont )
+					return;
+				cont.appendChild(notif_el);
+			}
+
+			var update_notif = function() {
+				var data = user_cache[user_id];
+				notif_el.classList.toggle('notifications-on', data && data[1]);
+				notif_el.textContent = 'Notifications';
+				notif_el.setAttribute('original-title', 'Email Notifications: ' + (data && data[1] ? 'En' : 'Dis') + 'abled');
+				jQuery(notif_el).trigger('mouseout');
+			};
+
+			update_notif();*/
+
 		}.observes('channelInfo')
 	});
 }
diff --git a/src/main.js b/src/main.js
index 7fe5b42c..1045281c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -61,7 +61,7 @@ FFZ.channel_metadata = {};
 
 // Version
 var VER = FFZ.version_info = {
-	major: 3, minor: 5, revision: 389,
+	major: 3, minor: 5, revision: 390,
 	toString: function() {
 		return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
 	}