mirror of
https://github.com/FrankerFaceZ/FrankerFaceZ.git
synced 2025-06-27 21:05:53 +00:00
3.5.360. Move twitch_emotes.json. CSS tweaks. Fix hosting layout.
This commit is contained in:
SirStendec
parent
d472993aa3
commit
c8a7d65732
7 changed files with 61 additions and 32 deletions
|
|
@ -1,3 +1,18 @@
|
|||
<div class="list-header">3.5.360 <time datetime="2016-10-28">(2016-10-28)</time></div>
|
||||
<ul class="chat-menu-content menu-side-padding">
|
||||
<li>Changed: Move the Twitch emotes data file so CloudFlare will actually cache it. Woo Page Rules</li>
|
||||
<li>Changed: Minor CSS tweaks.</li>
|
||||
<li>Fixed: Report menu for Hosts was not positioned well.</li>
|
||||
</ul>
|
||||
|
||||
<div class="list-header">3.5.359 <time datetime="2016-10-28">(2016-10-28)</time></div>
|
||||
<ul class="chat-menu-content menu-side-padding">
|
||||
<li>Fixed: Presence was not getting set to Invisible properly.</li>
|
||||
<li>Fixed: Remove obsolete Sidebar settings.</li>
|
||||
<li>Changed: CSS tweaks.</li>
|
||||
<li>Changed: Hide <code>Add Friend</code> buttons when friends are disabled.</li>
|
||||
</ul>
|
||||
|
||||
<div class="list-header">3.5.358 <time datetime="2016-10-28">(2016-10-28)</time></div>
|
||||
<ul class="chat-menu-content menu-side-padding">
|
||||
<li>Fixed: Automatic Theater Mode broke because Twitch removed the player's <code>isLoading</code> function. (Presumably because the player doesn't break if you try using it while it's loading, now.)</li>
|
||||
|
|
@ -60,12 +75,5 @@
|
|||
<li>Fixed: Tab completion was not being populated correctly.</li>
|
||||
</ul>
|
||||
|
||||
<div class="list-header">3.5.348 <time datetime="2016-10-25">(2016-10-25)</time></div>
|
||||
<ul class="chat-menu-content menu-side-padding">
|
||||
<li>Fixed: Twitch replaced <code>view:room</code> with <code>component:chat/chat-room</code> which broke several features. Unbroke them.</li>
|
||||
<li>Remaining Bugs: Bits eligibility isn't being recalculated when you switch to a different chat room.</li>
|
||||
<li>Changed: Modifier emotes have more properties to control their appearance.</li>
|
||||
</ul>
|
||||
|
||||
<div class="list-header" id="ffz-old-news-button"><a href="#">View Older</a></div>
|
||||
<div id="ffz-old-news"></div>
|
||||
10
dark.css
10
dark.css
|
|
@ -255,15 +255,11 @@ body.ffz-dark:not([data-page="teams#show"]),
|
|||
}
|
||||
|
||||
.ffz-dark .notification-controls .toggle-notification-menu {
|
||||
background-color: #19191f;
|
||||
}
|
||||
|
||||
.ffz-dark .notification-controls .toggle-notification-menu:before {
|
||||
border-top-color: #8c8c9c;
|
||||
background-color: #0f8a4d;
|
||||
}
|
||||
|
||||
.ffz-dark .notification-controls .toggle-notification-menu:hover {
|
||||
background-color: #101014;
|
||||
background-color: #119754;
|
||||
}
|
||||
|
||||
.ffz-dark .pika-input,
|
||||
|
|
@ -369,7 +365,7 @@ body.ffz-dark:not([data-page="teams#show"]),
|
|||
}
|
||||
|
||||
.ffz-dark .warp__item a.js-language-select,
|
||||
.ffz-dark .warp__item > a { color: #d5d4d9 !important }
|
||||
.ffz-dark .warp__item > a:not { color: #d5d4d9 !important }
|
||||
|
||||
.ffz-dark .warp__item--toggled a.js-language-select,
|
||||
.ffz-dark .warp__item > a:hover,
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
<div class="list-header">3.5.348 <time datetime="2016-10-25">(2016-10-25)</time></div>
|
||||
<ul class="chat-menu-content menu-side-padding">
|
||||
<li>Fixed: Twitch replaced <code>view:room</code> with <code>component:chat/chat-room</code> which broke several features. Unbroke them.</li>
|
||||
<li>Remaining Bugs: Bits eligibility isn't being recalculated when you switch to a different chat room.</li>
|
||||
<li>Changed: Modifier emotes have more properties to control their appearance.</li>
|
||||
</ul>
|
||||
|
||||
<div class="list-header">3.5.347 <time datetime="2016-10-25">(2016-10-25)</time></div>
|
||||
<ul class="chat-menu-content menu-side-padding">
|
||||
<li>API Fixed: Emote CSS was not being generated correctly.</li>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ var FFZ = window.FrankerFaceZ,
|
|||
utils = require('../utils'),
|
||||
constants = require('../constants'),
|
||||
|
||||
PRESENCE_SERVICE = 'service:ember-twitch-presence@presence',
|
||||
PRESENCE_SERVICE = 'service:twitch-presence/presence',
|
||||
was_invisible = false;
|
||||
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ var FFZ = window.FrankerFaceZ,
|
|||
// Settings
|
||||
// --------------------
|
||||
|
||||
FFZ.settings_info.sidebar_followed_games = {
|
||||
/*FFZ.settings_info.sidebar_followed_games = {
|
||||
type: "select",
|
||||
options: {
|
||||
0: "Disabled",
|
||||
|
|
@ -33,7 +33,7 @@ FFZ.settings_info.sidebar_followed_games = {
|
|||
if ( controller )
|
||||
controller.set('ffz_sidebar_games', val);
|
||||
}
|
||||
};
|
||||
};*/
|
||||
|
||||
|
||||
FFZ.settings_info.sidebar_hide_recommended_channels = {
|
||||
|
|
@ -74,7 +74,7 @@ FFZ.settings_info.sidebar_hide_prime = {
|
|||
};
|
||||
|
||||
|
||||
FFZ.settings_info.sidebar_hide_promoted_games = {
|
||||
/*FFZ.settings_info.sidebar_hide_promoted_games = {
|
||||
type: "boolean",
|
||||
value: false,
|
||||
|
||||
|
|
@ -85,7 +85,7 @@ FFZ.settings_info.sidebar_hide_promoted_games = {
|
|||
help: "Hide the Promoted Games section from the sidebar.",
|
||||
|
||||
on_update: utils.toggle_cls('ffz-hide-promoted-games')
|
||||
};
|
||||
};*/
|
||||
|
||||
|
||||
|
||||
|
|
@ -158,9 +158,9 @@ FFZ.settings_info.sidebar_disable_friends = {
|
|||
var presence = utils.ember_lookup(PRESENCE_SERVICE);
|
||||
if ( presence ) {
|
||||
if ( val )
|
||||
presence.setInvisible && presence.setInvisible();
|
||||
presence.setVisibility('none');
|
||||
else if ( ! was_invisible )
|
||||
presence.setOnline && presence.setOnline();
|
||||
presence.setVisibility('full');
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
@ -196,7 +196,7 @@ FFZ.settings_info.sidebar_directly_to_followed_channels = {
|
|||
|
||||
FFZ.prototype.setup_sidebar = function() {
|
||||
// CSS to Hide Stuff
|
||||
utils.toggle_cls('ffz-hide-promoted-games')(this.settings.sidebar_hide_promoted_games);
|
||||
//utils.toggle_cls('ffz-hide-promoted-games')(this.settings.sidebar_hide_promoted_games);
|
||||
utils.toggle_cls('ffz-hide-recommended-channels')(this.settings.sidebar_hide_recommended_channels);
|
||||
utils.toggle_cls('ffz-hide-recommended-friends')(this.settings.sidebar_hide_recommended_friends);
|
||||
utils.toggle_cls('ffz-hide-friends-collapsed')(this.settings.sidebar_hide_friends_collapsed);
|
||||
|
|
@ -210,16 +210,15 @@ FFZ.prototype.setup_sidebar = function() {
|
|||
var presence = utils.ember_lookup(PRESENCE_SERVICE);
|
||||
if ( presence ) {
|
||||
was_invisible = presence.get('isInvisible') || false;
|
||||
presence.setInvisible && presence.setInvisible();
|
||||
presence.setVisibility('none');
|
||||
}
|
||||
} catch(err) {
|
||||
window.dumberror = err;
|
||||
this.error("Setting Friends Visibility", err);
|
||||
}
|
||||
}
|
||||
|
||||
// Sidebar Followed Games
|
||||
var f = this,
|
||||
/*var f = this,
|
||||
GamesFollowing = utils.ember_lookup('controller:games-following');
|
||||
|
||||
if ( GamesFollowing ) {
|
||||
|
|
@ -237,7 +236,7 @@ FFZ.prototype.setup_sidebar = function() {
|
|||
|
||||
Ember.propertyDidChange(GamesFollowing, 'sidePanelFollowing');
|
||||
} else
|
||||
this.error("Unable to load the Ember games-following controller.", null);
|
||||
this.error("Unable to load the Ember games-following controller.", null);*/
|
||||
|
||||
|
||||
// Navigation Component
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ FFZ.channel_metadata = {};
|
|||
|
||||
// Version
|
||||
var VER = FFZ.version_info = {
|
||||
major: 3, minor: 5, revision: 358,
|
||||
major: 3, minor: 5, revision: 360,
|
||||
toString: function() {
|
||||
return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || "");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -337,7 +337,7 @@ FFZ.prototype.format_display_name = function(display_name, user_id, disable_alia
|
|||
// ---------------------
|
||||
|
||||
FFZ.prototype.load_twitch_emote_data = function(tries) {
|
||||
jQuery.ajax(constants.SERVER + "script/twitch_emotes.json", {context: this})
|
||||
jQuery.ajax(constants.SERVER + "twitch_emotes.json", {context: this})
|
||||
.done(function(data) {
|
||||
for(var set_id in data) {
|
||||
var set = data[set_id];
|
||||
|
|
|
|||
27
style.css
27
style.css
|
|
@ -18,6 +18,7 @@ body > div.tipsy .tipsy-arrow { opacity: 0.8; }
|
|||
cursor: pointer;
|
||||
}
|
||||
|
||||
.cn-hosting--bottom .ffz-channel-options .balloon:after,
|
||||
.ffz-host-info .card__layout:not(.ffz),
|
||||
.ffz-following-row[data-loaded="false"] .button,
|
||||
.ffz-following-row[data-loaded="false"] .switch,
|
||||
|
|
@ -35,6 +36,7 @@ body > div.tipsy .tipsy-arrow { opacity: 0.8; }
|
|||
.ffz-hide-channel-banner .cn-cover-wrap,
|
||||
.app-main .ad_leader:empty,
|
||||
body:not(.ffz-show-bits-tags) .bits-tag--container,
|
||||
.ffz-hide-friends .friend-button,
|
||||
.ffz-hide-friends nav .friend-list,
|
||||
.ffz-hide-friends .warp__status .js-presence-indicator,
|
||||
.ffz-hide-more-at-twitch nav .tse-content > .warp__list:last-of-type,
|
||||
|
|
@ -68,6 +70,11 @@ body:not(.ffz-show-bits-tags) .bits-tag--container,
|
|||
top: -220px !important;
|
||||
}
|
||||
|
||||
.cn-hosting--bottom .ffz-channel-options .balloon {
|
||||
left: 0;
|
||||
right: auto;
|
||||
}
|
||||
|
||||
.ffz-channel-bar-bottom .cn-bar-fixed {
|
||||
top: auto;
|
||||
bottom: 0;
|
||||
|
|
@ -1354,10 +1361,10 @@ img.channel_background[src="null"] { display: none; }
|
|||
.ffz-moderation-card .right button:last-of-type,
|
||||
.ffz-moderation-card .mod-controls:last-of-type button:last-of-type { margin-right: 0 }
|
||||
|
||||
.ffz-moderation-card .follow-button {
|
||||
body:not(.ffz-hide-friends) .ffz-moderation-card .follow-button {
|
||||
font-size: 0 !important;
|
||||
padding-right: 0 !important;
|
||||
animation: none !important;
|
||||
transition: none !important;
|
||||
}
|
||||
|
||||
.ffz-moderation-card .button.button--icon-only {
|
||||
|
|
@ -2370,11 +2377,13 @@ body:not([data-current-path^="user."]) .ffz-sidebar-swap .ember-chat .chat-inter
|
|||
|
||||
/* No Blue */
|
||||
|
||||
.ffz-no-blue .theme--dark .form__input,
|
||||
.ffz-no-blue .form--theme-dark .form__input {
|
||||
background-color: rgba(255,255,255,0.05);
|
||||
box-shadow: rgba(255,255,255,0.1) 0 0 0 1px inset;
|
||||
}
|
||||
|
||||
.ffz-no-blue .theme--dark .form__input:focus,
|
||||
.ffz-no-blue .form--theme-dark .form__input:focus {
|
||||
box-shadow: rgba(255,255,255,0.3) 0 0 0 1px inset;
|
||||
}
|
||||
|
|
@ -2388,11 +2397,11 @@ body:not([data-current-path^="user."]) .ffz-sidebar-swap .ember-chat .chat-inter
|
|||
background-color: rgba(25,25,25,.5);
|
||||
}
|
||||
|
||||
.ffz-no-blue .warp__item a:hover {
|
||||
.ffz-no-blue .warp__item a:not(.warp__logo):hover {
|
||||
background-color: #2b2b2b;
|
||||
}
|
||||
|
||||
.ffz-no-blue .warp__item--toggled > a {
|
||||
.ffz-no-blue .warp__item--toggled > a:not(.warp__logo) {
|
||||
background-color: #2b2b2b;
|
||||
box-shadow: 3px 0 0 #a3a3a3 inset;
|
||||
}
|
||||
|
|
@ -3648,9 +3657,19 @@ body:not(.ffz-channel-bar-bottom).ffz-small-player.ffz-minimal-channel-bar #play
|
|||
.cn-hosting--bottom > .notification-controls { order: 1 }
|
||||
.cn-hosting--bottom > span.ember-view { order: 2 }
|
||||
|
||||
.cn-hosting--bottom > .ffz-channel-options { flex-grow: 0 }
|
||||
.cn-hosting--bottom .cn-hosting__options { box-shadow: inset 0 0 0 1px rgba(100,65,164,.5) }
|
||||
.cn-hosting--bottom .cn-hosting__options:focus {
|
||||
box-shadow: 0 0 6px 0 #7d5bbe,inset 0 0 0 1px rgba(100,65,164,.5) }
|
||||
|
||||
.cn-metabar__ffz[data-key="viewers"] svg { fill: #fc3636 }
|
||||
.cn-metabar__ffz[data-key="viewers"] { color: #fc3636 }
|
||||
|
||||
.ffz-dark .button--hollow:hover,
|
||||
.cn-hosting--bottom .button-hollow {
|
||||
background-color: #2c2541;
|
||||
}
|
||||
|
||||
|
||||
/* Mod Card Notes */
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue