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

fixed comments from not showing. also, touched them up a bit.

Browse source
This commit is contained in:
danielvincent 2010-08-24 20:13:37 -07:00
parent d87f330369
commit 501f98b9e1
3 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
public/javascripts/view.js
View file

@ -30,10 +30,10 @@ $(document).ready(function(){
event.preventDefault(); event.preventDefault();
if( $(this).hasClass( "visible")) { if( $(this).hasClass( "visible")) {
$(this).html($(this).html().replace("hide", "show")); $(this).html($(this).html().replace("hide", "show"));
$(this).parents("li").children(".comments").fadeOut(100); $(this).closest("li").children(".content").children(".comments").fadeOut(100);
} else { } else {
$(this).html($(this).html().replace("show", "hide")); $(this).html($(this).html().replace("show", "hide"));
$(this).parents("li").children(".comments").fadeIn(100); $(this).closest("li").children(".content").children(".comments").fadeIn(100);
} }
$(this).toggleClass( "visible" ); $(this).toggleClass( "visible" );
}); });

13
public/stylesheets/application.css
View file

@ -192,17 +192,23 @@ form {
#stream div.comments { #stream div.comments {
display: none; } display: none; }
#stream div.comments .avatar {
width: 30px;
height: 30px;
margin-right: 10px; }
#stream ul.comment_set { #stream ul.comment_set {
padding: 0; padding: 0;
padding-left: 1em; } padding-left: 65px; }
ul.comment_set { ul.comment_set {
margin: 0; margin: 0;
margin-top: 1em; margin-top: 1em;
padding: 0; padding: 0;
list-style: none; list-style: none;
width: 90%; } width: 495px; }
ul.comment_set textarea {
width: 100%; }
ul.comment_set li.comment { ul.comment_set li.comment {
margin-bottom: 0.5em; margin-bottom: 0.5em;
background-color: rgba(10, 81, 109, 0.05); background-color: rgba(10, 81, 109, 0.05);
@ -216,7 +222,8 @@ ul.comment_set {
color: #666666; color: #666666;
font-size: 70%; } font-size: 70%; }
ul.comment_set li.comment form { ul.comment_set li.comment form {
margin-top: -5px; } margin-top: -5px;
margin-bottom: 0; }
.profile_photo { .profile_photo {
float: left; float: left;

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

@ -238,16 +238,25 @@ form
#stream div.comments #stream div.comments
:display none :display none
.avatar
:width 30px
:height 30px
:margin
:right 10px
#stream ul.comment_set #stream ul.comment_set
:padding 0 :padding 0
:left 1em :left 65px
ul.comment_set ul.comment_set
:margin 0 :margin 0
:top 1em :top 1em
:padding 0 :padding 0
:list-style none :list-style none
:width 90% :width 495px
textarea
:width 100%
li.comment li.comment
:margin :margin
@ -272,6 +281,7 @@ ul.comment_set
form form
:margin :margin
:top -5px :top -5px
:bottom 0
.profile_photo .profile_photo
:float left :float left
@ -495,7 +505,6 @@ h1.big_text
:line-height auto :line-height auto
:border :border
:bottom 1px solid #666 :bottom 1px solid #666
.right .right
:top -6px :top -6px