From 04a8f5dae74562055d1245bc8e39eabeaab38344 Mon Sep 17 00:00:00 2001 From: SirStendec Date: Fri, 3 Jun 2016 14:15:17 -0400 Subject: [PATCH] 3.5.196. Write dark theme for new-style search dialog. Fix the height limit for SRL race info popups. --- dark.css | 34 +++++++++++++++++++++++++++++++++- src/main.js | 2 +- src/ui/races.js | 12 +++++++++--- style.css | 4 ++++ 4 files changed, 47 insertions(+), 5 deletions(-) diff --git a/dark.css b/dark.css index a34773fe..eb1d67ed 100644 --- a/dark.css +++ b/dark.css @@ -1225,4 +1225,36 @@ body.ffz-dark:not([data-page="teams#show"]), box-shadow: inset 0 -1px 0 #474747; } -.ffz-dark a.balloon__link:hover { color: #fff !important } \ No newline at end of file +.ffz-dark a.balloon__link:hover { color: #fff !important } + + +/* Search Panel */ + +.ffz-dark[data-current-path="user.channel.index.index"] .searchPanel { background-color: rgba(16,16,16,0.9) } + +.ffz-dark .searchPanel { + background-color: #101010; + color: #C3C3C3; +} + +.ffz-dark .titleBar { + background-color: #090909; +} + +.ffz-dark .searchPanel, +.ffz-dark .titleBar, +.ffz-dark .titleBar__back { + border-color: rgba(255,255,255,0.2) +} + +.ffz-dark .titleBar__title { color: #999 } + +.ffz-dark .titleBar__back:hover, +.ffz-dark .resultView__titlesep.isActive { background-color: #222 } + +.ffz-dark .resultView__item .card__info span, +.ffz-dark .resultView__item .card__title, +.ffz-dark .resultView__titlesep.isActive .resultView__titleMore { color: #a68ed2 } +.ffz-dark .resultView__titlesep { + background-color: #090909; +} \ No newline at end of file diff --git a/src/main.js b/src/main.js index 9d836e39..aec9ce18 100644 --- a/src/main.js +++ b/src/main.js @@ -37,7 +37,7 @@ FFZ.msg_commands = {}; // Version var VER = FFZ.version_info = { - major: 3, minor: 5, revision: 194, + major: 3, minor: 5, revision: 196, toString: function() { return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || ""); } diff --git a/src/ui/races.js b/src/ui/races.js index 1c4345d4..39abd185 100644 --- a/src/ui/races.js +++ b/src/ui/races.js @@ -210,7 +210,7 @@ FFZ.prototype._build_race_popup = function(container, channel_id) { } } - var height = document.querySelector('.app-main.theatre') ? document.body.clientHeight - 300 : container.parentElement.offsetTop - 175, + var height = document.querySelector('.app-main.theatre') ? document.body.clientHeight - 300 : container.parentElement.parentElement.offsetTop - 175, controller = utils.ember_lookup('controller:channel'), display_name = controller && controller.get('content.id') === channel_id ? controller.get('content.display_name') : FFZ.get_capitalization(channel_id), tweet = encodeURIComponent("I'm watching " + display_name + " race " + race.goal + " in " + race.game + " on SpeedRunsLive!"); @@ -268,6 +268,11 @@ FFZ.prototype._update_race = function(container, not_timer) { timer = popup.querySelector('.heading > span'), info = popup.querySelector('.heading div'); + // Make sure we don't leave any tooltips lying around when we update. + // Of course, we should just rewrite logic to not constantly mutilate + // rows. + jQuery('.tooltip', tbody).trigger('mouseout'); + tbody.innerHTML = ''; var entrants = [], done = true; for(var ent in race.entrants) { @@ -327,8 +332,9 @@ FFZ.prototype._update_race = function(container, not_timer) { } } - if ( race.time ) { - timer.title = 'Started at: ' + utils.sanitize(utils.parse_date(1000 * race.time).toLocaleString()) + ''; + if ( race.time != timer.getAttribute('data-time') ) { + timer.setAttribute('data-time', race.time); + timer.setAttribute('original-title', race.time ? 'Started at: ' + utils.sanitize(utils.parse_date(1000 * race.time).toLocaleString()) + '' : ''); } if ( ! elapsed ) diff --git a/style.css b/style.css index 90bf8200..e1b7538d 100644 --- a/style.css +++ b/style.css @@ -1148,6 +1148,7 @@ body:not(.ffz-bttv) .dropmenu.share { margin-bottom: 0; } /* Menu Scrollbar */ +.searchPanel .collectionWrapper::-webkit-scrollbar, .activity-react__all::-webkit-scrollbar, .conversations-list .scroll-container::-webkit-scrollbar, .chatters-container::-webkit-scrollbar, @@ -1164,6 +1165,7 @@ body:not(.ffz-bttv) .dropmenu.share { margin-bottom: 0; } width: 6px; } +.searchPanel .collectionWrapper::-webkit-scrollbar-thumb, .activity-react__all::-webkit-scrollbar-thumb, .conversations-list .scroll-container::-webkit-scrollbar-thumb, .chatters-container::-webkit-scrollbar-thumb, @@ -1181,6 +1183,7 @@ body:not(.ffz-bttv) .dropmenu.share { margin-bottom: 0; } box-shadow: 0 0 1px 1px rgba(255,255,255,0.25); } +.ffz-dark .searchPanel .collectionWrapper::-webkit-scrollbar-thumb, .ffz-dark .activity-react__all::-webkit-scrollbar-thumb, .ffz-dark .conversations-list .scroll-container::-webkit-scrollbar-thumb, .ffz-dark .ffz-scrollbar::-webkit-scrollbar-thumb, @@ -1189,6 +1192,7 @@ body:not(.ffz-bttv) .dropmenu.share { margin-bottom: 0; } .ffz-dark .conversations-list .conversations-list-inner::-webkit-scrollbar-thumb, .ffz-dark .conversation-input-bar .emoticon-selector-box .all-emotes::-webkit-scrollbar-thumb, +.theatre .searchPanel .collectionWrapper::-webkit-scrollbar-thumb, .theatre .conversations-list .scroll-container::-webkit-scrollbar-thumb, .theatre .chatters-container::-webkit-scrollbar-thumb, .theatre .ffz-scrollbar::-webkit-scrollbar-thumb,