Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Post valentines update fixes #73

Merged
merged 2 commits into from
Feb 14, 2019
Merged

Post valentines update fixes #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f879875
Keep scroll position locked on chat-output when scaling chat-input
JoannesJ Feb 14, 2019
e66af0a
Post valentines update fixes
JoannesJ Feb 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions assets/chat/css/generify.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,13 @@

@at-root {
@keyframes generify-love__heart--animation {
0%, 2% {
opacity: 0;
}
0% {
visibility: visible;
transform: scale(0);
bottom: -5px;
bottom: -30%;
}

50% {
Expand All @@ -163,7 +166,7 @@

100% {
transform: scale(0.6);
bottom: 20px;
bottom: 50%;
opacity: 0;
}
}
Expand All @@ -188,15 +191,12 @@
}

&::after {
/* right-outer heart */
/* right-inner heart */
@include heart;
right: -8px;
animation-delay: -($animation-duration - $animation-duration*0.50);
right: -2px;
}

& .chat-emote {
overflow: visible;

&::before {
/* left-inner heart */
@include heart;
Expand All @@ -205,9 +205,10 @@
}

&::after {
/* right-inner heart */
/* right-outer heart */
@include heart;
right: -3px;
right: -7px;
animation-delay: -($animation-duration - $animation-duration*0.50);
}
}

Expand Down
4 changes: 0 additions & 4 deletions assets/chat/css/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,6 @@ label small {
* to the same size.
*/
width: 100%;
word-break: break-all;
box-sizing: border-box;
padding: 5px;
border: 1px solid #321a10;
Expand Down Expand Up @@ -312,9 +311,6 @@ label small {
border-style: solid;
border-color: transparent;
border-width: 1px 0 1px 0;

// padding to improve clickability
padding: 3px 0;
}
.externallink {
color: $color-link;
Expand Down
12 changes: 12 additions & 0 deletions assets/chat/js/chat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,9 +321,21 @@ class Chat {
* contain the text entered.
*/
const inputScaler = this.ui.find('#chat-input-scaler');
let lastHeightScaler = 0;

this.input.on('input keydown', () => {
// Get pinned state before syncing the scaler
const wasScrollPinned = this.mainwindow.scrollplugin.isPinned();
inputScaler.text(this.input.val());

if (lastHeightScaler !== inputScaler.height()) {
lastHeightScaler = inputScaler.height();
this.mainwindow.scrollplugin.reset();

if (wasScrollPinned) {
this.mainwindow.updateAndPin();
}
}
});

// Chat focus / menu close when clicking on some areas
Expand Down