minor visual changes, more or less. facebox headers are now white.
This commit is contained in:
danielgrippi
parent
238e859dbe
commit
60077bd70a
18 changed files with 80 additions and 105 deletions
|
|
@ -8,9 +8,8 @@ module CommentsHelper
|
|||
if count <= 3
|
||||
str = link_to "#{t('stream_helper.hide_comments')}", '#', :class => "show_post_comments"
|
||||
else
|
||||
str = link_to "#{t('stream_helper.show_comments')}", '#', :class => "show_post_comments"
|
||||
str = link_to "#{t('stream_helper.show_more_comments', :number => count-3)}", '#', :class => "show_post_comments"
|
||||
end
|
||||
str << " (#{count})"
|
||||
str
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
= t('.recently')
|
||||
%span.controls
|
||||
= link_to_if(session[:sort_order] == 'created_at', t('.commented_on'), aspects_path(:a_ids => params[:a_ids], :sort_order => 'updated_at'))
|
||||
\·
|
||||
·
|
||||
= link_to_if(session[:sort_order] == 'updated_at', t('.posted'), aspects_path(:a_ids => params[:a_ids], :sort_order => 'created_at' ))
|
||||
|
||||
%h3
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
.span-12.last
|
||||
#facebox_header
|
||||
%h4
|
||||
%h3
|
||||
= t('contacts.index.add_a_new_aspect')
|
||||
|
||||
= form_for(Aspect.new, :remote => (defined?(remote) && remote) ) do |aspect|
|
||||
|
|
@ -21,5 +21,7 @@
|
|||
|
||||
%br
|
||||
|
||||
= aspect.submit t('.create'), :class => 'button'
|
||||
.bottom_submit_section
|
||||
= submit_tag t('cancel'), :class => 'button', :type => :reset, :rel => "close"
|
||||
= aspect.submit t('.create'), :class => 'button take_action'
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
-# licensed under the Affero General Public License version 3 or later. See
|
||||
-# the COPYRIGHT file.
|
||||
|
||||
#no_posts.floating.empty_message{:class => ("hidden" unless post_count == 0)}
|
||||
.null_arrow ⇧
|
||||
%h3=t('.start_talking')
|
||||
#no_posts.empty_message{:class => ("hidden" unless post_count == 0)}
|
||||
%h4
|
||||
=t('.start_talking')
|
||||
|
||||
|
|
|
|||
|
|
@ -31,17 +31,6 @@
|
|||
.content
|
||||
- for contact in @selected_contacts
|
||||
= person_image_link contact.person
|
||||
= person_image_link contact.person
|
||||
= person_image_link contact.person
|
||||
= person_image_link current_user.person
|
||||
= person_image_link current_user.person
|
||||
= person_image_link contact.person
|
||||
= person_image_link contact.person
|
||||
= person_image_link current_user.person
|
||||
= person_image_link contact.person
|
||||
= person_image_link contact.person
|
||||
= person_image_link current_user.person
|
||||
= person_image_link contact.person
|
||||
|
||||
#edit_this_aspect
|
||||
= link_to "View all contacts", "#"
|
||||
|
|
|
|||
|
|
@ -8,10 +8,13 @@
|
|||
= link_to image_tag('deletelabel.png'), comment_path(comment), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete comment_delete", :title => t('delete')
|
||||
= person_image_link(comment.author)
|
||||
.content
|
||||
.from
|
||||
%span.from
|
||||
= person_link(comment.author)
|
||||
|
||||
%span{:class => direction_for(comment.text)}
|
||||
= markdownify(comment.text, :youtube_maps => comment.youtube_titles)
|
||||
|
||||
%br
|
||||
%time.timeago{:datetime => comment.created_at}
|
||||
= comment.created_at ? timeago(comment.created_at) : timeago(Time.now)
|
||||
|
||||
%p{ :class => direction_for(comment.text) }
|
||||
= markdownify(comment.text, :youtube_maps => comment.youtube_titles)
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@
|
|||
- unless is_expanded
|
||||
%ul.show_comments{:class => ("hidden" unless comments.size > 3)}
|
||||
%li
|
||||
= image_tag 'icons/spechbubble_2.png', :class => 'more_comments_icon'
|
||||
%b= comment_toggle(comments.size)
|
||||
|
||||
%ul.comments{:id => post.id, :class => ("hidden" if comments.size == 0 && !defined?(force_open) && !is_expanded)}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
#new_message_pane
|
||||
.span-12.last
|
||||
#facebox_header
|
||||
%h4
|
||||
%h3
|
||||
= t('conversations.index.new_message')
|
||||
|
||||
= form_for Conversation.new do |conversation|
|
||||
|
|
@ -47,6 +47,6 @@
|
|||
.span-10.prepend-2.last
|
||||
= text_area_tag "conversation[text]", '', :rows => 5
|
||||
|
||||
.text-right
|
||||
.bottom_submit_section
|
||||
= submit_tag t('cancel'), :class => 'button', :type => :reset, :rel => "close"
|
||||
= conversation.submit t('.send'), :disable_with => t('shared.publisher.posting'), :class => 'button'
|
||||
= link_to t('cancel'), :back
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
- elsif (current_user || !@landing_page)
|
||||
#global_search
|
||||
= form_tag(people_path, :method => 'get', :id => "global_search_form") do
|
||||
= text_field_tag 'q', nil, :placeholder => t('search'), :type => 'search', :results => 5
|
||||
= text_field_tag 'q', nil, :placeholder => t('find_people'), :type => 'search', :results => 5
|
||||
|
||||
- if @notification_count
|
||||
#notification_badge
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
%br
|
||||
%br
|
||||
-if contact.sharing? || person == current_user.person
|
||||
%hr
|
||||
%ul#profile_information
|
||||
- unless person.profile.bio.blank?
|
||||
%li
|
||||
|
|
@ -36,16 +35,16 @@
|
|||
= markdownify(person.profile.location, :newlines => true)
|
||||
|
||||
%li
|
||||
.span-4
|
||||
- unless person.profile.gender.blank?
|
||||
%h4
|
||||
=t('.gender')
|
||||
= person.profile.gender
|
||||
|
||||
.span-4.last
|
||||
%li
|
||||
- unless person.profile.birthday.blank?
|
||||
%h4
|
||||
=t('.born')
|
||||
= birthday_format(person.profile.birthday)
|
||||
|
||||
%br
|
||||
%br
|
||||
|
|
|
|||
|
|
@ -9,12 +9,11 @@
|
|||
- content_for :page_title do
|
||||
= @person.name
|
||||
|
||||
.span-8
|
||||
.span-6
|
||||
= render :partial => 'people/profile_sidebar', :locals => {:person => @person, :contact => @contact }
|
||||
|
||||
- if user_signed_in? && @contact.persisted? && @contacts_of_contact.count > 0
|
||||
.span-8.last#contacts_of_contact
|
||||
%hr
|
||||
.section.contact_pictures
|
||||
%h4
|
||||
= t('contacts', :count => @contacts_of_contact_count)
|
||||
|
|
|
|||
|
|
@ -19,9 +19,13 @@
|
|||
= person_image_link(post.author, :size => :thumb_small)
|
||||
|
||||
.content
|
||||
.from
|
||||
%span.from
|
||||
= person_link(post.author, :class => 'author')
|
||||
%time.time.timeago{:datetime => post.created_at, :integer => time_for_sort(post).to_i}
|
||||
%span.details
|
||||
\-
|
||||
%span.timeago
|
||||
= link_to(how_long_ago(post), object_path(post))
|
||||
|
||||
- if post.activity_streams?
|
||||
= link_to image_tag(post.image_url), post.object_url
|
||||
|
|
@ -37,18 +41,15 @@
|
|||
%span.aspect_badges
|
||||
= aspect_badges(aspects_with_post(all_aspects, post), :link => true)
|
||||
|
||||
%span.timeago
|
||||
= link_to(how_long_ago(post), object_path(post))
|
||||
|
||||
%span.via
|
||||
- if post.activity_streams?
|
||||
= t('.via', :link => link_to("#{post.provider_display_name}", post.actor_url)).html_safe
|
||||
|
||||
- unless (defined?(@commenting_disabled) && @commenting_disabled)
|
||||
|
|
||||
·
|
||||
%span.like_action
|
||||
= like_action(post, current_user)
|
||||
|
|
||||
·
|
||||
= link_to t('comments.new_comment.comment'), '#', :class => 'focus_comment_textarea'
|
||||
|
||||
.likes
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#new_status_message_pane
|
||||
.span-15.last
|
||||
#facebox_header
|
||||
%h4
|
||||
%h3
|
||||
= t('.mentioning', :person => @person.name)
|
||||
|
||||
= render :partial => 'shared/publisher', :locals => { :aspect => @aspect, :aspect_ids => @aspect_ids, :aspects_with_person => @aspects_with_person, :person => @person}
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ en:
|
|||
back: "Back"
|
||||
the_world: "the world"
|
||||
search: "Search"
|
||||
find_people: "Find people"
|
||||
_home: "Home"
|
||||
more: "More"
|
||||
next: "next"
|
||||
|
|
@ -104,7 +105,7 @@ en:
|
|||
show:
|
||||
edit_aspect: "edit aspect"
|
||||
no_posts_message:
|
||||
start_talking: "Nobody has said anything yet. Get the conversation started!"
|
||||
start_talking: "Nobody has said anything yet!"
|
||||
|
||||
new:
|
||||
name: "Name"
|
||||
|
|
@ -602,7 +603,7 @@ en:
|
|||
add_photos: "add photos"
|
||||
all_contacts: "all contacts"
|
||||
share_with: "share with"
|
||||
whats_on_your_mind: "what's on your mind?"
|
||||
whats_on_your_mind: "What's on your mind?"
|
||||
publishing_to: "publishing to: "
|
||||
public: "Public"
|
||||
click_to_share_with: "Click to share with: "
|
||||
|
|
@ -662,8 +663,8 @@ en:
|
|||
other: "please make your status messages less than %{count} characters"
|
||||
|
||||
stream_helper:
|
||||
show_comments: "show all comments"
|
||||
hide_comments: "hide comments"
|
||||
show_more_comments: "Show %{number} more comments"
|
||||
hide_comments: "Hide all comments"
|
||||
|
||||
tags:
|
||||
show:
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 140 B After Width: | Height: | Size: 168 B |
|
|
@ -75,7 +75,7 @@ var View = {
|
|||
});
|
||||
|
||||
/* facebox 'done' buttons */
|
||||
$("a[rel*=close]").live('click', function(){ $.facebox.close(); });
|
||||
$("*[rel*=close]").live('click', function(){ $.facebox.close(); });
|
||||
|
||||
/* notification routing */
|
||||
$("#notification").delegate('.hard_object_link', 'click', function(evt){
|
||||
|
|
|
|||
|
|
@ -278,7 +278,6 @@ ul.dropdown
|
|||
:min-height 50px
|
||||
:border
|
||||
:bottom 1px solid #ddd
|
||||
:top 1px solid #fff
|
||||
|
||||
&:first-child
|
||||
:border
|
||||
|
|
@ -368,7 +367,7 @@ ul.dropdown
|
|||
.stream_element
|
||||
:position relative
|
||||
:word-wrap break-word
|
||||
:color #888
|
||||
:color #555
|
||||
|
||||
:font
|
||||
:size 13px
|
||||
|
|
@ -384,13 +383,12 @@ ul.dropdown
|
|||
:padding
|
||||
:left 60px
|
||||
|
||||
:color #666
|
||||
:font
|
||||
:weight normal
|
||||
|
||||
p
|
||||
:margin
|
||||
:top 2px
|
||||
:top 4px
|
||||
:bottom 10px
|
||||
:font
|
||||
:size 12px
|
||||
|
|
@ -481,10 +479,13 @@ ul.dropdown
|
|||
:bottom 5px
|
||||
|
||||
|
||||
.details
|
||||
:color #aaa
|
||||
|
||||
.time,
|
||||
.timeago,
|
||||
.via
|
||||
:color #999
|
||||
:color #aaa
|
||||
a
|
||||
:color #999
|
||||
:text
|
||||
|
|
@ -657,6 +658,9 @@ ul.show_comments,
|
|||
|
||||
.new_comment
|
||||
:min-height 35px
|
||||
p
|
||||
:margin
|
||||
:bottom 0
|
||||
|
||||
.from
|
||||
:font
|
||||
|
|
@ -2221,6 +2225,8 @@ h3,h4
|
|||
ul.show_comments
|
||||
:margin
|
||||
:bottom -0.5em
|
||||
:border
|
||||
:top 1px dotted #aaa
|
||||
|
||||
.likes_container
|
||||
:margin
|
||||
|
|
@ -2230,10 +2236,10 @@ ul.show_comments
|
|||
|
||||
ul.show_comments,
|
||||
.likes_container
|
||||
> *
|
||||
*
|
||||
:font
|
||||
:size 10px
|
||||
:weight bold
|
||||
:color #999
|
||||
|
||||
img
|
||||
:position relative
|
||||
|
|
@ -2272,28 +2278,10 @@ ul.show_comments,
|
|||
&.larger
|
||||
:width 600px
|
||||
|
||||
#new_message_pane
|
||||
input:not([type='submit']),
|
||||
textarea
|
||||
:width 378px
|
||||
:margin
|
||||
:right 0
|
||||
|
||||
.as-selections
|
||||
input
|
||||
:width 200px
|
||||
|
||||
#facebox_header
|
||||
:position relative
|
||||
:padding 1em
|
||||
:background
|
||||
:color #222
|
||||
:border
|
||||
:bottom 1px solid #777
|
||||
|
||||
:-webkit-border-radius 5px 5px 0 0
|
||||
:-moz-border-radius 5px 5px 0 0
|
||||
:border-radius 5px 5px 0 0
|
||||
:padding
|
||||
:bottom 10px
|
||||
|
||||
.right
|
||||
:z-index 3
|
||||
|
|
@ -2309,10 +2297,6 @@ ul.show_comments,
|
|||
|
||||
h3,
|
||||
h4
|
||||
:color #eee
|
||||
:margin
|
||||
:bottom 0
|
||||
|
||||
.description
|
||||
:margin
|
||||
:top 0px
|
||||
|
|
@ -2619,12 +2603,6 @@ ul.show_comments,
|
|||
:font
|
||||
:size 12px
|
||||
|
||||
.text-right
|
||||
:text
|
||||
:align right
|
||||
:margin
|
||||
:right 5px
|
||||
|
||||
#contact_visibility_padlock:hover
|
||||
@include opacity(0.7)
|
||||
|
||||
|
|
@ -2748,6 +2726,7 @@ h1.tag
|
|||
:border
|
||||
:bottom 1px solid #888
|
||||
:padding 2px 0
|
||||
:top 0
|
||||
:left 24px
|
||||
|
||||
&.no_icon
|
||||
|
|
@ -2769,7 +2748,7 @@ h1.tag
|
|||
img
|
||||
:position absolute
|
||||
:left 3px
|
||||
:top 3px
|
||||
:top 0px
|
||||
|
||||
.section
|
||||
.content
|
||||
|
|
@ -2938,11 +2917,13 @@ ul.left_nav
|
|||
:margin
|
||||
:bottom 0
|
||||
:border
|
||||
:left 1px solid #eee
|
||||
:left 1px solid #ddd
|
||||
:padding
|
||||
:left 10px
|
||||
:top 20px
|
||||
:margin
|
||||
:left -10px
|
||||
:top -20px
|
||||
|
||||
#aspect_stream_header
|
||||
:padding 0 12px
|
||||
|
|
@ -3014,9 +2995,6 @@ ul.left_nav
|
|||
:float right
|
||||
|
||||
#selected_aspect_contacts
|
||||
:margin
|
||||
:top 30px
|
||||
|
||||
.avatar
|
||||
:height 26px
|
||||
:width 26px
|
||||
|
|
@ -3029,3 +3007,9 @@ ul.left_nav
|
|||
:top 5px
|
||||
:padding 3px
|
||||
:border 1px dotted #ccc
|
||||
|
||||
.bottom_submit_section
|
||||
:text-align right
|
||||
|
||||
#no_posts
|
||||
:padding 20px
|
||||
|
|
|
|||
21
public/stylesheets/vendor/facebox.css
vendored
21
public/stylesheets/vendor/facebox.css
vendored
|
|
@ -6,26 +6,25 @@
|
|||
text-align: left;
|
||||
}
|
||||
|
||||
|
||||
#facebox .popup{
|
||||
position:relative;
|
||||
border:3px solid rgba(0,0,0,0);
|
||||
-webkit-border-radius:5px;
|
||||
-moz-border-radius:5px;
|
||||
border-radius:5px;
|
||||
-webkit-box-shadow:0 0 18px rgba(0,0,0,0.4);
|
||||
-moz-box-shadow:0 0 18px rgba(0,0,0,0.4);
|
||||
box-shadow:0 0 18px rgba(0,0,0,0.4);
|
||||
-webkit-border-radius:2px;
|
||||
-moz-border-radius:2px;
|
||||
border-radius:2px;
|
||||
-webkit-box-shadow:0 0 12px rgba(0,0,0,0.8);
|
||||
-moz-box-shadow:0 0 12px rgba(0,0,0,0.8);
|
||||
box-shadow:0 0 12px rgba(0,0,0,0.8);
|
||||
}
|
||||
|
||||
#facebox .content {
|
||||
display:table;
|
||||
width: 370px;
|
||||
padding: 10px;
|
||||
padding: 20px;
|
||||
background: #fff;
|
||||
-webkit-border-radius:4px;
|
||||
-moz-border-radius:4px;
|
||||
border-radius:4px;
|
||||
-webkit-border-radius:2px;
|
||||
-moz-border-radius:2px;
|
||||
border-radius:2px;
|
||||
}
|
||||
|
||||
#facebox .content > p:first-child{
|
||||
|
|
|
|||
Loading…
Reference in a new issue