more stream tweaks
This commit is contained in:
danielvincent
parent
b314ee22ec
commit
5b66a191cd
6 changed files with 91 additions and 200 deletions
|
|
@ -4,7 +4,8 @@
|
|||
|
||||
%li.comment{:id => post.id}
|
||||
= person_image_tag(post.person)
|
||||
%span.from
|
||||
.content
|
||||
.from
|
||||
= link_to post.person.real_name, post.person
|
||||
= post.text
|
||||
%div.time
|
||||
|
|
|
|||
|
|
@ -7,28 +7,27 @@
|
|||
= person_image_tag(post.person)
|
||||
|
||||
.content
|
||||
%span.from
|
||||
.from
|
||||
= link_to post.person.real_name, post.person
|
||||
%b
|
||||
.aspect
|
||||
→
|
||||
- if post.public?
|
||||
the world
|
||||
- else
|
||||
- for aspect in current_user.aspects_with_post( post.id )
|
||||
= aspect.name
|
||||
|
||||
=t('.posted_a_new_photo_to')
|
||||
= link_to post.album.name, object_path(post.album)
|
||||
|
||||
%br
|
||||
%br
|
||||
= render "albums/album", :post => post.album, :current_user => current_user
|
||||
= link_to (image_tag post.url(:thumb_medium)), object_path(post)
|
||||
|
||||
.info
|
||||
= link_to(how_long_ago(post), photo_path(post))
|
||||
\--
|
||||
%span.time= link_to(how_long_ago(post), photo_path(post))
|
||||
= link_to "#{t('.show_comments')} (#{post.comments.count})", '#', :class => "show_post_comments"
|
||||
|
||||
= render "comments/comments", :post => post
|
||||
|
||||
- if post.public?
|
||||
.public_aspect_tag
|
||||
public
|
||||
- else
|
||||
.aspect_tag
|
||||
%ul
|
||||
- for aspect in current_user.aspects_with_post( post.id )
|
||||
%li= aspect.name
|
||||
|
||||
|
|
|
|||
|
|
@ -3,34 +3,6 @@
|
|||
-# the COPYRIGHT file.
|
||||
|
||||
#friend_pictures
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
= owner_image_link
|
||||
- for friend in @friends
|
||||
= person_image_link(friend)
|
||||
|
|
|
|||
|
|
@ -11,13 +11,16 @@
|
|||
= link_to post.person.real_name, post.person
|
||||
.aspect
|
||||
→
|
||||
- if post.public?
|
||||
the world
|
||||
- else
|
||||
- for aspect in current_user.aspects_with_post( post.id )
|
||||
= aspect.name
|
||||
= link_to aspect.name, aspect
|
||||
|
||||
- if current_user.owns?(post)
|
||||
.destroy_link
|
||||
= link_to t('.delete'), status_message_path(post), :confirm => t('.are_you_sure'), :method => :delete, :remote => true, :class => "delete"
|
||||
= render "shared/reshare", :post => post, :current_user => current_user
|
||||
= link_to t('.delete'), status_message_path(post), :confirm => t('.are_you_sure'), :method => :delete, :remote => true, :class => "delete"
|
||||
|
||||
= post.message
|
||||
|
||||
|
|
@ -27,7 +30,3 @@
|
|||
|
||||
= render "comments/comments", :post => post
|
||||
|
||||
|
||||
- if post.public?
|
||||
.public_aspect_tag
|
||||
public
|
||||
|
|
|
|||
|
|
@ -155,6 +155,7 @@ li.message {
|
|||
li.message .delete:hover {
|
||||
background: #eeeeee; }
|
||||
li.message .content {
|
||||
max-width: 610px;
|
||||
margin-top: -4px;
|
||||
padding-left: 65px;
|
||||
color: #444444;
|
||||
|
|
@ -167,6 +168,11 @@ li.message {
|
|||
display: inline;
|
||||
color: #bbbbbb;
|
||||
font-size: 12px; }
|
||||
li.message .content .from .aspect a {
|
||||
font-weight: normal;
|
||||
color: #bbbbbb; }
|
||||
li.message .content .from .aspect a:hover {
|
||||
text-decoration: underline; }
|
||||
li.message .content .from a {
|
||||
font-weight: bold; }
|
||||
li.message .content div.info {
|
||||
|
|
@ -253,8 +259,8 @@ form {
|
|||
#stream div.comments {
|
||||
display: none; }
|
||||
#stream div.comments .avatar {
|
||||
width: 30px;
|
||||
height: 30px;
|
||||
width: 35px;
|
||||
height: 35px;
|
||||
margin-right: 10px; }
|
||||
|
||||
input.comment_submit {
|
||||
|
|
@ -266,21 +272,26 @@ ul.comment_set {
|
|||
margin-top: 1em;
|
||||
padding: 0;
|
||||
list-style: none;
|
||||
width: 610px; }
|
||||
max-width: 610px; }
|
||||
ul.comment_set textarea {
|
||||
width: 100%; }
|
||||
ul.comment_set li.comment {
|
||||
margin-bottom: 0.5em;
|
||||
background-color: rgba(10, 81, 109, 0.05);
|
||||
padding: 0.6em;
|
||||
border-bottom: 1px solid #dddddd;
|
||||
border-bottom: 1px solid #dddddd; }
|
||||
ul.comment_set li.comment .content {
|
||||
color: #777777;
|
||||
margin-top: -2px;
|
||||
padding-left: 45px;
|
||||
font-size: 12px;
|
||||
line-height: 17px; }
|
||||
ul.comment_set li.comment .from a {
|
||||
line-height: 18px; }
|
||||
ul.comment_set li.comment .content .from a {
|
||||
color: #444444; }
|
||||
ul.comment_set li.comment div.time {
|
||||
color: #666666;
|
||||
font-size: 10px; }
|
||||
ul.comment_set li.comment .content div.time {
|
||||
color: #bbbbbb;
|
||||
font-size: 11px;
|
||||
font-weight: bold; }
|
||||
ul.comment_set li.comment form {
|
||||
margin-top: -5px;
|
||||
margin-bottom: 0;
|
||||
|
|
@ -311,18 +322,17 @@ ul.comment_set {
|
|||
.pagination a {
|
||||
padding: 3px; }
|
||||
|
||||
.destroy_link, .request_button {
|
||||
li.message .from .destroy_link {
|
||||
display: none;
|
||||
position: absolute;
|
||||
right: 0; }
|
||||
.destroy_link a, .request_button a {
|
||||
right: 0;
|
||||
font-size: 12px; }
|
||||
li.message .from .destroy_link a {
|
||||
color: #999999;
|
||||
font-weight: normal; }
|
||||
.destroy_link a:hover, .request_button a:hover {
|
||||
li.message .from .destroy_link a:hover {
|
||||
text-decoration: underline; }
|
||||
|
||||
.destroy_link {
|
||||
display: none; }
|
||||
|
||||
.request_buttons {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
|
|
@ -697,49 +707,6 @@ ul#settings_nav {
|
|||
#fancybox-close:hover {
|
||||
background-color: transparent; }
|
||||
|
||||
.aspect_tag,
|
||||
.public_aspect_tag {
|
||||
position: absolute;
|
||||
top: 15px;
|
||||
right: 2em;
|
||||
border-radius: 5px;
|
||||
-webkit-border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
font-size: smaller;
|
||||
padding: 0 6px;
|
||||
color: #999999;
|
||||
text-shadow: 0 1px white;
|
||||
border-bottom: 1px solid #eeeeee;
|
||||
cursor: default; }
|
||||
|
||||
.public_aspect_tag {
|
||||
background: -moz-linear-gradient(19% 75% 90deg, #fffa75, #fff8ba);
|
||||
background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fff8ba), to(#fffa75));
|
||||
background-color: #fffc7f;
|
||||
border-top: 1px solid #ebe66c; }
|
||||
|
||||
.aspect_tag {
|
||||
background: -moz-linear-gradient(19% 75% 90deg, #e0e0e0, #f0f0f0);
|
||||
background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#f0f0f0), to(#e0e0e0));
|
||||
background-color: #eeeeee;
|
||||
color: #999999;
|
||||
text-shadow: 0 1px white;
|
||||
border-top: 1px solid #dddddd; }
|
||||
.aspect_tag ul {
|
||||
display: inline;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
list-style: none; }
|
||||
.aspect_tag ul li {
|
||||
display: inline-block;
|
||||
margin-right: 2px;
|
||||
padding-right: 4px;
|
||||
border-right: 1px solid #cccccc; }
|
||||
.aspect_tag ul li:last-child {
|
||||
margin-right: 0;
|
||||
padding-right: 0;
|
||||
border-right: none; }
|
||||
|
||||
#friend_pictures {
|
||||
line-height: 1em; }
|
||||
#friend_pictures img {
|
||||
|
|
|
|||
|
|
@ -199,6 +199,7 @@ li.message
|
|||
:background #eee
|
||||
|
||||
.content
|
||||
:max-width 610px
|
||||
:margin
|
||||
:top -4px
|
||||
:padding
|
||||
|
|
@ -215,6 +216,14 @@ li.message
|
|||
:color #bbb
|
||||
:font
|
||||
:size 12px
|
||||
a
|
||||
:font
|
||||
:weight normal
|
||||
:color #bbb
|
||||
|
||||
&:hover
|
||||
:text
|
||||
:decoration underline
|
||||
|
||||
a
|
||||
:font
|
||||
|
|
@ -345,8 +354,8 @@ form
|
|||
:display none
|
||||
|
||||
.avatar
|
||||
:width 30px
|
||||
:height 30px
|
||||
:width 35px
|
||||
:height 35px
|
||||
:margin
|
||||
:right 10px
|
||||
|
||||
|
|
@ -361,7 +370,7 @@ ul.comment_set
|
|||
:top 1em
|
||||
:padding 0
|
||||
:list-style none
|
||||
:width 610px
|
||||
:max-width 610px
|
||||
|
||||
textarea
|
||||
:width 100%
|
||||
|
|
@ -375,6 +384,12 @@ ul.comment_set
|
|||
:border
|
||||
:bottom 1px solid #ddd
|
||||
|
||||
.content
|
||||
:color #777
|
||||
:margin
|
||||
:top -2px
|
||||
:padding
|
||||
:left 45px
|
||||
.from
|
||||
a
|
||||
:color #444
|
||||
|
|
@ -382,11 +397,13 @@ ul.comment_set
|
|||
:size 12px
|
||||
|
||||
:line
|
||||
:height 17px
|
||||
:height 18px
|
||||
|
||||
div.time
|
||||
:color #666
|
||||
:font-size 10px
|
||||
:color #bbb
|
||||
:font
|
||||
:size 11px
|
||||
:weight bold
|
||||
|
||||
form
|
||||
:margin
|
||||
|
|
@ -428,9 +445,12 @@ ul.comment_set
|
|||
a
|
||||
:padding 3px
|
||||
|
||||
.destroy_link, .request_button
|
||||
li.message .from .destroy_link
|
||||
:display none
|
||||
:position absolute
|
||||
:right 0
|
||||
:font
|
||||
:size 12px
|
||||
a
|
||||
:color #999
|
||||
:font
|
||||
|
|
@ -439,9 +459,6 @@ ul.comment_set
|
|||
:text
|
||||
:decoration underline
|
||||
|
||||
.destroy_link
|
||||
:display none
|
||||
|
||||
.request_buttons
|
||||
:position absolute
|
||||
:right 0
|
||||
|
|
@ -901,70 +918,6 @@ ul#settings_nav
|
|||
:background
|
||||
:color transparent
|
||||
|
||||
.aspect_tag,
|
||||
.public_aspect_tag
|
||||
:position absolute
|
||||
:top 15px
|
||||
:right 2em
|
||||
|
||||
:border-radius 5px
|
||||
:-webkit-border-radius 5px
|
||||
:-moz-border-radius 5px
|
||||
|
||||
:font
|
||||
:size smaller
|
||||
:padding 0 6px
|
||||
|
||||
:color #999
|
||||
:text
|
||||
:shadow 0 1px #fff
|
||||
|
||||
:border
|
||||
:bottom 1px solid #eee
|
||||
|
||||
:cursor default
|
||||
|
||||
.public_aspect_tag
|
||||
:background -moz-linear-gradient(19% 75% 90deg,#FFFA75, #FFF8BA)
|
||||
:background -webkit-gradient(linear, 0% 0%, 0% 100%, from(#FFF8BA), to(#FFFA75))
|
||||
:color #FFFC7F
|
||||
:border
|
||||
:top 1px solid #EBE66C
|
||||
|
||||
.aspect_tag
|
||||
:background -moz-linear-gradient(19% 75% 90deg,#E0E0E0, #F0F0F0)
|
||||
:background -webkit-gradient(linear, 0% 0%, 0% 100%, from(#F0F0F0), to(#E0E0E0))
|
||||
:color #eee
|
||||
:color #999
|
||||
:text
|
||||
:shadow 0 1px #fff
|
||||
:border
|
||||
:top 1px solid #ddd
|
||||
|
||||
ul
|
||||
:display inline
|
||||
:margin 0
|
||||
:padding 0
|
||||
:list
|
||||
:style none
|
||||
|
||||
li
|
||||
:display inline-block
|
||||
:margin
|
||||
:right 2px
|
||||
:padding
|
||||
:right 4px
|
||||
:border
|
||||
:right 1px solid #ccc
|
||||
|
||||
&:last-child
|
||||
:margin
|
||||
:right 0
|
||||
:padding
|
||||
:right 0
|
||||
:border
|
||||
:right none
|
||||
|
||||
|
||||
#friend_pictures
|
||||
:line-height 1em
|
||||
|
|
|
|||
Loading…
Reference in a new issue