From 2af424ef04f600663d39abdb7caff88bd9e5cea0 Mon Sep 17 00:00:00 2001
From: Guangcong Luo <guangcongluo@gmail.com>
Date: Wed, 18 Mar 2020 01:35:30 -0700
Subject: [PATCH] Update for CSS changes

---
 src/panel-battle.tsx       |  2 +-
 src/panel-rooms.tsx        |  2 +-
 src/panel-teamdropdown.tsx |  4 +--
 style/battle-log.css       |  3 --
 style/client2.css          | 61 +++++---------------------------------
 5 files changed, 11 insertions(+), 61 deletions(-)

diff --git a/src/panel-battle.tsx b/src/panel-battle.tsx
index e038eeefe..d4e1ca84e 100644
--- a/src/panel-battle.tsx
+++ b/src/panel-battle.tsx
@@ -44,7 +44,7 @@ class BattlesPanel extends PSRoomPanel<BattlesRoom> {
 	renderBattleLink(battle: BattleDesc) {
 		const format = battle.id.split('-')[1];
 		const minEloMessage = typeof battle.minElo === 'number' ? `rated ${battle.minElo}` : battle.minElo;
-		return <div><a href={`/${battle.id}`} class="ilink">
+		return <div><a href={`/${battle.id}`} class="blocklink">
 			{minEloMessage && <small style="float:right">({minEloMessage})</small>}
 			<small>[{format}]</small><br />
 			<em class="p1">{battle.p1}</em> <small class="vs">vs.</small> <em class="p2">{battle.p2}</em>
diff --git a/src/panel-rooms.tsx b/src/panel-rooms.tsx
index c4c44ac2e..156c82d8a 100644
--- a/src/panel-rooms.tsx
+++ b/src/panel-rooms.tsx
@@ -171,7 +171,7 @@ class RoomsPanel extends PSRoomPanel {
 		return <div class="roomlist">
 			<h2>{title}</h2>
 			{sortedRooms.map(roomInfo => <div>
-				<a href={`/${toID(roomInfo.title)}`} class="ilink">
+				<a href={`/${toID(roomInfo.title)}`} class="blocklink">
 					{roomInfo.userCount !== undefined && <small style="float:right">({roomInfo.userCount} users)</small>}
 					<strong><i class="fa fa-comment-o"></i> {roomInfo.title}<br /></strong>
 					<small>{roomInfo.desc || ''}</small>
diff --git a/src/panel-teamdropdown.tsx b/src/panel-teamdropdown.tsx
index d1850242e..b19e308b1 100644
--- a/src/panel-teamdropdown.tsx
+++ b/src/panel-teamdropdown.tsx
@@ -614,8 +614,8 @@ class FormatDropdownPanel extends PSRoomPanel {
 		});
 
 		return <PSPanelWrapper room={room} width={320}>
-			<ul onClick={this.click}>
-				{formats.map(format => <li><button value={format.name}>
+			<ul class="options" onClick={this.click}>
+				{formats.map(format => <li><button value={format.name} class="option">
 					{format.name}
 				</button></li>)}
 			</ul>
diff --git a/style/battle-log.css b/style/battle-log.css
index 76fb6c3b2..ec6a20a28 100644
--- a/style/battle-log.css
+++ b/style/battle-log.css
@@ -39,9 +39,6 @@
 .dark .blocklink {
 	box-shadow: none;
 	text-shadow: none;
-}
-
-.dark .blocklink {
 	border-color: #7799BB;
 	background: rgba(30, 40, 50, .5);
 	color: #7799BB;
diff --git a/style/client2.css b/style/client2.css
index 989a67960..a0263e2a9 100644
--- a/style/client2.css
+++ b/style/client2.css
@@ -530,31 +530,31 @@ p.or:after {
 	color: #EE4422;
 }
 
-.popupmenu {
+.options {
 	margin: -2px 0 -1px 0;
 	padding: 0;
 	list-style: none;
 	font-size: 8pt;
 }
-.popupmenu h3 {
+.options h3 {
 	margin: 5px 0 0 -2px;
 	padding: 1px 0;
 	font-size: 8pt;
 	color: #579;
 }
-.popupmenu li:first-child h3 {
+.options li:first-child h3 {
 	margin-top: 0;
 }
 @media (max-height:590px) {
-	.popupmenu h3 {
+	.options h3 {
 		margin-top: 2px;
 	}
-	.popupmenu {
+	.options {
 		margin: -3px 0 -2px 0;
 	}
 }
 @media (max-height:518px) {
-	.popupmenu h3 {
+	.options h3 {
 		margin-top: 1px;
 	}
 }
@@ -939,32 +939,9 @@ p.or:after {
 	max-width: 480px;
 	text-align: left;
 }
-.roomlist a.ilink {
-	display: block;
-	margin: 2px 7px 4px 7px;
-	padding: 1px 4px 2px 4px;
-	border: 1px solid #BBCCDD;
-	background: rgba(248, 251, 253, 0.5);
-
-	border-radius: 4px;
-	text-decoration: none;
-	color: #336699;
-	text-shadow: #ffffff 0px -1px 0;
-	cursor: pointer;
-	font-size: 10pt;
-
-	overflow: hidden;
-	white-space: nowrap;
-}
-.roomlist a.ilink small {
+.roomlist .blocklink small {
 	font-size: 8pt;
 }
-.roomlist a.ilink:hover {
-	border-color: #778899;
-	background: #E5EAED;
-	color: #224466;
-	text-decoration: none;
-}
 
 /*********************************************************
  * Chat
@@ -3203,27 +3180,3 @@ a.ilink.yours {
 .dark .setchart .statrow-head em {
 	color: #BBB;
 }
-
-/* rooms */
-.dark .roomlist a.ilink {
-	box-shadow: none;
-	text-shadow: none;
-}
-
-.dark .roomlist a.ilink {
-	border-color: #7799BB;
-	background: rgba(30, 40, 50, .5);
-	color: #7799BB;
-}
-.dark .roomlist a.ilink:hover {
-	border-color: #AACCEE;
-	background: rgba(30, 40, 50, 1);
-	color: #AACCEE;
-}
-
-/* misc */
-.dark iframe.textbox,
-.dark iframe.textbox:hover,
-.dark iframe.textbox:focus {
-	background: #DDDDDD;
-}