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

fixed #589, no CSS!

Browse source
This commit is contained in:
MrZYX 2011-02-20 14:37:33 +01:00
parent f3a62bf76b
commit e4db8c7a36
6 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/layouts/application.html.haml
View file

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

3
app/views/layouts/application.mobile.haml
View file

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

2
config/assets.yml
View file

@ -77,4 +77,6 @@ stylesheets:
- public/stylesheets/vendor/fileuploader.css - public/stylesheets/vendor/fileuploader.css
- public/stylesheets/vendor/tipsy.css - public/stylesheets/vendor/tipsy.css
- public/stylesheets/vendor/autoSuggest.css - public/stylesheets/vendor/autoSuggest.css
rtl:
- public/stylesheets/rtl.css

2
config/environment.rb
View file

@ -13,11 +13,13 @@ if File.exists?(File.expand_path("./config/locale_settings.yml"))
DEFAULT_LANGUAGE = (AVAILABLE_LANGUAGES.include?(locale_settings['default'])) ? locale_settings['default'] : AVAILABLE_LANGUAGES.keys[0].to_s DEFAULT_LANGUAGE = (AVAILABLE_LANGUAGES.include?(locale_settings['default'])) ? locale_settings['default'] : AVAILABLE_LANGUAGES.keys[0].to_s
AVAILABLE_LANGUAGE_CODES = locale_settings['available'].keys.map { |v| v.to_s } AVAILABLE_LANGUAGE_CODES = locale_settings['available'].keys.map { |v| v.to_s }
LANGUAGE_CODES_MAP = locale_settings['fallbacks'] LANGUAGE_CODES_MAP = locale_settings['fallbacks']
RTL_LANGUAGES = locale_settings['rtl']
else else
AVAILABLE_LANGUAGES = { :en => 'English' } AVAILABLE_LANGUAGES = { :en => 'English' }
DEFAULT_LANGUAGE = 'en' DEFAULT_LANGUAGE = 'en'
AVAILABLE_LANGUAGE_CODES = ['en'] AVAILABLE_LANGUAGE_CODES = ['en']
LANGUAGE_CODES_MAP = {} LANGUAGE_CODES_MAP = {}
RTL_LANGUAGES = []
end end
# Initialize the rails application # Initialize the rails application

3
config/locale_settings.yml
View file

@ -56,3 +56,6 @@ fallbacks:
zh: zh:
- :zh-CN - :zh-CN
- :zh-TW - :zh-TW
rtl:
- :ar
- :he

3
public/stylesheets/sass/rtl.sass Normal file
View file

@ -0,0 +1,3 @@
body
:direction rtl
:text-align right