reasonable max-width for right sidebar

app/assets/stylesheets/sidebar.scss

@@ -4,6 +4,9 @@
   position: fixed;
   right: 0;
 }
+.right-sidebar-padder {
+  max-width: 300px;
+}
 .rightBar {
   padding-top: 20px;
   background: $right-sidebar-background;

app/views/shared/_right_sections.html.haml

@@ -2,92 +2,93 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
+.right-sidebar-padder
+
+  - if AppConfig.settings.invitations.open?
+    .section
+      .title
+        %h5.title-header
+          = t('shared.invitations.invite_your_friends')
+      .content
+        = render "shared/invitations"
 
-- if AppConfig.settings.invitations.open?
   .section
     .title
       %h5.title-header
-        = t('shared.invitations.invite_your_friends')
+        = t('aspects.index.new_here.title')
     .content
-      = render "shared/invitations"
+      != t('aspects.index.new_here.follow', link: link_to("#"+t('shared.publisher.new_user_prefill.newhere'), tag_path(name: t('shared.publisher.new_user_prefill.newhere'))))
+      %br
+      = link_to(t('aspects.index.new_here.learn_more'), "http://wiki.diasporafoundation.org/Welcoming_Committee")
 
-.section
-  .title
-    %h5.title-header
-      = t('aspects.index.new_here.title')
-  .content
-    != t('aspects.index.new_here.follow', link: link_to("#"+t('shared.publisher.new_user_prefill.newhere'), tag_path(name: t('shared.publisher.new_user_prefill.newhere'))))
-    %br
-    = link_to(t('aspects.index.new_here.learn_more'), "http://wiki.diasporafoundation.org/Welcoming_Committee")
-
-.section
-  .title
-    %h5.title-header
-      = t('aspects.index.help.need_help')
-  .content
-    %p
-      = t('aspects.index.help.here_to_help')
-    %p
-      = t('aspects.index.help.do_you')
-    %ul
-      %li
-        != t('aspects.index.help.have_a_question', :link => link_to("#"+t('aspects.index.help.tag_question'), tag_path(:name => t('aspects.index.help.tag_question'))))
-      %li
-        != t('aspects.index.help.find_a_bug', :link => link_to("#"+t('aspects.index.help.tag_bug'), tag_path(:name => t('aspects.index.help.tag_bug'))))
-      %li
-        != t('aspects.index.help.feature_suggestion', :link => link_to("#"+t('aspects.index.help.tag_feature'), tag_path(:name => t('aspects.index.help.tag_feature'))))
-    %p
-      != t('aspects.index.help.tutorials_and_wiki',
-           :faq => link_to(t('_help'), help_path),
-           :tutorial => link_to(t('aspects.index.help.tutorial_link_text'), "https://diasporafoundation.org/tutorials", :target => '_blank'),
-           :wiki => link_to('Wiki','http://wiki.diasporafoundation.org', :target => '_blank'), :target => '_blank')
-
-- unless AppConfig.configured_services.blank? || all_services_connected?
   .section
     .title
       %h5.title-header
-        = t('aspects.index.services.heading')
+        = t('aspects.index.help.need_help')
-    .content
-      %div
-        = t('aspects.index.services.content')
-
-      #right_service_icons
-        - AppConfig.configured_services.each do |service|
-          - if AppConfig.show_service?(service, current_user)
-            - unless current_user.services.any?{|x| x.provider == service}
-              = link_to(content_tag(:div, nil, :class => "social_media_logos-#{service.to_s.downcase}-24x24", :title => service.to_s.titleize), "/auth/#{service}")
-
-.section
-  .title
-    %h5.title-header
-      = t('bookmarklet.heading')
-  .content
-    != t('bookmarklet.explanation', :link => link_to(t('bookmarklet.post_something'), bookmarklet_code))
-
-- if AppConfig.settings.paypal_donations.enable? || AppConfig.bitcoin_donation_address
-  .section
-    .title
-      %h5.title-header
-        = t('aspects.index.donate')
     .content
       %p
-        = t('aspects.index.keep_pod_running', :pod => AppConfig.pod_uri.host)
+        = t('aspects.index.help.here_to_help')
-      = render 'shared/donatepod'
+      %p
+        = t('aspects.index.help.do_you')
+      %ul
+        %li
+          != t('aspects.index.help.have_a_question', :link => link_to("#"+t('aspects.index.help.tag_question'), tag_path(:name => t('aspects.index.help.tag_question'))))
+        %li
+          != t('aspects.index.help.find_a_bug', :link => link_to("#"+t('aspects.index.help.tag_bug'), tag_path(:name => t('aspects.index.help.tag_bug'))))
+        %li
+          != t('aspects.index.help.feature_suggestion', :link => link_to("#"+t('aspects.index.help.tag_feature'), tag_path(:name => t('aspects.index.help.tag_feature'))))
+      %p
+        != t('aspects.index.help.tutorials_and_wiki',
+             :faq => link_to(t('_help'), help_path),
+             :tutorial => link_to(t('aspects.index.help.tutorial_link_text'), "https://diasporafoundation.org/tutorials", :target => '_blank'),
+             :wiki => link_to('Wiki','http://wiki.diasporafoundation.org', :target => '_blank'), :target => '_blank')
+
+  - unless AppConfig.configured_services.blank? || all_services_connected?
+    .section
+      .title
+        %h5.title-header
+          = t('aspects.index.services.heading')
+      .content
+        %div
+          = t('aspects.index.services.content')
+
+        #right_service_icons
+          - AppConfig.configured_services.each do |service|
+            - if AppConfig.show_service?(service, current_user)
+              - unless current_user.services.any?{|x| x.provider == service}
+                = link_to(content_tag(:div, nil, :class => "social_media_logos-#{service.to_s.downcase}-24x24", :title => service.to_s.titleize), "/auth/#{service}")
 
-- if AppConfig.admins.podmin_email.present?
   .section
     .title
       %h5.title-header
-        = t('aspects.index.help.any_problem')
+        = t('bookmarklet.heading')
     .content
-      %p
+      != t('bookmarklet.explanation', :link => link_to(t('bookmarklet.post_something'), bookmarklet_code))
-        = t('aspects.index.help.contact_podmin')
-      %p
-        = link_to t('aspects.index.help.mail_podmin'), "mailto:#{AppConfig.admins.podmin_email}", :class => "button"
 
-.section
+  - if AppConfig.settings.paypal_donations.enable? || AppConfig.bitcoin_donation_address
-  .title
+    .section
-  .content
+      .title
-    %ul
+        %h5.title-header
-      = render "shared/links"
+          = t('aspects.index.donate')
+      .content
+        %p
+          = t('aspects.index.keep_pod_running', :pod => AppConfig.pod_uri.host)
+        = render 'shared/donatepod'
+
+  - if AppConfig.admins.podmin_email.present?
+    .section
+      .title
+        %h5.title-header
+          = t('aspects.index.help.any_problem')
+      .content
+        %p
+          = t('aspects.index.help.contact_podmin')
+        %p
+          = link_to t('aspects.index.help.mail_podmin'), "mailto:#{AppConfig.admins.podmin_email}", :class => "button"
+
+  .section
+    .title
+    .content
+      %ul
+        = render "shared/links"