From 385ac94bf510f1c230fa1bf5e09f153e67e6b08f Mon Sep 17 00:00:00 2001
From: clarkerubber <clarkey@Jamess-MacBook-Pro.local>
Date: Thu, 20 Nov 2014 02:32:36 +1100
Subject: [PATCH] Fix things and more styling

---
 app/views/game/side.scala.html | 56 +++++++++++++++++-----------------
 public/stylesheets/board.css   |  2 +-
 public/stylesheets/common.css  |  6 ++--
 public/stylesheets/dark.css    |  3 +-
 4 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/app/views/game/side.scala.html b/app/views/game/side.scala.html
index a50c20b8cb..850a05d7b2 100644
--- a/app/views/game/side.scala.html
+++ b/app/views/game/side.scala.html
@@ -38,40 +38,40 @@
       @tournamentLink(t)
       <br /><br />
       }
-      <div class="swords" data-icon="U"></div>
-      <div class="players">
-        @if(opponent.color.name == "white") {
-        @List(opponent, player).map { p =>
-        <div class="player">
-          @playerLink(p, withOnline = false, withDiff = true)
-        </div>
-        }
-        } else {
-        @List(player, opponent).map { p =>
-        <div class="player">
-          @playerLink(p, withOnline = false, withDiff = true)
-        </div>
-        }
-        }
-        
       </div>
-      @if(game.finishedOrAborted) {
-      <div class="status">
-        @gameEndStatus(game),
-        @game.winner.map { winner =>
-        @winner.color.fold(trans.whiteIsVictorious(), trans.blackIsVictorious())
-        }
+    <div class="swords" data-icon="U"></div>
+    <div class="players">
+      @if(opponent.color.name == "white") {
+      @List(opponent, player).map { p =>
+      <div class="player">
+        @playerLink(p, withOnline = false, withDiff = true)
       </div>
       }
-      @if(game.variant.threeCheck) {
-      <div class="check_count" data-icon="@lila.rating.PerfType("threeCheck").map(_.iconChar)">
-        Checks given:
-        @* Note that they are stored the other way round, as checks received *@
-        <span class="player color white">@game.checkCount.black</span>
-        <span class="player color black">@game.checkCount.white</span>
+      } else {
+      @List(player, opponent).map { p =>
+      <div class="player">
+        @playerLink(p, withOnline = false, withDiff = true)
       </div>
       }
+      }
+      
+    </div>
+    @if(game.finishedOrAborted) {
+    <div class="status">
+      @gameEndStatus(game),
+      @game.winner.map { winner =>
+      @winner.color.fold(trans.whiteIsVictorious(), trans.blackIsVictorious())
+      }
     </div>
+    }
+    @if(game.variant.threeCheck) {
+    <div class="check_count" data-icon="@lila.rating.PerfType("threeCheck").map(_.iconChar)">
+      Checks given:
+      @* Note that they are stored the other way round, as checks received *@
+      <span class="player color white">@game.checkCount.black</span>
+      <span class="player color black">@game.checkCount.white</span>
+    </div>
+    }
   </div>
 
   @userTv.map { u =>
diff --git a/public/stylesheets/board.css b/public/stylesheets/board.css
index bdc83f76dd..03a9974b69 100644
--- a/public/stylesheets/board.css
+++ b/public/stylesheets/board.css
@@ -1325,7 +1325,7 @@ div.under_chat .watchtv {
   z-index: 1;
 }
 #chat .messages {
-  height: 350px;
+  height: 305px;
   overflow: hidden;
   overflow-y: auto;
 }
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index 653e9dca4c..5c8a8c82b9 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -802,6 +802,8 @@ div.side_box div.header strong{
 }
 div.side_box div.infos {
   padding-left: 35px;
+  padding-bottom: 5px;
+  border-bottom: 1px solid #ccc;
 }
 div.side_box div.infos::before{
   position: absolute;
@@ -811,17 +813,15 @@ div.side_box div.infos::before{
   opacity: 0.7;
 }
 div.side_box div.players {
-  margin-left: -10px;
+  margin-left: 22px;
   margin-top: -26px;
 }
 div.side_box div.swords {
   font-size: 15px;
-  margin-left: -35px;
   margin-top: 10px;
 }
 div.side_box div.status {
   text-align: center;
-  margin-left: -35px;
   margin-top: 5px;
 }
 .player.color {
diff --git a/public/stylesheets/dark.css b/public/stylesheets/dark.css
index 9800e87080..c2b46da08c 100644
--- a/public/stylesheets/dark.css
+++ b/public/stylesheets/dark.css
@@ -122,7 +122,8 @@ body.dark #top div.auth .sep,
 body.dark div.doc_box h2,
 body.dark div.training div.box,
 body.dark div.force_resign_zone,
-body.dark div.negotiation {
+body.dark div.negotiation,
+body.dark div.side_box div.infos {
   border-color: #3d3d3d;
 }
 body.dark .crosstable td.last {