Improve hiding/showing nicklist

This commit is contained in:
Tor Hveem 2013-10-26 23:17:32 +02:00
parent a06916f63e
commit 1a451fd705
3 changed files with 6 additions and 5 deletions

View file

@ -204,17 +204,19 @@ input[type=text], input[type=password], .badge {
height: 99%; height: 99%;
overflow-y: auto; overflow-y: auto;
margin-left: 14%; /* sidebar */ margin-left: 14%; /* sidebar */
margin-right: 100px; /* nicklist */
width: auto; width: auto;
top: 25px; /* topbar */ top: 25px; /* topbar */
padding-bottom: 10px; padding-bottom: 10px;
} }
.withnicklist {
margin-right: 100px !important; /* nicklist */
}
#bufferlines .btn { #bufferlines .btn {
font-family: sans-serif; font-family: sans-serif;
} }
.navbar-fixed-bottom { .navbar-fixed-bottom {
margin: 0 105px 0 14%; margin: 0 5px 0 14%;
} }
.navbar-inverse { .navbar-inverse {
background-color: #181818; background-color: #181818;

View file

@ -223,7 +223,7 @@ $ openssl req -nodes -newkey rsa:2048 -keyout relay.pem -x509 -days 365 -out rel
</li> </li>
</ul> </ul>
</div> </div>
<div id="bufferlines"> <div id="bufferlines" ng-class="{'withnicklist': nonicklist==false}">
<div id="nicklist" ng-hide="nonicklist" class="vertical-line-left"> <div id="nicklist" ng-hide="nonicklist" class="vertical-line-left">
<ul class="nicklistgroup list-unstyled" ng-repeat="group in activeBuffer().nicklist | toArray"> <ul class="nicklistgroup list-unstyled" ng-repeat="group in activeBuffer().nicklist | toArray">
<li class="" ng-repeat="nick in group.nicks"> <li class="" ng-repeat="nick in group.nicks">
@ -266,7 +266,7 @@ $ openssl req -nodes -newkey rsa:2048 -keyout relay.pem -x509 -days 365 -out rel
<div class="push"></div> <div class="push"></div>
</div> </div>
<div id="footer" ng-show="connected"> <div id="footer" ng-show="connected">
<div class="navbar navbar-inverse navbar-fixed-bottom"> <div class="navbar navbar-inverse navbar-fixed-bottom" ng-class="{'withnicklist': nonicklist==false}">
<form class="form form-horizontal" ng-submit="sendMessage()"> <form class="form form-horizontal" ng-submit="sendMessage()">
<div class="input-group"> <div class="input-group">
<input id="sendMessage" type="text" class="form-control" autocomplete="off" ng-model="command" autofocus> <input id="sendMessage" type="text" class="form-control" autocomplete="off" ng-model="command" autofocus>

View file

@ -458,7 +458,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
// Save setting for displaying nicklist // Save setting for displaying nicklist
$store.bind($scope, "nonicklist", false); $store.bind($scope, "nonicklist", false);
$scope.setActiveBuffer = function(key) { $scope.setActiveBuffer = function(key) {
models.setActiveBuffer(key); models.setActiveBuffer(key);
}; };