diff options
Diffstat (limited to 'template')
| -rwxr-xr-x | template/chat.st | 13 | ||||
| -rwxr-xr-x | template/header.st | 8 | ||||
| -rwxr-xr-x[-rw-r--r--] | template/profile.st | 0 |
3 files changed, 14 insertions, 7 deletions
diff --git a/template/chat.st b/template/chat.st index 3a4cbfd..9095901 100755 --- a/template/chat.st +++ b/template/chat.st @@ -2,7 +2,7 @@ <head> <title>dump.fm</title> <link rel="stylesheet" type="text/css" href="/static/reset.css"> - <link rel="stylesheet" type="text/css" href="/static/pichat.css"> + <link rel="stylesheet" type="text/css" href="static/pichat.css"> <link rel="shortcut icon" href="/static/favicon.ico"> <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script> @@ -26,11 +26,18 @@ <div id="rapper"> <div id="loghead"></div> </div> - <div id="userList"> + <div id="userList"> $users: { u | +<<<<<<< HEAD:template/chat.st + <div class="username"><img src="/static/cat.jpeg" width="50" height="50">$u$ <br> + </div> + }$ + </div> +======= <div><a href="/u/$u$">$u$</a></div> }$ </div> +>>>>>>> 704efb06cd424de7411f198bc4c6ce6b99a9dcbe:template/chat.st <div id="messagePane"> <div id="messageList"> @@ -42,7 +49,7 @@ </div> $if(user_nick)$ <div id="msgInputDiv"> - <input id="msgInput" type="input" /> + <input id="msgInput" class="msgInput" type="input" /> <input id="msgSubmit" type="submit" value="Send Image URL" /> </div> diff --git a/template/header.st b/template/header.st index 00dcba5..ec7c9f9 100755 --- a/template/header.st +++ b/template/header.st @@ -39,13 +39,13 @@ height: 69px; } #bar7{ - top:31px; + top:35px; position:absolute; font-family: Arial, Helvetica, sans-serif; width: 500px; - font-size: 20px; + font-size: 18px; left: 150px; - margin-left: 11%; + margin-left: 1%; margin-right: 8%; letter-spacing: -1px; z-index: 999; @@ -62,7 +62,7 @@ } #logo7{ top:20px; - margin-left: 10%; + margin-left: 1%; margin-right: 10%; z-index:1000; float:left; diff --git a/template/profile.st b/template/profile.st index d0c3edd..d0c3edd 100644..100755 --- a/template/profile.st +++ b/template/profile.st |