Fix sidebar toggle

This commit is contained in:
Mattias Erming 2014-09-10 14:43:56 -07:00
parent 1862e2af93
commit 585391905e
4 changed files with 30 additions and 25 deletions

View File

@ -103,6 +103,25 @@ button {
-webkit-perspective: 1000; -webkit-perspective: 1000;
perspective: 1000; perspective: 1000;
} }
#viewport .lt,
#viewport .rt {
color: #ccc;
display: none;
float: left;
line-height: 40px;
height: 36px;
margin: 6px 12px 0 -12px;
width: 36px;
}
#viewport .lt:before,
#viewport .rt:before {
font: 14px FontAwesome;
content: "\f0c9";
}
#viewport .rt {
float: right;
margin: 6px -12px 0 12px;
}
#sidebar { #sidebar {
bottom: 0; bottom: 0;
left: 0; left: 0;
@ -351,6 +370,10 @@ button {
#windows .active { #windows .active {
display: block; display: block;
} }
#windows .window .lt {
margin-top: 4px;
margin-left: 8px;
}
#chat { #chat {
bottom: 0; bottom: 0;
font: 13px Consolas, Menlo, Monaco, "Lucida Console", "Liberation Mono", "DejaVu Sans Mono", "Courier New", monospace; font: 13px Consolas, Menlo, Monaco, "Lucida Console", "Liberation Mono", "DejaVu Sans Mono", "Courier New", monospace;
@ -368,25 +391,6 @@ button {
height: 48px; height: 48px;
padding: 0 20px; padding: 0 20px;
} }
#chat .header .lt,
#chat .header .rt {
color: #ccc;
display: none;
float: left;
line-height: 40px;
height: 36px;
margin: 6px 12px 0 -12px;
width: 36px;
}
#chat .header .lt:before,
#chat .header .rt:before {
font: 14px FontAwesome;
content: "\f0c9";
}
#chat .header .rt {
float: right;
margin: 6px -12px 0 12px;
}
#chat .header .title { #chat .header .title {
font: 16px Lato; font: 16px Lato;
} }
@ -698,8 +702,8 @@ button {
#chat .chat { #chat .chat {
right: 0; right: 0;
} }
#chat .header .lt, #viewport .lt,
#chat .channel .header .rt { #viewport .channel .rt {
display: block; display: block;
} }
#chat .sidebar { #chat .sidebar {

View File

@ -35,6 +35,7 @@
<div id="windows"> <div id="windows">
<div id="chat"></div> <div id="chat"></div>
<div id="sign-in" class="window"> <div id="sign-in" class="window">
<button class="lt"></button>
<form class="container" action=""> <form class="container" action="">
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
@ -64,6 +65,7 @@
</form> </form>
</div> </div>
<div id="connect" class="window"> <div id="connect" class="window">
<button class="lt"></button>
<form class="container" action=""> <form class="container" action="">
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
@ -118,6 +120,7 @@
</form> </form>
</div> </div>
<div id="settings" class="window"> <div id="settings" class="window">
<button class="lt"></button>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">

View File

@ -332,10 +332,8 @@ $(function() {
} }
viewport.removeClass(); viewport.removeClass();
var active = $("#windows .active").removeClass("active"); var active = $("#windows .active").removeClass("active");
if (active.attr("id") == "sign-in") {
if (active.attr('id') == 'sign-in') {
active.detach(); active.detach();
} }

View File

@ -1,7 +1,7 @@
{ {
"name": "shout", "name": "shout",
"description": "A web IRC client", "description": "A web IRC client",
"version": "0.23.0", "version": "0.23.1",
"author": "Mattias Erming", "author": "Mattias Erming",
"preferGlobal": true, "preferGlobal": true,
"bin": { "bin": {