Commit 2fd0c50580fe63a44aea903992f596f047ebf7af
1 parent
54942352
Exists in
master
and in
28 other branches
Readded balloon on articles comments
(ActionItem1826)
Showing
3 changed files
with
18 additions
and
18 deletions
Show diff stats
app/views/profile/_profile_network_activities.rhtml
| @@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
| 6 | <%= render :partial => 'comment', :collection => activity.comments %> | 6 | <%= render :partial => 'comment', :collection => activity.comments %> |
| 7 | </ul> | 7 | </ul> |
| 8 | 8 | ||
| 9 | - <%#= render :partial => 'profile_comment_form', :locals => { :activity => activity } %> | 9 | + <%= render :partial => 'profile_comment_form', :locals => { :activity => activity } %> |
| 10 | <hr /> | 10 | <hr /> |
| 11 | </li> | 11 | </li> |
| 12 | <% end %> | 12 | <% end %> |
public/designs/themes/base/style.css
| @@ -1053,53 +1053,53 @@ hr.pre-posts, hr.sep-posts { | @@ -1053,53 +1053,53 @@ hr.pre-posts, hr.sep-posts { | ||
| 1053 | 1053 | ||
| 1054 | .comment-wrapper-1 { | 1054 | .comment-wrapper-1 { |
| 1055 | margin-left: 60px; | 1055 | margin-left: 60px; |
| 1056 | - Xbackground: url(imgs/comment-bg-N.png) 0% 0% repeat-x; | 1056 | + background: url(imgs/comment-bg-N.png) 0% 0% repeat-x; |
| 1057 | } | 1057 | } |
| 1058 | .comment-wrapper-2 { | 1058 | .comment-wrapper-2 { |
| 1059 | - Xbackground: url(imgs/comment-bg-S.png) 0% 100% repeat-x; | 1059 | + background: url(imgs/comment-bg-S.png) 0% 100% repeat-x; |
| 1060 | } | 1060 | } |
| 1061 | .comment-wrapper-3 { | 1061 | .comment-wrapper-3 { |
| 1062 | - Xbackground: url(imgs/comment-bg-L.png) 100% 0% repeat-y; | 1062 | + background: url(imgs/comment-bg-L.png) 100% 0% repeat-y; |
| 1063 | } | 1063 | } |
| 1064 | .comment-wrapper-4 { | 1064 | .comment-wrapper-4 { |
| 1065 | - Xbackground: url(imgs/comment-bg-O.png) 0% 0% repeat-y; | 1065 | + background: url(imgs/comment-bg-O.png) 0% 0% repeat-y; |
| 1066 | } | 1066 | } |
| 1067 | .comment-wrapper-5 { | 1067 | .comment-wrapper-5 { |
| 1068 | - Xbackground: url(imgs/comment-bg-SL.png) 100% 100% no-repeat; | 1068 | + background: url(imgs/comment-bg-SL.png) 100% 100% no-repeat; |
| 1069 | } | 1069 | } |
| 1070 | .comment-wrapper-6 { | 1070 | .comment-wrapper-6 { |
| 1071 | - Xbackground: url(imgs/comment-bg-SO.png) 0% 100% no-repeat; | 1071 | + background: url(imgs/comment-bg-SO.png) 0% 100% no-repeat; |
| 1072 | } | 1072 | } |
| 1073 | .comment-wrapper-7 { | 1073 | .comment-wrapper-7 { |
| 1074 | - Xbackground: url(imgs/comment-bg-NL.png) 100% 0% no-repeat; | 1074 | + background: url(imgs/comment-bg-NL.png) 100% 0% no-repeat; |
| 1075 | } | 1075 | } |
| 1076 | .comment-wrapper-8 { | 1076 | .comment-wrapper-8 { |
| 1077 | - Xbackground: url(imgs/comment-bg-NO.png) 0% 0% no-repeat; | 1077 | + background: url(imgs/comment-bg-NO.png) 0% 0% no-repeat; |
| 1078 | } | 1078 | } |
| 1079 | 1079 | ||
| 1080 | .comment-from-owner .comment-wrapper-1 { | 1080 | .comment-from-owner .comment-wrapper-1 { |
| 1081 | - Xbackground: #fbf7b5 url(/images/comment-owner-bg-N.png) repeat-x; | 1081 | + background: #fbf7b5 url(/images/comment-owner-bg-N.png) repeat-x; |
| 1082 | } | 1082 | } |
| 1083 | .comment-from-owner .comment-wrapper-2 { | 1083 | .comment-from-owner .comment-wrapper-2 { |
| 1084 | - Xbackground: url(/images/comment-owner-bg-S.png) 0% 100% repeat-x; | 1084 | + background: url(/images/comment-owner-bg-S.png) 0% 100% repeat-x; |
| 1085 | } | 1085 | } |
| 1086 | .comment-from-owner .comment-wrapper-3 { | 1086 | .comment-from-owner .comment-wrapper-3 { |
| 1087 | - Xbackground: url(/images/comment-owner-bg-L.png) 100% 0% repeat-y; | 1087 | + background: url(/images/comment-owner-bg-L.png) 100% 0% repeat-y; |
| 1088 | } | 1088 | } |
| 1089 | .comment-from-owner .comment-wrapper-4 { | 1089 | .comment-from-owner .comment-wrapper-4 { |
| 1090 | - Xbackground: url(/images/comment-owner-bg-O.png) 0% 0% repeat-y; | 1090 | + background: url(/images/comment-owner-bg-O.png) 0% 0% repeat-y; |
| 1091 | } | 1091 | } |
| 1092 | .comment-from-owner .comment-wrapper-5 { | 1092 | .comment-from-owner .comment-wrapper-5 { |
| 1093 | - Xbackground: url(/images/comment-owner-bg-SL.png) 100% 100% no-repeat; | 1093 | + background: url(/images/comment-owner-bg-SL.png) 100% 100% no-repeat; |
| 1094 | } | 1094 | } |
| 1095 | .comment-from-owner .comment-wrapper-6 { | 1095 | .comment-from-owner .comment-wrapper-6 { |
| 1096 | - Xbackground: url(/images/comment-owner-bg-SO.png) 0% 100% no-repeat; | 1096 | + background: url(/images/comment-owner-bg-SO.png) 0% 100% no-repeat; |
| 1097 | } | 1097 | } |
| 1098 | .comment-from-owner .comment-wrapper-7 { | 1098 | .comment-from-owner .comment-wrapper-7 { |
| 1099 | - Xbackground: url(/images/comment-owner-bg-NL.png) 100% 0% no-repeat; | 1099 | + background: url(/images/comment-owner-bg-NL.png) 100% 0% no-repeat; |
| 1100 | } | 1100 | } |
| 1101 | .comment-from-owner .comment-wrapper-8 { | 1101 | .comment-from-owner .comment-wrapper-8 { |
| 1102 | - Xbackground: url(/images/comment-owner-bg-NO.png) 0% 0% no-repeat; | 1102 | + background: url(/images/comment-owner-bg-NO.png) 0% 0% no-repeat; |
| 1103 | } | 1103 | } |
| 1104 | 1104 | ||
| 1105 | .comment-created-at { | 1105 | .comment-created-at { |
public/stylesheets/application.css
| @@ -1320,7 +1320,7 @@ a.comment-picture { | @@ -1320,7 +1320,7 @@ a.comment-picture { | ||
| 1320 | } | 1320 | } |
| 1321 | 1321 | ||
| 1322 | .comment-balloon-content { | 1322 | .comment-balloon-content { |
| 1323 | - Xmargin-left: 15px; | 1323 | + margin-left: 15px; |
| 1324 | } | 1324 | } |
| 1325 | 1325 | ||
| 1326 | /* * * Comment Replies * * */ | 1326 | /* * * Comment Replies * * */ |