supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #467 from thelounge/PR/oops

Browse Source 
Fix slight bugs introduced by #379 and #465
This commit is contained in:
Alistair McKinlay 2016-07-06 10:53:27 +01:00 committed by GitHub
commit 548a8d7130
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/css/style.css
View File

@ -1227,6 +1227,7 @@ button {
background: white; background: white;
display: flex; display: flex;
align-items: flex-end; align-items: flex-end;
min-height: 37px;
} }
#form #nick { #form #nick {

9
client/js/lounge.js
View File

@ -773,7 +773,7 @@ $(function() {
} }
viewport.removeClass("lt"); viewport.removeClass("lt");
var lastActive = $("#windows .chan.active"); var lastActive = $("#windows > .active");
lastActive lastActive
.removeClass("active") .removeClass("active")
@ -781,10 +781,8 @@ $(function() {
.unsticky(); .unsticky();
lastActive lastActive
.find(".unread-marker") .find(".chan.active")
.appendTo(lastActive.find(".messages")); .removeClass("active");
$("#chat-container").addClass("active");
var chan = $(target) var chan = $(target)
.addClass("active") .addClass("active")
@ -802,6 +800,7 @@ $(function() {
document.title = title; document.title = title;
if (self.hasClass("chan")) { if (self.hasClass("chan")) {
$("#chat-container").addClass("active");
setNick(self.closest(".network").data("nick")); setNick(self.closest(".network").data("nick"));
} }

4
client/themes/morning.css
View File

@ -146,8 +146,8 @@ body {
} }
#form .input { #form .input {
background-color: #2e3642; background-color: #2e3642 !important;
border-color: #242a33; border-color: #242a33 !important;
color: #ccc; color: #ccc;
} }

6
client/themes/zenburn.css
View File

@ -173,9 +173,9 @@ body {
} }
#form .input { #form .input {
background-color: #434443; background-color: #434443 !important;
border-color: #101010; border-color: #101010 !important;
color: #dcdccc; color: #dcdccc !important;
} }
#form #nick { #form #nick {