Fix centreing issues.

diff --git a/TODO.txt b/TODO.txt
index 0b65c711908c25bd3453a4db8cca216ec6dde2b5..86bef26440f1d88e0e17f38f579ee8a05cce255e 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -8,7 +8,6 @@ UI:
   FEAT: Last position line\r
   TIDY: warning/info messages should have their colour decided by CSS\r
   FEAT: privacy policy\r
-  TIDY: connect dialog offset looks non-centred\r
   \r
 Authing:\r
   TIDY: Finish integration (notably login button on non-autoconnect page).\r

diff --git a/js/ui/panes/connect.js b/js/ui/panes/connect.js
index 8f0ba4aeda6bddfc037eafea2e9f3489b48b40a0..39f7e0dc25f11e12b1eee75d2292f4c65a8f241d 100644 (file)
--- a/js/ui/panes/connect.js
+++ b/js/ui/panes/connect.js
@@ -7,9 +7,19 @@ qwebirc.ui.GenericLoginBox = function(parentElement, callback, initialNickname,
 }
 
 qwebirc.ui.ConfirmBox = function(parentElement, callback, initialNickname, initialChannels, autoNick, networkName) {
+  var outerbox = new Element("table");
+  outerbox.addClass("qwebirc-centrebox");
+  parentElement.appendChild(outerbox);
+  var tbody = new Element("tbody");
+  outerbox.appendChild(tbody);
+  var tr = new Element("tr");
+  tbody.appendChild(tr);
+  var td = new Element("td");
+  tr.appendChild(td);
+  
   var box = new Element("table");
   box.addClass("qwebirc-confirmbox");
-  parentElement.appendChild(box);
+  td.appendChild(box);
 
   var tbody = new Element("tbody");
   box.appendChild(tbody);
@@ -74,9 +84,19 @@ qwebirc.ui.ConfirmBox = function(parentElement, callback, initialNickname, initi
 }
 
 qwebirc.ui.LoginBox = function(parentElement, callback, initialNickname, initialChannels, networkName) {
+  var outerbox = new Element("table");
+  outerbox.addClass("qwebirc-centrebox");
+  parentElement.appendChild(outerbox);
+  var tbody = new Element("tbody");
+  outerbox.appendChild(tbody);
+  var tr = new Element("tr");
+  tbody.appendChild(tr);
+  var td = new Element("td");
+  tr.appendChild(td);
+  
   var box = new Element("table");
-  parentElement.appendChild(box);
   box.addClass("qwebirc-loginbox");
+  td.appendChild(box);
   
   var tbody = new Element("tbody");
   box.appendChild(tbody);

diff --git a/static/css/dialogs.css b/static/css/dialogs.css
index 5c3b73761232c77063f56dbbbe33c6390c261480..35be32c2d30aad94bcd1036e7ef136232d1ae5aa 100644 (file)
--- a/static/css/dialogs.css
+++ b/static/css/dialogs.css
@@ -1,16 +1,18 @@
 /**************** LOGIN BOX *******************/
-.qwebirc-loginbox {
+
+.qwebirc-centrebox {
   height: 100%;
   width: 100%;
-  vertical-align: middle;
 }
 
-.qwebirc-loginbox .tr1 {
+.qwebirc-centrebox table {
   width: 100%;
-  text-align: center;
 }
 
-.qwebirc-loginbox .tr2 {
+.qwebirc-centrebox table table {
+  width: auto;
+}
+.qwebirc-loginbox .tr1 td {
   width: 100%;
   text-align: center;
 }
@@ -19,10 +21,6 @@
   vertical-align: top;
 }
 
-.qwebirc-loginbox .tr1 td {
-  vertical-align: bottom;
-}
-
 .qwebirc-loginbox .tr2 table {
   margin-left: auto;
   margin-right: auto;
@@ -31,7 +29,6 @@
 
 /**************** CONFIRM LOGIN BOX *******************/
 .qwebirc-confirmbox {
-  height: 100%;
   width: 100%;
   vertical-align: middle;
 }