From dc077ac90338974260554c54907a291ffc29a911 Mon Sep 17 00:00:00 2001
From: Tor Hveem <tor@hveem.no>
Date: Tue, 29 Apr 2014 01:13:41 +0200
Subject: [PATCH] Improve CSS layout. Fix 98% bug that affects chrome/ff
 differently.

Conflicts:
	css/glowingbear.css
---
 css/glowingbear.css | 33 +++++++++++++++++----------------
 index.html          |  5 ++---
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/css/glowingbear.css b/css/glowingbear.css
index 4f25fae..1ca94d8 100644
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@@ -2,6 +2,7 @@ html,
 body {
     height: 100%;
 /* The html and body elements cannot have any padding or margin. */
+    overflow:hidden;
 }
 
 .horizontal-line {
@@ -81,9 +82,6 @@ hr {
 body {
     color: #ddd;
     background-color: #181818;
-    padding-left: 0;
-    padding-right: 5px;
-    padding-bottom:70px;
 }
 
 #sendMessage {
@@ -91,7 +89,7 @@ body {
     height: 36px;
     resize: none;
 }
-#footer button {
+.footer button {
     border-radius: 0;
 }
 .panel input, .panel .input-group {
@@ -250,21 +248,20 @@ input[type=text], input[type=password], #sendMessage, .badge {
 
 #bufferlines {
     position: relative;
-    height: 98%;
+    height: 100%;
     overflow-y: auto;
     width: auto;
-    top: 35px; /* topbar */
-    padding-bottom: 10px; /* ignored by firefox */
-    margin-right: -5px;
+    bottom: 35px;
+    padding-top: 35px; /* topbar */
     -webkit-transition:0.35s ease all;
     transition:0.35s ease all;
 }
+#bufferlines table {
+  margin-top: 35px;
+}
 
+/* Placeholder for firefox specific CSS */
 @-moz-document url-prefix() {
-    /* firefox specific rule because it ignores the padding in #bufferlines */
-    #bufferlines table {
-        margin-bottom: 10px;
-    }
 }
 
 .withnicklist {
@@ -277,13 +274,17 @@ input[type=text], input[type=password], #sendMessage, .badge {
     font-family: sans-serif;
 }
 
-.navbar-fixed-bottom {
-    margin: 0 5px 0 145px; /* sidebar */
+.footer {
+    position: fixed;
+    bottom: 0;
+    height: 35px;
+    width: 100%;
     -webkit-transition:0.35s ease all;
     transition:0.35s ease all;
 }
-.navbar-inverse {
-    background-color: #181818;
+.footer.withsidebar {
+    margin-left: 0;
+    padding-left: 145px;
 }
 
 .color-light-green {
diff --git a/index.html b/index.html
index 85415e4..1ff63a9 100644
--- a/index.html
+++ b/index.html
@@ -262,11 +262,10 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
           </tbody>
         </table>
       </div>
-    </div>
-    <div id="footer" ng-show="connected">
-      <div class="navbar navbar-inverse navbar-fixed-bottom" ng-class="{'withnicklist': showNicklist, 'withsidebar': showSidebar}">
+      <div class="footer" ng-class="{'withnicklist': showNicklist, 'withsidebar': showSidebar}">
         <div input-bar input-id="sendMessage"></div>
       </div>
+    </div>
       <div id="soundNotification"></div>
     </div>
     <div id="settingsModal" class="modal fade">