pregame remodeling

bzar · Jan 6, 2013 · 7ff4db9 · 7ff4db9
1 parent aaa497b
commit 7ff4db9
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 27 deletions.
diff --git a/client/less/pregame.less b/client/less/pregame.less
@@ -1,10 +1,13 @@
 #tools {
-  max-width: 400px;
+  min-width: 300px;
+  max-width: 480px;
   display: inline-block;
+  vertical-align: top;
 }
 
 #mapPreview {
   display: inline-block;
+  vertical-align: bottom;
 }
 
 #players {

diff --git a/client/template/pregame.ect b/client/template/pregame.ect
@@ -10,24 +10,23 @@
 
 <h2>Pregame - <span id="gameName"></span></h2>
 <div id="tools">
+  <div id="gameInfo">
+    <ul id="players"></ul>
+  </div>
+
   <div id="authorTools" class="navigation">
-    <a id="startGame" class="actionButton" href="#">Start game</a>
-    <a id="deleteGame" class="actionButton" href="#">Delete game</a>
     <form id="inviteForm" class="toolForm">
       <select id="username" name="username"/>
       <input type="submit" value="Invite bot"/>
     </form>
-  </div>
-
-  <div id="gameInfo">
-    <ul id="players"></ul>
+    <a id="startGame" class="actionButton" href="#">Start game</a>
+    <a id="deleteGame" class="actionButton" href="#">Delete game</a>
   </div>
 
   <div id="chat">
     <ul id="chatMessages"><li>Welcome to pregame chat!</li></ul>
     <form id="chatForm">
-      <input id="chatInput" type="text" value=""/>
-      <input id="chatSend" type="submit" value="send"/>
+      <input id="chatInput" type="text" value=""/><input id="chatSubmit" type="submit" value="send"/>
     </form>
   </div>
 </div>

diff --git a/client/www/pregame.css b/client/www/pregame.css
@@ -1,3 +1,13 @@
+#tools {
+  min-width: 300px;
+  max-width: 480px;
+  display: inline-block;
+  vertical-align: top;
+}
+#mapPreview {
+  display: inline-block;
+  vertical-align: bottom;
+}
 #players {
   list-style: none;
   color: #eee;

diff --git a/client/www/pregame.html b/client/www/pregame.html
@@ -41,26 +41,26 @@
 
 
 <h2>Pregame - <span id="gameName"></span></h2>
+<div id="tools">
+  <div id="gameInfo">
+    <ul id="players"></ul>
+  </div>
 
-<div id="authorTools" class="navigation">
-  <a id="startGame" class="actionButton" href="#">Start game</a>
-  <a id="deleteGame" class="actionButton" href="#">Delete game</a>
-  <form id="inviteForm" class="toolForm">
-    <select id="username" name="username"/>
-    <input type="submit" value="Invite bot"/>
-  </form>
-</div>
-
-<div id="gameInfo">
-  <ul id="players"></ul>
-</div>
+  <div id="authorTools" class="navigation">
+    <form id="inviteForm" class="toolForm">
+      <select id="username" name="username"/>
+      <input type="submit" value="Invite bot"/>
+    </form>
+    <a id="startGame" class="actionButton" href="#">Start game</a>
+    <a id="deleteGame" class="actionButton" href="#">Delete game</a>
+  </div>
 
-<div id="chat">
-  <ul id="chatMessages"><li>Welcome to pregame chat!</li></ul>
-  <form id="chatForm">
-    <input id="chatInput" type="text" value=""/>
-    <input id="chatSend" type="submit" value="send"/>
-  </form>
+  <div id="chat">
+    <ul id="chatMessages"><li>Welcome to pregame chat!</li></ul>
+    <form id="chatForm">
+      <input id="chatInput" type="text" value=""/><input id="chatSubmit" type="submit" value="send"/>
+    </form>
+  </div>
 </div>
 
 <div id="mapPreview">