tobast/glowingbear-mainbox
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

33
css/glowingbear.css
View file

@ -2,6 +2,7 @@ html,
body { body {
height: 100%; height: 100%;
/* The html and body elements cannot have any padding or margin. */ /* The html and body elements cannot have any padding or margin. */
overflow:hidden;
} }
.horizontal-line { .horizontal-line {
@ -81,9 +82,6 @@ hr {
body { body {
color: #ddd; color: #ddd;
background-color: #181818; background-color: #181818;
padding-left: 0;
padding-right: 5px;
padding-bottom:70px;
} }
#sendMessage { #sendMessage {
@ -91,7 +89,7 @@ body {
height: 36px; height: 36px;
resize: none; resize: none;
} }
#footer button { .footer button {
border-radius: 0; border-radius: 0;
} }
.panel input, .panel .input-group { .panel input, .panel .input-group {
@ -250,21 +248,20 @@ input[type=text], input[type=password], #sendMessage, .badge {
#bufferlines { #bufferlines {
position: relative; position: relative;
height: 98%; height: 100%;
overflow-y: auto; overflow-y: auto;
width: auto; width: auto;
top: 35px; /* topbar */ bottom: 35px;
padding-bottom: 10px; /* ignored by firefox */ padding-top: 35px; /* topbar */
margin-right: -5px;
-webkit-transition:0.35s ease all; -webkit-transition:0.35s ease all;
transition:0.35s ease all; transition:0.35s ease all;
} }
#bufferlines table {
margin-top: 35px;
}
/* Placeholder for firefox specific CSS */
@-moz-document url-prefix() { @-moz-document url-prefix() {
/* firefox specific rule because it ignores the padding in #bufferlines */
#bufferlines table {
margin-bottom: 10px;
}
} }
.withnicklist { .withnicklist {
@ -277,13 +274,17 @@ input[type=text], input[type=password], #sendMessage, .badge {
font-family: sans-serif; font-family: sans-serif;
} }
.navbar-fixed-bottom { .footer {
margin: 0 5px 0 145px; /* sidebar */ position: fixed;
bottom: 0;
height: 35px;
width: 100%;
-webkit-transition:0.35s ease all; -webkit-transition:0.35s ease all;
transition:0.35s ease all; transition:0.35s ease all;
} }
.navbar-inverse { .footer.withsidebar {
background-color: #181818; margin-left: 0;
padding-left: 145px;
} }
.color-light-green { .color-light-green {

5
index.html
View file

@ -262,11 +262,10 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
</tbody> </tbody>
</table> </table>
</div> </div>
</div> <div class="footer" ng-class="{'withnicklist': showNicklist, 'withsidebar': showSidebar}">
<div id="footer" ng-show="connected">
<div class="navbar navbar-inverse navbar-fixed-bottom" ng-class="{'withnicklist': showNicklist, 'withsidebar': showSidebar}">
<div input-bar input-id="sendMessage"></div> <div input-bar input-id="sendMessage"></div>
</div> </div>
</div>
<div id="soundNotification"></div> <div id="soundNotification"></div>
</div> </div>
<div id="settingsModal" class="modal fade"> <div id="settingsModal" class="modal fade">