Merge branch 'css-rtl' of https://github.com/everplays/diaspora into css-rtl

This commit is contained in:
MrZYX 2011-04-11 18:01:09 +02:00
commit 2413b3c4bd
5 changed files with 102 additions and 4 deletions

View file

@ -284,4 +284,8 @@ module ApplicationHelper
def direction_for(string)
return (string.cleaned_is_rtl?) ? 'rtl' : ''
end
def rtl?
@rtl ||= RTL_LANGUAGES.include? I18n.locale
end
end

View file

@ -45,6 +45,10 @@
-unless @landing_page
%ul#aspect_nav
- if rtl?
%li
= link_to '+', '#add_aspect_pane', :class => "add_aspect_button", :title => t('aspects.manage.add_a_new_aspect'), :rel => 'facebox'
%li{:class => ('selected' if @aspect == :all)}
= link_to t('all_aspects'), aspects_path, :class => 'home_selector'
@ -52,8 +56,9 @@
%li{:data=>{:guid=>aspect.id}, :class => ("selected" if @object_aspect_ids.include?(aspect.id))}
= link_for_aspect(aspect, :class => 'aspect_selector name', :title => t('contacts', :count => aspect.contacts.size))
%li
= link_to '+', '#add_aspect_pane', :class => "add_aspect_button", :title => t('aspects.manage.add_a_new_aspect'), :rel => 'facebox'
- unless rtl?
%li
= link_to '+', '#add_aspect_pane', :class => "add_aspect_button", :title => t('aspects.manage.add_a_new_aspect'), :rel => 'facebox'
.facebox_content
#add_aspect_pane

View file

@ -22,7 +22,7 @@
= stylesheet_link_tag "blueprint/screen", :media => 'screen'
= stylesheet_link_tag "blueprint/print", :media => 'print'
= include_stylesheets :default, :media => 'all'
- if RTL_LANGUAGES.include? I18n.locale
- if rtl?
= include_stylesheets :rtl, :media => 'all'
<!--[if IE]>

View file

@ -18,7 +18,7 @@
= stylesheet_link_tag 'vendor/jquery.mobile-1.0a4.min', 'mobile'
= csrf_meta_tag
- if RTL_LANGUAGES.include? I18n.locale
- if rtl?
= include_stylesheets :rtl, :media => 'all'
= yield(:head)

View file

@ -1,3 +1,92 @@
body
:direction rtl
:text-align right
#user_menu
:left 0
:right auto
.diaspora_header_logo
:float right
:margin-left 1em
:margin-right 0
#global_search
:float right
#notification_badge, #message_inbox_badge
:margin 0 10px 0 -5px
.append-2
:padding-left 80px
:padding-right 0px
:float right
footer ul#footer_nav
:float left
.right
:left 0
:right auto
.stream .avatar
:float right
.stream_element .content
:padding-right 60px
:padding-left 0
#publisher_textarea_wrapper textarea
:left auto
:right -9999px
#publisher #file-upload
:float left
#publisher .options_and_submit .public_toggle
:text-align left
#publisher #click_to_share img
:right 0
:left auto
#publisher #click_to_share span
:margin-right 12px
:margin-left 0
#publisher_textarea_wrapper #photodropzone
:right 5px
:left auto
#publisher_textarea_wrapper #photodropzone li .circle
:left -7px
:right auto
#publisher_textarea_wrapper #photodropzone li .x
:left -1px
:right auto
#webSocketContainer
:left auto !important
:right -100px
header ul#user_menu
:padding 5px 30px 5px 5px
:right auto
:margin -2px 0 0 -5px
header ul#user_menu .avatar
:left auto
:right 2px
header ul#user_menu a
:padding-left 15px
header ul#user_menu .right
:right auto
:left 5px
.stream_element .right
:left 12px
:right auto