Permalink
Browse files

Merge pull request #48 from thedjpetersen/7/fixed-layout

7/fixed layout
  • Loading branch information...
2 parents 5c320c6 + 5735937 commit 802ee6c450f18d32235d67d6ebc5c0841e478e7d @thedjpetersen committed Feb 3, 2012
Showing with 35 additions and 16 deletions.
  1. +30 −11 assets/css/subway.css
  2. +5 −5 views/templates.jade
View
@@ -1,3 +1,16 @@
+/* Base styles
+---------------------------------------------------------------------*/
+html { overflow: hidden; }
+
+/* Shared classes
+---------------------------------------------------------------------*/
+
+.bar {
+ position: absolute;
+ left: 0;
+ right: 0;
+}
+
.sidebar > h2 {
text-align: center;
line-height: 0.9em;
@@ -131,23 +144,24 @@
/* Here are the styles for the chat window */
-#chat-window{
+#chat-window {
min-height: 100%;
height: 100%;
width: 80%;
position: absolute;
box-sizing: border-box;
- -moz-box-sizing: border-box; // for Mozilla
- -webkit-box-sizing: border-box; // for WebKit
- -ms-box-sizing: border-box; // for IE8
+ -moz-box-sizing: border-box; /* for Mozilla */
+ -webkit-box-sizing: border-box; /* for WebKit */
+ -ms-box-sizing: border-box; /* for IE8 */
}
-#chat-bar{
+#chat-bar {
border-right: 1px solid #666666;
}
#chat-bar, #user-bar{
- height: 5%;
+ top: 0;
+ height: 34px;
background: #434950;
color: #eee;
overflow: hidden;
@@ -169,22 +183,25 @@
}
#chat-contents {
- height: 85%;
- overflow: hidden;
+ /*height: 85%;*/
+ top: 34px;
+ bottom: 57px;
overflow-y: auto;
background: whiteSmoke;
border-right: 1px solid #DDDDDD
}
#input-container {
- height: 10%;
+ height: 55px;
+ position: absolute;
+ bottom: 0;
border-top: 2px solid #DDD;
background: whiteSmoke;
border-right: 1px solid #DDDDDD;
}
#input-container .input{
- padding-top: 2%;
+ padding-top: 10px;
}
#input-container .input input{
@@ -289,8 +306,10 @@
}
#user-list {
+ position: absolute;
+ top: 34px;
+ bottom: 0;
overflow-y: auto;
- height: 95%;
}
.userlist_user {
View
@@ -49,17 +49,17 @@ script(id="titlebar", type="text/html")
script(id="chat", type="text/html")
#chat-window
- #chat-bar
- #chat-contents
- #input-container
+ #chat-bar.bar
+ #chat-contents.bar
+ #input-container.bar
.input
input(id="chat-input")
a(id="chat_button", class="btn disabled") Send
#user-window
- #user-bar
+ #user-bar.bar
.titlebar
span(class='window_title') User List
- #user-list
+ #user-list.bar
script(id="channel", type="text/html")
span(class="channel-name") {{name}}

0 comments on commit 802ee6c

Please sign in to comment.