Merge pull request thelounge#467 from thelounge/PR/oops

Fix slight bugs introduced by thelounge#379 and thelounge#465
matburnham · Jul 6, 2016 · f15e201 · f15e201
2 parents 19c1839 + bda32fa
commit f15e201
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/client/css/style.css b/client/css/style.css
@@ -1227,6 +1227,7 @@ button {
 	background: white;
 	display: flex;
 	align-items: flex-end;
+	min-height: 37px;
 }
 
 #form #nick {

diff --git a/client/js/lounge.js b/client/js/lounge.js
@@ -773,18 +773,16 @@ $(function() {
 		}
 
 		viewport.removeClass("lt");
-		var lastActive = $("#windows .chan.active");
+		var lastActive = $("#windows > .active");
 
 		lastActive
 			.removeClass("active")
 			.find(".chat")
 			.unsticky();
 
 		lastActive
-			.find(".unread-marker")
-			.appendTo(lastActive.find(".messages"));
-
-		$("#chat-container").addClass("active");
+			.find(".chan.active")
+			.removeClass("active");
 
 		var chan = $(target)
 			.addClass("active")
@@ -802,6 +800,7 @@ $(function() {
 		document.title = title;
 
 		if (self.hasClass("chan")) {
+			$("#chat-container").addClass("active");
 			setNick(self.closest(".network").data("nick"));
 		}
 

diff --git a/client/themes/morning.css b/client/themes/morning.css
@@ -146,8 +146,8 @@ body {
 }
 
 #form .input {
-	background-color: #2e3642;
-	border-color: #242a33;
+	background-color: #2e3642 !important;
+	border-color: #242a33 !important;
 	color: #ccc;
 }
 

diff --git a/client/themes/zenburn.css b/client/themes/zenburn.css
@@ -173,9 +173,9 @@ body {
 }
 
 #form .input {
-	background-color: #434443;
-	border-color: #101010;
-	color: #dcdccc;
+	background-color: #434443 !important;
+	border-color: #101010 !important;
+	color: #dcdccc !important;
 }
 
 #form #nick {