Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

A few sidebar updates.

  • Loading branch information...
commit 6893b19f3c07dcf855bccd08cf4101afc586d193 1 parent 60ad5d3
@simonwex simonwex authored
View
39 app/http/public/stylesheets/sidebar.css
@@ -66,8 +66,8 @@ body.authenticated #ui {
font-size: 14px;
color: white;
line-height:100%;
- margin: 0px 0px 5px 5px;
- padding-right:15px;
+ margin: 0 0 5px 5px;
+ padding-right: 15px;
}
.fixed-top-bar ul, .fixed-top-bar ul li, .fixed-top-bar ul li a{
@@ -106,16 +106,17 @@ ul li .thumbnail {
height: 30px;
}
-ul li span.status {
- float: right;
+.contacts span.status {
+ display: inline;
}
-ul li svg {
+span svg {
width: 30px;
height: 30px;
display: inline;
}
+
.feed ul li {
cursor: pointer;
}
@@ -139,14 +140,30 @@ ul li svg {
font-size: 1em;
}
-.contacts h2 {
- font-size: 14px;
- color: white;
+.contacts .header {
background-color: #2c2c2c;
- width: 100%;
margin: 0;
- padding: 0 0 0 5px;
- line-height:150%;
+ padding: 4px 0 5px 0;
+ width: 100%;
+ color: white;
+}
+
+.contacts .header * {
+ display: inline;
+ /*border: 1px solid orange;*/
+}
+
+.contacts .header h2 {
+ font-size: 14px;
+ color: white;
+ line-height:100%;
+ margin: 0 0 5px 5px;
+ padding-right: 15px;
+}
+
+.contacts .header svg {
+ width: 30px;
+ height: 20px;
}
.story {
View
22 app/http/views/social/sidebar.ejs
@@ -45,6 +45,9 @@
<% } %>
var handlers = {
+ 'sidebar.user-info': function(user){
+ $('#me img').attr('src', user.portrait);
+ },
'user.signout': function(){
window.location.reload();
},
@@ -78,7 +81,7 @@
'contacts.userStatusUpdate': function(contact){
// TODO: worry about networks.
- dump("Received contact update: "+ JSON.stringify(contact) + "\n");
+ dump("Received contact update: " + contact.realName + " (" + contact.status + ")\n");
// TODO: add my own status in the UI somewhere.
if (contact.id == my.id)
@@ -195,7 +198,6 @@
<div id="ui">
<div id="top_bar" class="fixed-top-bar">
<h1>MoTown</h1>
- <ul><li><a href="/profile">Profile</a></li><li><a href="/feeds">Feeds</a></li></ul>
</div>
<div class="feed">
<ul>
@@ -205,13 +207,21 @@
alt="placeholder alt"
height="30"
width="30"
- src="https://secure.gravatar.com/avatar/xx?s=30&amp;d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png" />
+ src="https://secure.gravatar.com/avatar/xx?s=30" />
<p>bronson commented on issue 531 on twitter/bootstrap</p>
</li>
</ul>
</div>
<div class="contacts">
- <h2>Online Contacts</h2>
+ <div class="header">
+ <h2>Contacts</h2>
+ <span>
+ <svg xmlns="http://www.w3.org/2000/svg" version="1.1">
+ <circle cx="15" cy="15" r="5" stroke="black" stroke-width="0" fill="green" />
+ </svg>
+ <button class="btn btn-mini" data-toggle="dropdown" style="display:none;"></button>
+ </span>
+ </h2>
<ul>
<li id="contact_template">
<img
@@ -219,11 +229,11 @@
alt="Gravatar"
height="30"
width="30"
- src="http://www.gravatar.com/avatar/xx?s=29" />
+ src="http://www.gravatar.com/avatar/xx?s=30" />
<a href="https://mozillians.org/en-US/search?q=wex">Simon Wex</a>
<span class="status">
<svg xmlns="http://www.w3.org/2000/svg" version="1.1">
- <circle cx="15" cy="15" r="5" stroke="black" stroke-width="0" fill="green" />
+ <circle cx="15" cy="15" r="5" stroke-width="0" fill="green" />
</svg>
<button class="btn btn-mini" data-toggle="dropdown"></button>
</span>
Please sign in to comment.
Something went wrong with that request. Please try again.