diff --git a/public/images/404.png b/app/assets/images/404.png similarity index 100% rename from public/images/404.png rename to app/assets/images/404.png diff --git a/public/images/add_contact_button.png b/app/assets/images/add_contact_button.png similarity index 100% rename from public/images/add_contact_button.png rename to app/assets/images/add_contact_button.png diff --git a/public/images/ajax-loader.gif b/app/assets/images/ajax-loader.gif similarity index 100% rename from public/images/ajax-loader.gif rename to app/assets/images/ajax-loader.gif diff --git a/public/images/ajax-loader2.gif b/app/assets/images/ajax-loader2.gif similarity index 100% rename from public/images/ajax-loader2.gif rename to app/assets/images/ajax-loader2.gif diff --git a/public/images/ajax-loader_inverted.gif b/app/assets/images/ajax-loader_inverted.gif similarity index 100% rename from public/images/ajax-loader_inverted.gif rename to app/assets/images/ajax-loader_inverted.gif diff --git a/public/images/apple-splash.png b/app/assets/images/apple-splash.png similarity index 100% rename from public/images/apple-splash.png rename to app/assets/images/apple-splash.png diff --git a/public/images/arrow-left.png b/app/assets/images/arrow-left.png similarity index 100% rename from public/images/arrow-left.png rename to app/assets/images/arrow-left.png diff --git a/public/images/arrow-right.png b/app/assets/images/arrow-right.png similarity index 100% rename from public/images/arrow-right.png rename to app/assets/images/arrow-right.png diff --git a/public/images/arrow.psd b/app/assets/images/arrow.psd similarity index 100% rename from public/images/arrow.psd rename to app/assets/images/arrow.psd diff --git a/public/images/asterisk.png b/app/assets/images/asterisk.png similarity index 100% rename from public/images/asterisk.png rename to app/assets/images/asterisk.png diff --git a/public/images/asterisk_white.png b/app/assets/images/asterisk_white.png similarity index 100% rename from public/images/asterisk_white.png rename to app/assets/images/asterisk_white.png diff --git a/public/images/ball.png b/app/assets/images/ball.png similarity index 100% rename from public/images/ball.png rename to app/assets/images/ball.png diff --git a/public/images/ball_small.png b/app/assets/images/ball_small.png similarity index 100% rename from public/images/ball_small.png rename to app/assets/images/ball_small.png diff --git a/public/images/close_label.png b/app/assets/images/close_label.png similarity index 100% rename from public/images/close_label.png rename to app/assets/images/close_label.png diff --git a/public/images/connect_services.png b/app/assets/images/connect_services.png similarity index 100% rename from public/images/connect_services.png rename to app/assets/images/connect_services.png diff --git a/public/images/cubbies_collage.png b/app/assets/images/cubbies_collage.png similarity index 100% rename from public/images/cubbies_collage.png rename to app/assets/images/cubbies_collage.png diff --git a/public/images/cubbies_screenshot2.png b/app/assets/images/cubbies_screenshot2.png similarity index 100% rename from public/images/cubbies_screenshot2.png rename to app/assets/images/cubbies_screenshot2.png diff --git a/public/images/deletelabel.png b/app/assets/images/deletelabel.png similarity index 100% rename from public/images/deletelabel.png rename to app/assets/images/deletelabel.png diff --git a/public/images/diaspora_collage.png b/app/assets/images/diaspora_collage.png similarity index 100% rename from public/images/diaspora_collage.png rename to app/assets/images/diaspora_collage.png diff --git a/public/images/diaspora_mobile_screens.png b/app/assets/images/diaspora_mobile_screens.png similarity index 100% rename from public/images/diaspora_mobile_screens.png rename to app/assets/images/diaspora_mobile_screens.png diff --git a/public/images/down-tick-inset.png b/app/assets/images/down-tick-inset.png similarity index 100% rename from public/images/down-tick-inset.png rename to app/assets/images/down-tick-inset.png diff --git a/public/images/facebox/closelabel.png b/app/assets/images/facebox/closelabel.png similarity index 100% rename from public/images/facebox/closelabel.png rename to app/assets/images/facebox/closelabel.png diff --git a/public/images/facebox/loading.gif b/app/assets/images/facebox/loading.gif similarity index 100% rename from public/images/facebox/loading.gif rename to app/assets/images/facebox/loading.gif diff --git a/public/images/hatched-bg-dark.png b/app/assets/images/hatched-bg-dark.png similarity index 100% rename from public/images/hatched-bg-dark.png rename to app/assets/images/hatched-bg-dark.png diff --git a/public/images/hatched-bg-small.jpg b/app/assets/images/hatched-bg-small.jpg similarity index 100% rename from public/images/hatched-bg-small.jpg rename to app/assets/images/hatched-bg-small.jpg diff --git a/public/images/hatched-bg.jpg b/app/assets/images/hatched-bg.jpg similarity index 100% rename from public/images/hatched-bg.jpg rename to app/assets/images/hatched-bg.jpg diff --git a/public/images/header-bg-long.jpg b/app/assets/images/header-bg-long.jpg similarity index 100% rename from public/images/header-bg-long.jpg rename to app/assets/images/header-bg-long.jpg diff --git a/public/images/header-bg.png b/app/assets/images/header-bg.png similarity index 100% rename from public/images/header-bg.png rename to app/assets/images/header-bg.png diff --git a/public/images/header-logo.png b/app/assets/images/header-logo.png similarity index 100% rename from public/images/header-logo.png rename to app/assets/images/header-logo.png diff --git a/public/images/header-logo2x.png b/app/assets/images/header-logo2x.png similarity index 100% rename from public/images/header-logo2x.png rename to app/assets/images/header-logo2x.png diff --git a/public/images/icons/arrow_down.png b/app/assets/images/icons/arrow_down.png similarity index 100% rename from public/images/icons/arrow_down.png rename to app/assets/images/icons/arrow_down.png diff --git a/public/images/icons/arrow_down_small.png b/app/assets/images/icons/arrow_down_small.png similarity index 100% rename from public/images/icons/arrow_down_small.png rename to app/assets/images/icons/arrow_down_small.png diff --git a/public/images/icons/arrow_up_small.png b/app/assets/images/icons/arrow_up_small.png similarity index 100% rename from public/images/icons/arrow_up_small.png rename to app/assets/images/icons/arrow_up_small.png diff --git a/public/images/icons/back_white.png b/app/assets/images/icons/back_white.png similarity index 100% rename from public/images/icons/back_white.png rename to app/assets/images/icons/back_white.png diff --git a/public/images/icons/bookmark.png b/app/assets/images/icons/bookmark.png similarity index 100% rename from public/images/icons/bookmark.png rename to app/assets/images/icons/bookmark.png diff --git a/public/images/icons/camera.png b/app/assets/images/icons/camera.png similarity index 100% rename from public/images/icons/camera.png rename to app/assets/images/icons/camera.png diff --git a/public/images/icons/check_yes_ok.png b/app/assets/images/icons/check_yes_ok.png similarity index 100% rename from public/images/icons/check_yes_ok.png rename to app/assets/images/icons/check_yes_ok.png diff --git a/public/images/icons/check_yes_ok_lighter.png b/app/assets/images/icons/check_yes_ok_lighter.png similarity index 100% rename from public/images/icons/check_yes_ok_lighter.png rename to app/assets/images/icons/check_yes_ok_lighter.png diff --git a/public/images/icons/check_yes_ok_white.png b/app/assets/images/icons/check_yes_ok_white.png similarity index 100% rename from public/images/icons/check_yes_ok_white.png rename to app/assets/images/icons/check_yes_ok_white.png diff --git a/public/images/icons/coffee.png b/app/assets/images/icons/coffee.png similarity index 100% rename from public/images/icons/coffee.png rename to app/assets/images/icons/coffee.png diff --git a/public/images/icons/cog.png b/app/assets/images/icons/cog.png similarity index 100% rename from public/images/icons/cog.png rename to app/assets/images/icons/cog.png diff --git a/public/images/icons/comment_mobile_grey.png b/app/assets/images/icons/comment_mobile_grey.png similarity index 100% rename from public/images/icons/comment_mobile_grey.png rename to app/assets/images/icons/comment_mobile_grey.png diff --git a/public/images/icons/compose_mobile.png b/app/assets/images/icons/compose_mobile.png similarity index 100% rename from public/images/icons/compose_mobile.png rename to app/assets/images/icons/compose_mobile.png diff --git a/public/images/icons/compose_mobile2.png b/app/assets/images/icons/compose_mobile2.png similarity index 100% rename from public/images/icons/compose_mobile2.png rename to app/assets/images/icons/compose_mobile2.png diff --git a/public/images/icons/cubbies.png b/app/assets/images/icons/cubbies.png similarity index 100% rename from public/images/icons/cubbies.png rename to app/assets/images/icons/cubbies.png diff --git a/public/images/icons/globe.png b/app/assets/images/icons/globe.png similarity index 100% rename from public/images/icons/globe.png rename to app/assets/images/icons/globe.png diff --git a/public/images/icons/heart.png b/app/assets/images/icons/heart.png similarity index 100% rename from public/images/icons/heart.png rename to app/assets/images/icons/heart.png diff --git a/public/images/icons/heart_mobile_grey.png b/app/assets/images/icons/heart_mobile_grey.png similarity index 100% rename from public/images/icons/heart_mobile_grey.png rename to app/assets/images/icons/heart_mobile_grey.png diff --git a/public/images/icons/heart_mobile_red.png b/app/assets/images/icons/heart_mobile_red.png similarity index 100% rename from public/images/icons/heart_mobile_red.png rename to app/assets/images/icons/heart_mobile_red.png diff --git a/public/images/icons/home_grey.png b/app/assets/images/icons/home_grey.png similarity index 100% rename from public/images/icons/home_grey.png rename to app/assets/images/icons/home_grey.png diff --git a/public/images/icons/ignoreuser.png b/app/assets/images/icons/ignoreuser.png similarity index 100% rename from public/images/icons/ignoreuser.png rename to app/assets/images/icons/ignoreuser.png diff --git a/public/images/icons/list_white.png b/app/assets/images/icons/list_white.png similarity index 100% rename from public/images/icons/list_white.png rename to app/assets/images/icons/list_white.png diff --git a/public/images/icons/mail_big.png b/app/assets/images/icons/mail_big.png similarity index 100% rename from public/images/icons/mail_big.png rename to app/assets/images/icons/mail_big.png diff --git a/public/images/icons/mail_grey.png b/app/assets/images/icons/mail_grey.png similarity index 100% rename from public/images/icons/mail_grey.png rename to app/assets/images/icons/mail_grey.png diff --git a/public/images/icons/monotone_add_plus.png b/app/assets/images/icons/monotone_add_plus.png similarity index 100% rename from public/images/icons/monotone_add_plus.png rename to app/assets/images/icons/monotone_add_plus.png diff --git a/public/images/icons/monotone_check_yes.png b/app/assets/images/icons/monotone_check_yes.png similarity index 100% rename from public/images/icons/monotone_check_yes.png rename to app/assets/images/icons/monotone_check_yes.png diff --git a/public/images/icons/monotone_close_exit_delete.png b/app/assets/images/icons/monotone_close_exit_delete.png similarity index 100% rename from public/images/icons/monotone_close_exit_delete.png rename to app/assets/images/icons/monotone_close_exit_delete.png diff --git a/public/images/icons/monotone_email_letter_round.png b/app/assets/images/icons/monotone_email_letter_round.png similarity index 100% rename from public/images/icons/monotone_email_letter_round.png rename to app/assets/images/icons/monotone_email_letter_round.png diff --git a/public/images/icons/monotone_pen_write.png b/app/assets/images/icons/monotone_pen_write.png similarity index 100% rename from public/images/icons/monotone_pen_write.png rename to app/assets/images/icons/monotone_pen_write.png diff --git a/public/images/icons/monotone_plus_add_round.png b/app/assets/images/icons/monotone_plus_add_round.png similarity index 100% rename from public/images/icons/monotone_plus_add_round.png rename to app/assets/images/icons/monotone_plus_add_round.png diff --git a/public/images/icons/monotone_question.png b/app/assets/images/icons/monotone_question.png similarity index 100% rename from public/images/icons/monotone_question.png rename to app/assets/images/icons/monotone_question.png diff --git a/public/images/icons/monotone_wrench_settings.png b/app/assets/images/icons/monotone_wrench_settings.png similarity index 100% rename from public/images/icons/monotone_wrench_settings.png rename to app/assets/images/icons/monotone_wrench_settings.png diff --git a/public/images/icons/notifications_grey.png b/app/assets/images/icons/notifications_grey.png similarity index 100% rename from public/images/icons/notifications_grey.png rename to app/assets/images/icons/notifications_grey.png diff --git a/public/images/icons/padlock-closed.png b/app/assets/images/icons/padlock-closed.png similarity index 100% rename from public/images/icons/padlock-closed.png rename to app/assets/images/icons/padlock-closed.png diff --git a/public/images/icons/padlock-open.png b/app/assets/images/icons/padlock-open.png similarity index 100% rename from public/images/icons/padlock-open.png rename to app/assets/images/icons/padlock-open.png diff --git a/public/images/icons/pen_write.png b/app/assets/images/icons/pen_write.png similarity index 100% rename from public/images/icons/pen_write.png rename to app/assets/images/icons/pen_write.png diff --git a/public/images/icons/pencil.png b/app/assets/images/icons/pencil.png similarity index 100% rename from public/images/icons/pencil.png rename to app/assets/images/icons/pencil.png diff --git a/public/images/icons/pencil_mobile_grey.png b/app/assets/images/icons/pencil_mobile_grey.png similarity index 100% rename from public/images/icons/pencil_mobile_grey.png rename to app/assets/images/icons/pencil_mobile_grey.png diff --git a/public/images/icons/pencil_mobile_grey_active.png b/app/assets/images/icons/pencil_mobile_grey_active.png similarity index 100% rename from public/images/icons/pencil_mobile_grey_active.png rename to app/assets/images/icons/pencil_mobile_grey_active.png diff --git a/public/images/icons/pencil_mobile_grey_mobile.png b/app/assets/images/icons/pencil_mobile_grey_mobile.png similarity index 100% rename from public/images/icons/pencil_mobile_grey_mobile.png rename to app/assets/images/icons/pencil_mobile_grey_mobile.png diff --git a/public/images/icons/photo.png b/app/assets/images/icons/photo.png similarity index 100% rename from public/images/icons/photo.png rename to app/assets/images/icons/photo.png diff --git a/public/images/icons/plus.png b/app/assets/images/icons/plus.png similarity index 100% rename from public/images/icons/plus.png rename to app/assets/images/icons/plus.png diff --git a/public/images/icons/question.png b/app/assets/images/icons/question.png similarity index 100% rename from public/images/icons/question.png rename to app/assets/images/icons/question.png diff --git a/public/images/icons/reshare_mobile.png b/app/assets/images/icons/reshare_mobile.png similarity index 100% rename from public/images/icons/reshare_mobile.png rename to app/assets/images/icons/reshare_mobile.png diff --git a/public/images/icons/reshare_mobile_active.png b/app/assets/images/icons/reshare_mobile_active.png similarity index 100% rename from public/images/icons/reshare_mobile_active.png rename to app/assets/images/icons/reshare_mobile_active.png diff --git a/public/images/icons/search_white.png b/app/assets/images/icons/search_white.png similarity index 100% rename from public/images/icons/search_white.png rename to app/assets/images/icons/search_white.png diff --git a/public/images/icons/smiley_laughing.png b/app/assets/images/icons/smiley_laughing.png similarity index 100% rename from public/images/icons/smiley_laughing.png rename to app/assets/images/icons/smiley_laughing.png diff --git a/public/images/logo_caps.png b/app/assets/images/logo_caps.png similarity index 100% rename from public/images/logo_caps.png rename to app/assets/images/logo_caps.png diff --git a/public/images/logo_large.png b/app/assets/images/logo_large.png similarity index 100% rename from public/images/logo_large.png rename to app/assets/images/logo_large.png diff --git a/public/images/logo_small.png b/app/assets/images/logo_small.png similarity index 100% rename from public/images/logo_small.png rename to app/assets/images/logo_small.png diff --git a/public/images/mobile-spinner.gif b/app/assets/images/mobile-spinner.gif similarity index 100% rename from public/images/mobile-spinner.gif rename to app/assets/images/mobile-spinner.gif diff --git a/public/images/mobile.jpg b/app/assets/images/mobile.jpg similarity index 100% rename from public/images/mobile.jpg rename to app/assets/images/mobile.jpg diff --git a/public/images/mocks/bp.jpeg b/app/assets/images/mocks/bp.jpeg similarity index 100% rename from public/images/mocks/bp.jpeg rename to app/assets/images/mocks/bp.jpeg diff --git a/public/images/mocks/user_pic.jpeg b/app/assets/images/mocks/user_pic.jpeg similarity index 100% rename from public/images/mocks/user_pic.jpeg rename to app/assets/images/mocks/user_pic.jpeg diff --git a/public/images/modern_browsers.png b/app/assets/images/modern_browsers.png similarity index 100% rename from public/images/modern_browsers.png rename to app/assets/images/modern_browsers.png diff --git a/public/images/pen_white.png b/app/assets/images/pen_white.png similarity index 100% rename from public/images/pen_white.png rename to app/assets/images/pen_white.png diff --git a/public/images/powered_by_diaspora.png b/app/assets/images/powered_by_diaspora.png similarity index 100% rename from public/images/powered_by_diaspora.png rename to app/assets/images/powered_by_diaspora.png diff --git a/public/images/press_logos/mashable_logo.png b/app/assets/images/press_logos/mashable_logo.png similarity index 100% rename from public/images/press_logos/mashable_logo.png rename to app/assets/images/press_logos/mashable_logo.png diff --git a/public/images/press_logos/nymag_logo.png b/app/assets/images/press_logos/nymag_logo.png similarity index 100% rename from public/images/press_logos/nymag_logo.png rename to app/assets/images/press_logos/nymag_logo.png diff --git a/public/images/press_logos/techcrunch_logo.png b/app/assets/images/press_logos/techcrunch_logo.png similarity index 100% rename from public/images/press_logos/techcrunch_logo.png rename to app/assets/images/press_logos/techcrunch_logo.png diff --git a/public/images/press_logos/the_new_york_times_logo.png b/app/assets/images/press_logos/the_new_york_times_logo.png similarity index 100% rename from public/images/press_logos/the_new_york_times_logo.png rename to app/assets/images/press_logos/the_new_york_times_logo.png diff --git a/public/images/reply.png b/app/assets/images/reply.png similarity index 100% rename from public/images/reply.png rename to app/assets/images/reply.png diff --git a/public/images/seed.jpg b/app/assets/images/seed.jpg similarity index 100% rename from public/images/seed.jpg rename to app/assets/images/seed.jpg diff --git a/public/images/services/facebook_sign_in.png b/app/assets/images/services/facebook_sign_in.png similarity index 100% rename from public/images/services/facebook_sign_in.png rename to app/assets/images/services/facebook_sign_in.png diff --git a/public/images/services/twitter_sign_in.png b/app/assets/images/services/twitter_sign_in.png similarity index 100% rename from public/images/services/twitter_sign_in.png rename to app/assets/images/services/twitter_sign_in.png diff --git a/public/images/social_media_logos/email-16x16.png b/app/assets/images/social_media_logos/email-16x16.png similarity index 100% rename from public/images/social_media_logos/email-16x16.png rename to app/assets/images/social_media_logos/email-16x16.png diff --git a/public/images/social_media_logos/email-24x24.png b/app/assets/images/social_media_logos/email-24x24.png similarity index 100% rename from public/images/social_media_logos/email-24x24.png rename to app/assets/images/social_media_logos/email-24x24.png diff --git a/public/images/social_media_logos/email-32x32.png b/app/assets/images/social_media_logos/email-32x32.png similarity index 100% rename from public/images/social_media_logos/email-32x32.png rename to app/assets/images/social_media_logos/email-32x32.png diff --git a/public/images/social_media_logos/email-48x48.png b/app/assets/images/social_media_logos/email-48x48.png similarity index 100% rename from public/images/social_media_logos/email-48x48.png rename to app/assets/images/social_media_logos/email-48x48.png diff --git a/public/images/social_media_logos/facebook-16x16.png b/app/assets/images/social_media_logos/facebook-16x16.png similarity index 100% rename from public/images/social_media_logos/facebook-16x16.png rename to app/assets/images/social_media_logos/facebook-16x16.png diff --git a/public/images/social_media_logos/facebook-24x24.png b/app/assets/images/social_media_logos/facebook-24x24.png similarity index 100% rename from public/images/social_media_logos/facebook-24x24.png rename to app/assets/images/social_media_logos/facebook-24x24.png diff --git a/public/images/social_media_logos/facebook-32x32.png b/app/assets/images/social_media_logos/facebook-32x32.png similarity index 100% rename from public/images/social_media_logos/facebook-32x32.png rename to app/assets/images/social_media_logos/facebook-32x32.png diff --git a/public/images/social_media_logos/facebook-48x48.png b/app/assets/images/social_media_logos/facebook-48x48.png similarity index 100% rename from public/images/social_media_logos/facebook-48x48.png rename to app/assets/images/social_media_logos/facebook-48x48.png diff --git a/public/images/social_media_logos/feed-16x16.png b/app/assets/images/social_media_logos/feed-16x16.png similarity index 100% rename from public/images/social_media_logos/feed-16x16.png rename to app/assets/images/social_media_logos/feed-16x16.png diff --git a/public/images/social_media_logos/feed-24x24.png b/app/assets/images/social_media_logos/feed-24x24.png similarity index 100% rename from public/images/social_media_logos/feed-24x24.png rename to app/assets/images/social_media_logos/feed-24x24.png diff --git a/public/images/social_media_logos/feed-32x32.png b/app/assets/images/social_media_logos/feed-32x32.png similarity index 100% rename from public/images/social_media_logos/feed-32x32.png rename to app/assets/images/social_media_logos/feed-32x32.png diff --git a/public/images/social_media_logos/feed-48x48.png b/app/assets/images/social_media_logos/feed-48x48.png similarity index 100% rename from public/images/social_media_logos/feed-48x48.png rename to app/assets/images/social_media_logos/feed-48x48.png diff --git a/public/images/social_media_logos/tumblr-16x16.png b/app/assets/images/social_media_logos/tumblr-16x16.png similarity index 100% rename from public/images/social_media_logos/tumblr-16x16.png rename to app/assets/images/social_media_logos/tumblr-16x16.png diff --git a/public/images/social_media_logos/tumblr-24x24.png b/app/assets/images/social_media_logos/tumblr-24x24.png similarity index 100% rename from public/images/social_media_logos/tumblr-24x24.png rename to app/assets/images/social_media_logos/tumblr-24x24.png diff --git a/public/images/social_media_logos/tumblr-32x32.png b/app/assets/images/social_media_logos/tumblr-32x32.png similarity index 100% rename from public/images/social_media_logos/tumblr-32x32.png rename to app/assets/images/social_media_logos/tumblr-32x32.png diff --git a/public/images/social_media_logos/tumblr-48x48.png b/app/assets/images/social_media_logos/tumblr-48x48.png similarity index 100% rename from public/images/social_media_logos/tumblr-48x48.png rename to app/assets/images/social_media_logos/tumblr-48x48.png diff --git a/public/images/social_media_logos/twitter-16x16.png b/app/assets/images/social_media_logos/twitter-16x16.png similarity index 100% rename from public/images/social_media_logos/twitter-16x16.png rename to app/assets/images/social_media_logos/twitter-16x16.png diff --git a/public/images/social_media_logos/twitter-24x24.png b/app/assets/images/social_media_logos/twitter-24x24.png similarity index 100% rename from public/images/social_media_logos/twitter-24x24.png rename to app/assets/images/social_media_logos/twitter-24x24.png diff --git a/public/images/social_media_logos/twitter-32x32.png b/app/assets/images/social_media_logos/twitter-32x32.png similarity index 100% rename from public/images/social_media_logos/twitter-32x32.png rename to app/assets/images/social_media_logos/twitter-32x32.png diff --git a/public/images/social_media_logos/twitter-48x48.png b/app/assets/images/social_media_logos/twitter-48x48.png similarity index 100% rename from public/images/social_media_logos/twitter-48x48.png rename to app/assets/images/social_media_logos/twitter-48x48.png diff --git a/public/images/social_media_logos/website-16x16.png b/app/assets/images/social_media_logos/website-16x16.png similarity index 100% rename from public/images/social_media_logos/website-16x16.png rename to app/assets/images/social_media_logos/website-16x16.png diff --git a/public/images/social_media_logos/website-24x24.png b/app/assets/images/social_media_logos/website-24x24.png similarity index 100% rename from public/images/social_media_logos/website-24x24.png rename to app/assets/images/social_media_logos/website-24x24.png diff --git a/public/images/social_media_logos/website-32x32.png b/app/assets/images/social_media_logos/website-32x32.png similarity index 100% rename from public/images/social_media_logos/website-32x32.png rename to app/assets/images/social_media_logos/website-32x32.png diff --git a/public/images/social_media_logos/website-48x48.png b/app/assets/images/social_media_logos/website-48x48.png similarity index 100% rename from public/images/social_media_logos/website-48x48.png rename to app/assets/images/social_media_logos/website-48x48.png diff --git a/public/images/static-loader.png b/app/assets/images/static-loader.png similarity index 100% rename from public/images/static-loader.png rename to app/assets/images/static-loader.png diff --git a/public/images/tipsy.gif b/app/assets/images/tipsy.gif similarity index 100% rename from public/images/tipsy.gif rename to app/assets/images/tipsy.gif diff --git a/public/images/up-tick-inset.png b/app/assets/images/up-tick-inset.png similarity index 100% rename from public/images/up-tick-inset.png rename to app/assets/images/up-tick-inset.png diff --git a/public/images/user/angela.jpg b/app/assets/images/user/angela.jpg similarity index 100% rename from public/images/user/angela.jpg rename to app/assets/images/user/angela.jpg diff --git a/public/images/user/default.png b/app/assets/images/user/default.png similarity index 100% rename from public/images/user/default.png rename to app/assets/images/user/default.png diff --git a/public/images/user/uma.jpg b/app/assets/images/user/uma.jpg similarity index 100% rename from public/images/user/uma.jpg rename to app/assets/images/user/uma.jpg diff --git a/public/images/user/wolf.jpg b/app/assets/images/user/wolf.jpg similarity index 100% rename from public/images/user/wolf.jpg rename to app/assets/images/user/wolf.jpg diff --git a/public/images/video-overlay.png b/app/assets/images/video-overlay.png similarity index 100% rename from public/images/video-overlay.png rename to app/assets/images/video-overlay.png diff --git a/public/images/white.png b/app/assets/images/white.png similarity index 100% rename from public/images/white.png rename to app/assets/images/white.png diff --git a/public/images/white@2x.png b/app/assets/images/white@2x.png similarity index 100% rename from public/images/white@2x.png rename to app/assets/images/white@2x.png diff --git a/public/images/white_on_grey.png b/app/assets/images/white_on_grey.png similarity index 100% rename from public/images/white_on_grey.png rename to app/assets/images/white_on_grey.png diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass index 517463089..06c94a0c8 100644 --- a/app/assets/stylesheets/application.css.sass +++ b/app/assets/stylesheets/application.css.sass @@ -1,6 +1,4 @@ -//= require_self -//= require ui - +@import 'ui.css.sass' @import '_mixins.css.scss' /* ====== media ====== */ @@ -167,7 +165,7 @@ header :background :color rgb(40,35,35) - :image url('/images/header-bg.png') + :image url('/assets/header-bg.png') :z-index 1001 :padding 6px 0 @@ -1515,7 +1513,7 @@ ul#landing_nav #diaspora_description :background - :image url('../images/ball.png') + :image url('/assets/ball.png') :repeat no-repeat :position top center @@ -1849,7 +1847,7 @@ ul#press_logos :background-color transparent .oembed - :background url('/images/ajax-loader2.gif') no-repeat center center + :background url('/assets/ajax-loader2.gif') no-repeat center center :display inline-block :max-width 100% @@ -1858,7 +1856,7 @@ ul#press_logos :cursor pointer .video-overlay - :background url('/images/video-overlay.png') no-repeat center center + :background url('/assets/video-overlay.png') no-repeat center center :position absolute :top 0 :left 0 @@ -2278,7 +2276,7 @@ ul.left_nav > a.aspect_selector :background - :image url(../images/icons/check_yes_ok.png) + :image url("/assets/icons/check_yes_ok.png") :position 3px 50% :repeat no-repeat diff --git a/app/assets/stylesheets/autocomplete.css.sass b/app/assets/stylesheets/autocomplete.css.sass index c6aa09aff..d40518ef0 100644 --- a/app/assets/stylesheets/autocomplete.css.sass +++ b/app/assets/stylesheets/autocomplete.css.sass @@ -41,7 +41,7 @@ :overflow hidden .ac_loading - :background white url('../images/ajax-loader.gif') right center no-repeat + :background white url('/assets/ajax-loader.gif') right center no-repeat .ac_odd :background-color #fafafa diff --git a/app/assets/stylesheets/login.css.scss b/app/assets/stylesheets/login.css.scss index 024b8d12b..d5e8d19bf 100644 --- a/app/assets/stylesheets/login.css.scss +++ b/app/assets/stylesheets/login.css.scss @@ -1,5 +1,3 @@ -//= require_self - // Copyright (c) 2010-2011, Diaspora Inc. This file is // licensed under the Affero General Public License version 3 or later. See // the COPYRIGHT file. diff --git a/app/assets/stylesheets/mobile.css.scss b/app/assets/stylesheets/mobile.css.scss index f9d2d538d..e97a13f51 100644 --- a/app/assets/stylesheets/mobile.css.scss +++ b/app/assets/stylesheets/mobile.css.scss @@ -1,7 +1,5 @@ -//= require_self -//= require vendor/bootstrap -//= require vendor/bootstrap-responsive - +@import 'vendor/bootstrap.css' +@import 'vendor/bootstrap-responsive.css' @import "_mixins.css.scss"; $blue: #3f8fba; @@ -14,7 +12,7 @@ a { body { background: { - image: url('/images/hatched-bg.jpg'); + image: url('/assets/hatched-bg.jpg'); position: fixed; /* scale background image down for iOS retina display */ size: 200px; @@ -278,7 +276,7 @@ body { @include box-shadow(0,1px,2px,#333); background: { - image: url("/images/header-bg-long.jpg"); + image: url("/assets/header-bg-long.jpg"); } width: 100%; @@ -379,7 +377,7 @@ footer { right: 14px; } background: { - image: url("/images/icons/arrow_down_small.png"); + image: url("/assets/icons/arrow_down_small.png"); position: center right; repeat: no-repeat; } @@ -462,28 +460,28 @@ footer { left: 5px; }; &.loading { - background-image: url("/images/mobile-spinner.gif"); + background-image: url("/assets/mobile-spinner.gif"); } } .reshare_action { - background-image: url("/images/icons/reshare_mobile.png"); + background-image: url("/assets/icons/reshare_mobile.png"); &.active { - background-image: url("/images/icons/reshare_mobile_active.png"); + background-image: url("/assets/icons/reshare_mobile_active.png"); } } .like_action { - background-image: url("/images/icons/heart_mobile_grey.png"); + background-image: url("/assets/icons/heart_mobile_grey.png"); &.active { - background-image: url("/images/icons/heart_mobile_red.png"); + background-image: url("/assets/icons/heart_mobile_red.png"); } } .comment_action.image_link { - background-image: url("/images/icons/pencil_mobile_grey_active.png"); + background-image: url("/assets/icons/pencil_mobile_grey_active.png"); &.inactive { - background-image: url("/images/icons/pencil_mobile_grey.png"); + background-image: url("/assets/icons/pencil_mobile_grey.png"); } } diff --git a/app/assets/stylesheets/new-templates.css.scss b/app/assets/stylesheets/new-templates.css.scss index d2acb9dea..fe905e1d5 100644 --- a/app/assets/stylesheets/new-templates.css.scss +++ b/app/assets/stylesheets/new-templates.css.scss @@ -1,5 +1,3 @@ -//= require_self - /* variables */ $light-grey: #999; $pane-width: 420px; @@ -89,7 +87,7 @@ $pane-width: 420px; @mixin dark-hatched-bg() { background-color: #444; - background-image: url("../images/hatched-bg-dark.png"); + background-image: url("/assets/hatched-bg-dark.png"); } @mixin photo-shadow() { @@ -109,15 +107,15 @@ $pane-width: 420px; /* bootstrap extentions */ .icon-red { - background-image: url(../img/glyphicons-halflings-red.png); + background-image: url("/img/glyphicons-halflings-red.png"); } .icon-green { - background-image: url(../img/glyphicons-halflings-green.png); + background-image: url("/img/glyphicons-halflings-green.png"); } .icon-blue { - background-image: url(../img/glyphicons-halflings-blue.png); + background-image: url("/img/glyphicons-halflings-blue.png"); } /* styles */ diff --git a/app/assets/stylesheets/rtl.css.sass b/app/assets/stylesheets/rtl.css.sass index 6c48be1c0..867225603 100644 --- a/app/assets/stylesheets/rtl.css.sass +++ b/app/assets/stylesheets/rtl.css.sass @@ -1,5 +1,3 @@ -//= require_self - body :direction rtl :text-align right diff --git a/app/assets/stylesheets/ui.css.sass b/app/assets/stylesheets/ui.css.sass index 12dafcd36..a9a449a9c 100644 --- a/app/assets/stylesheets/ui.css.sass +++ b/app/assets/stylesheets/ui.css.sass @@ -127,25 +127,25 @@ input.button &.selected :background - :image url('/images/icons/check_yes_ok.png') + :image url('/assets/icons/check_yes_ok.png') :position 3px 1px :repeat no-repeat &.selected:hover :background - :image url('/images/icons/check_yes_ok_white.png') + :image url('/assets/icons/check_yes_ok_white.png') /* bump top position up 1px to compensate for the 1px added top border */ :position 3px 0px &.loading :background - :image url('/images/ajax-loader.gif') + :image url('/assets/ajax-loader.gif') :repeat no-repeat :position 4px 2px &.loading:hover :background - :image url('/images/ajax-loader_inverted.gif') + :image url('/assets/ajax-loader_inverted.gif') /* bump top position up 1px to compensate for the 1px added top border */ :position 4px 1px diff --git a/app/helpers/contacts_helper.rb b/app/helpers/contacts_helper.rb index 67c0a01db..8bcc5c774 100644 --- a/app/helpers/contacts_helper.rb +++ b/app/helpers/contacts_helper.rb @@ -1,7 +1,7 @@ module ContactsHelper def contact_aspect_dropdown(contact) if @aspect - link_to(image_tag('/images/icons/monotone_close_exit_delete.png', :height => 20, :width => 20), + link_to(image_tag('icons/monotone_close_exit_delete.png', :height => 20, :width => 20), {:controller => "aspect_memberships", :action => 'destroy', :id => 42, diff --git a/app/helpers/layout_helper.rb b/app/helpers/layout_helper.rb index 5ea667d2f..3eff5c2ba 100644 --- a/app/helpers/layout_helper.rb +++ b/app/helpers/layout_helper.rb @@ -18,9 +18,10 @@ module LayoutHelper end def set_asset_host + path = ENV['ASSET_HOST'].to_s + '/assets/' content_tag(:script) do <<-JS.html_safe - app.baseImageUrl("#{ENV['ASSET_HOST']}") + app.baseImageUrl("#{path}") JS end end diff --git a/app/views/devise/mailer/confirmation_instructions.haml b/app/views/devise/mailer/confirmation_instructions.haml index 14eca4254..07c93719f 100644 --- a/app/views/devise/mailer/confirmation_instructions.haml +++ b/app/views/devise/mailer/confirmation_instructions.haml @@ -5,7 +5,7 @@ = render :partial => 'notifier/notifier_css' %body %header - = image_tag '/images/diaspora_white.png' + = image_tag('diaspora_white.png') #container %p = t('devise.mailer.welcome', :email => @resource.email) diff --git a/app/views/devise/mailer/reset_password_instructions.haml b/app/views/devise/mailer/reset_password_instructions.haml index c876bfc8d..5cb36b2db 100644 --- a/app/views/devise/mailer/reset_password_instructions.haml +++ b/app/views/devise/mailer/reset_password_instructions.haml @@ -5,7 +5,7 @@ = render :partial => 'notifier/notifier_css' %body %header - = image_tag '/images/diaspora_white.png' + = image_tag('diaspora_white.png') #container %p = t('devise.mailer.hello', :email => @resource.email) diff --git a/app/views/devise/mailer/unlock_instructions.haml b/app/views/devise/mailer/unlock_instructions.haml index a5c90b41e..eb2e21e93 100644 --- a/app/views/devise/mailer/unlock_instructions.haml +++ b/app/views/devise/mailer/unlock_instructions.haml @@ -5,7 +5,7 @@ = render :partial => 'notifier/notifier_css' %body %header - = image_tag '/images/diaspora_white.png' + = image_tag('diaspora_white.png') #container %p = t('devise.mailer.hello', :email => @resource.email) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index e36ebc340..057af16be 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -22,7 +22,7 @@ = stylesheet_link_tag 'login', 'application', 'default' - if rtl? - = include_stylesheets :rtl, :media => 'all' + = stylesheet_link_tag :rtl, :media => 'all' = old_browser_js_support