From 57a95986d3d6eee1f48946a59af21732795236c5 Mon Sep 17 00:00:00 2001 From: SirStendec Date: Fri, 27 May 2016 00:59:03 -0400 Subject: [PATCH] 3.5.190. Minor CSS tweaks. Case insensitive emote tab completion. Fix the new sidebar in portrait mode. --- dark.css | 18 ++++++++++++++++-- src/ember/chat-input.js | 16 ++++++++++++++-- src/ember/layout.js | 7 +++++-- src/main.js | 4 ++-- style.css | 6 ++++++ 5 files changed, 43 insertions(+), 8 deletions(-) diff --git a/dark.css b/dark.css index 889afb92..a34773fe 100644 --- a/dark.css +++ b/dark.css @@ -89,11 +89,24 @@ } +/* Team Pages */ + +.ffz-dark #stats_and_description { border-color: rgba(255,255,255,0.1) } +.ffz-dark #stats_and_description .stat { color: #808080 } +.ffz-dark #stats_and_description .stat:not(#channel_viewer_count) { -webkit-filter: invert(100%) } + +.ffz-dark .member.js-playing a { color: #fff !important } +.ffz-dark .member { box-shadow: none !important } +.ffz-dark .member.live { background-color: #222; } +.ffz-dark .member:hover { background-color: #333 } +.ffz-dark .member .channel_count { color: #ccc } + /* main column */ -body.ffz-dark, +body.ffz-dark:not([data-page="teams#show"]), .ffz-dark .app-main, -.ffz-dark div#mantle_skin, +.ffz-dark[data-page="teams#show"] .main, +.ffz-dark:not([data-page="teams#show"]) div#mantle_skin, .ffz-dark div#main_col { background:rgb(16,16,16); color:rgb(195,195,195)!important; @@ -775,6 +788,7 @@ body.ffz-dark, background-color: rgb(25,25,25); } +.ffz-dark .brick, .ffz-dark .brick--faint, .ffz-dark .brick--block, .ffz-dark #action_feed .action, diff --git a/src/ember/chat-input.js b/src/ember/chat-input.js index 41706494..2f8168b2 100644 --- a/src/ember/chat-input.js +++ b/src/ember/chat-input.js @@ -133,6 +133,18 @@ FFZ.settings_info.input_complete_name_at = { } +FFZ.settings_info.input_emoticons_case_sensitive = { + type: "boolean", + value: true, + + category: "Chat Input", + no_bttv: true, + + name: "Tab-Complete Emoticons Case Sensitive", + help: "When enabled, tab-completion for emoticons is case sensitive." +} + + FFZ.settings_info.input_complete_without_prefix = { type: "boolean", value: true, @@ -169,7 +181,7 @@ FFZ.settings_info.input_emoji = { FFZ.prototype.setup_chat_input = function() { this.log("Hooking the Ember Chat Input component."); - var Input = utils.ember_resolve('component:twitch-chat-input'), + var Input = utils.ember_resolve('component:chat/twitch-chat-input'), f = this; if ( ! Input ) @@ -698,7 +710,7 @@ FFZ.prototype._modify_chat_input = function(component) { name = name.toLowerCase(); return char === '@' ? name.indexOf(part2.toLowerCase()) === 0 : name.indexOf(partial.toLowerCase()) === 0; - } else if ( type === 'emoji' ) { + } else if ( type === 'emoji' || ! f.settings.input_emoticons_case_sensitive ) { name = name.toLowerCase(); return name.indexOf(partial.toLowerCase()) === 0; } diff --git a/src/ember/layout.js b/src/ember/layout.js index ce862e7b..29d59eae 100644 --- a/src/ember/layout.js +++ b/src/ember/layout.js @@ -262,8 +262,10 @@ FFZ.prototype.setup_layout = function() { theatre_video_top = video_below ? theatre_chat_height : 0, theatre_chat_top = video_below ? 0 : theatre_video_height; - - out = 'body[data-current-path^="user."] #left_col,' + + out = 'body[data-current-path^="user."] #left_col .warp { min-height: inherit }' + + 'body[data-current-path^="user."] #left_col { overflow: hidden }' + + 'body[data-current-path^="user."] #left_col .warp,' + + 'body[data-current-path^="user."] #left_col,' + 'body[data-current-path^="user."]:not(.ffz-sidebar-swap) #main_col{' + 'margin-right:0 !important;' + 'top:' + video_top + 'px;' + @@ -276,6 +278,7 @@ FFZ.prototype.setup_layout = function() { 'width:100%;' + 'top:' + chat_top + 'px;' + 'height:' + chat_height + 'px}' + + 'body[data-current-path^="user."] .app-main.theatre #left_col .warp,' + 'body[data-current-path^="user."] .app-main.theatre #left_col,' + 'body[data-current-path^="user."] .app-main.theatre #main_col{' + 'top:' + theatre_video_top + 'px;' + diff --git a/src/main.js b/src/main.js index 28343958..28364f57 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: 188, + major: 3, minor: 5, revision: 190, toString: function() { return [VER.major, VER.minor, VER.revision].join(".") + (VER.extra || ""); } @@ -237,7 +237,7 @@ FFZ.prototype.initialize = function(increment, delay) { } // Check for special non-ember pages. - if ( /^\/(?:$|search$|user\/|p\/|settings|m\/|messages?\/)/.test(location.pathname) ) { + if ( /^\/(?:$|search$|team\/|user\/|p\/|settings|m\/|messages?\/)/.test(location.pathname) ) { this.init_normal(delay); return; } diff --git a/style.css b/style.css index 5499616c..bb7992b1 100644 --- a/style.css +++ b/style.css @@ -26,6 +26,7 @@ body > div.tipsy .tipsy-arrow { opacity: 0.8; } .ffz-hide-recent-past-broadcast .recent-past-broadcast, .ffz-hide-view-count .stat.twitch-channel-views, .ffz-minimal-chat-input .chat-interface .emoticon-selector-toggle, +.ffz-menu-replace .chat-interface .ember-emoticon-selector, .ffz-menu-replace .chat-interface .emoticon-selector-toggle { display: none !important; } @@ -2172,6 +2173,11 @@ body:not([data-current-path^="user."]) .ffz-sidebar-swap .ember-chat .chat-inter .ffz-no-blue .warp__item--anchor, .ffz-no-blue .warp__drawer, .ffz-no-blue .leaf, + +.ffz-no-blue .dark .emoticon-selector .tabs, +.ffz-no-blue .theatre .emoticon-selector .tabs, +.ffz-no-blue .force-dark .emoticon-selector .tabs, + .ffz-no-blue .app-main.theatre .archives-contain .list-video:hover, .ffz-no-blue.ffz-dark .archives-contain .list-video:hover, .ffz-no-blue .theatre .moderation-card .back-button,