Improve CSS layout. Fix 98% bug that affects chrome/ff differently.

Conflicts:
	css/glowingbear.css
This commit is contained in:
Tor Hveem 2014-04-29 01:13:41 +02:00 committed by David Cormier
parent a2969adf9b
commit dc077ac903
2 changed files with 19 additions and 19 deletions

View file

@ -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 {

View file

@ -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">