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

fixed stream elements

Browse source
This commit is contained in:
Daniel Vincent Grippi 2010-09-15 10:17:37 -07:00
parent 1d04c89b48
commit 73dab4b3ef
5 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/status_messages/_status_message.html.haml
View file

@ -30,8 +30,10 @@
= link_to(how_long_ago(post), object_path(post)) = link_to(how_long_ago(post), object_path(post))
\-- \--
= link_to "show comments (#{post.comments.count})", '#', :class => "show_post_comments" = link_to "show comments (#{post.comments.count})", '#', :class => "show_post_comments"
= render "comments/comments", :post => post = render "comments/comments", :post => post
- if current_user.owns?(post) - if current_user.owns?(post)
.destroy_link .destroy_link
= link_to 'Delete', status_message_path(post), :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "delete" = link_to 'Delete', status_message_path(post), :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "delete"

21
public/stylesheets/application.css
View file

@ -156,14 +156,15 @@ li.message {
margin-right: 15px; } margin-right: 15px; }
li.message .delete:hover { li.message .delete:hover {
background: #eeeeee; } background: #eeeeee; }
li.message .content span.from { li.message .content {
color: black; padding-left: 65px; }
font-weight: normal; li.message .content span.from {
margin-right: 0.2em; color: black;
font-size: 110%; } font-weight: normal;
li.message .content div.info { font-size: 110%; }
color: #bababa; li.message .content div.info {
font-size: 70%; } color: #bababa;
font-size: 70%; }
form { form {
position: relative; position: relative;
@ -205,10 +206,6 @@ form {
height: 30px; height: 30px;
margin-right: 10px; } margin-right: 10px; }
#stream ul.comment_set {
padding: 0;
padding-left: 65px; }
input.comment_submit { input.comment_submit {
display: none; display: none;
margin-right: -10px; } margin-right: -10px; }

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

@ -216,12 +216,13 @@ li.message
:background #eee :background #eee
.content .content
:padding
:left 65px
span.from span.from
:color #000 :color #000
:font :font
:weight normal :weight normal
:margin
:right 0.2em
:font :font
:size 110% :size 110%
@ -283,10 +284,6 @@ form
:margin :margin
:right 10px :right 10px
#stream ul.comment_set
:padding 0
:left 65px
input.comment_submit input.comment_submit
:display none :display none
:margin :margin

2
public/stylesheets/sass/sessions.sass
View file

@ -40,7 +40,7 @@ body
:background #fff :background #fff
:margin :margin
:left 2em :left 100px
/* via blueprint */ /* via blueprint */
input[type=text], input[type=text],

2
public/stylesheets/sessions.css
View file

@ -16,7 +16,7 @@ body {
font-family: "Helvetica Neue", Arial, Helvetica, sans-serif; font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
color: #222222; color: #222222;
background: white; background: white;
margin-left: 2em; } margin-left: 100px; }
/* via blueprint */ /* via blueprint */
input[type=text], input[type=text],