From 261a7d177d25f6b6d62e3417d75585b62cd5b6cc Mon Sep 17 00:00:00 2001
From: danielvincent <danielgrippi@gmail.com>
Date: Sat, 24 Jul 2010 11:09:25 -0700
Subject: [PATCH] fixed for real
---
app/views/people/_sidebar.html.haml | 2 +-
public/stylesheets/application.css | 15 +++++++--------
public/stylesheets/sass/application.sass | 14 ++++++--------
3 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/app/views/people/_sidebar.html.haml b/app/views/people/_sidebar.html.haml
index 2434fad2a2..69836d5343 100644
--- a/app/views/people/_sidebar.html.haml
+++ b/app/views/people/_sidebar.html.haml
@@ -2,7 +2,7 @@
%h3 friends
- for friend in @friends
- %li= person_image_link(friend)
+ = person_image_link(friend)
%li= link_to "view all", people_path
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 2f7929ca6e..7e52893c88 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -117,14 +117,13 @@ ul#stream, ul#friend_stream {
margin-bottom: 5px; }
ul#friend_stream > li {
- padding: 0.2em 0;
- display: inline;
- border: none; }
- ul#friend_stream > li img {
- max-width: 30px;
- position: relative;
- float: none;
- display: inline; }
+ padding: 0.2em 0; }
+ul#friend_stream img {
+ width: 25px;
+ max-width: 25px;
+ position: relative;
+ float: none;
+ display: inline; }
li.message {
position: relative;
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index f15e31d2f8..41245e3047 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -132,15 +132,13 @@ ul#stream, ul#friend_stream
ul#friend_stream
> li
:padding 0.2em 0
- :display inline
- :border none
- img
- :width 25px
- :max-width 25px
- :position relative
- :float none
- :display inline
+ img
+ :width 25px
+ :max-width 25px
+ :position relative
+ :float none
+ :display inline
li.message
--
GitLab