nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MS profile page fixes

Browse source
This commit is contained in:
maxwell 2010-07-27 15:52:42 -07:00
parent 9dd5c08296
commit 3cecbf1511
5 changed files with 40 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/layouts/application.html.haml
View file

@ -7,7 +7,7 @@
%meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
= stylesheet_link_tag "blueprint/screen", :media => 'screen'
= stylesheet_link_tag "application", "ui"
= stylesheet_link_tag "application", "ui", 'bubble'
/= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
= javascript_include_tag 'jquery142', 'rails', 'google'
= javascript_include_tag 'tiny_mce/tiny_mce', 'jquery.infieldlabel'

1
app/views/people/_sidebar.html.haml
View file

@ -1,5 +1,4 @@
%ul#friend_stream.nav
%h3 friends
- for friend in @friends
= person_image_link(friend)

36
app/views/people/show.html.haml
View file

@ -1,24 +1,30 @@
.span-20.last
#profile.span-19.last
%h1
.profile_photo
= person_image_link(@person)
= "#{@person.real_name}"
.button.right
= link_to 'remove friend', @person, :confirm => 'Are you sure?', :method => :delete
%h4{:style => "font-size:small"}
%ul{:style => "list-style-type: none"}
%li
%i= "last seen: #{how_long_ago(@person_posts.first)}"
%li
%i= "friends since: #{how_long_ago(@person)}"
%ul
%li
%h1
= @person.real_name
.button.right
= link_to 'remove friend', @person, :confirm => 'Are you sure?', :method => :delete
%h1
#latest_message= "\"#{@latest_status_message.message}\""
%li
%i= "last seen: #{how_long_ago(@person_posts.first)}"
%li
%i= "friends since: #{how_long_ago(@person)}"
%li
url:
= @person.url
%h1.pinched
%span
= "\"#{@latest_status_message.message}\""
%h5="posted: #{how_long_ago(@latest_status_message)}"
%p
%b url:
= @person.url
.span-20.last
- if @person.posts

11
public/stylesheets/application.css
View file

@ -1,4 +1,4 @@
@font-face {
q@font-face {
font-family: "BrandonGrotesqueLightRegular";
src: url("brandongrotesque_light/Brandon_light-webfont.eot");
src: local("☺"), url("brandongrotesque_light/Brandon_light-webfont.woff") format("woff"), url("brandongrotesque_light/Brandon_light-webfont.ttf") format("truetype"), url("brandongrotesque_light/Brandon_light-webfont.svg#webfont") format("svg");
@ -201,7 +201,14 @@ ul.comment_set {
margin-top: -5px;
padding-bottom: 8px; }
#stream img.person_picture, #profile img.person_picture {
.profile_photo {
float: left;
margin-right: 10px; }
#profile ul {
list-style-type: none; }
#stream img.person_picture {
border-radius: 3px;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;

9
public/stylesheets/sass/application.sass
View file

@ -243,7 +243,14 @@ ul.comment_set
:padding
:bottom 8px
#stream, #profile
.profile_photo
:float left
:margin-right 10px
#profile
ul
:list-style-type none
#stream
img.person_picture
:border-radius 3px
:-webkit-border-radius 3px