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

reasonable max-width for right sidebar

Browse source
This commit is contained in:
Pablo Cuadrado 2015-06-22 19:32:41 -03:00 committed by augier
parent 9bd7ceb722
commit 754d8107a8
2 changed files with 75 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/stylesheets/sidebar.scss
View file

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

17
app/views/shared/_right_sections.html.haml
View file

@ -2,8 +2,9 @@
-# licensed under the Affero General Public License version 3 or later. See -# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
.right-sidebar-padder
- if AppConfig.settings.invitations.open? - if AppConfig.settings.invitations.open?
.section .section
.title .title
%h5.title-header %h5.title-header
@ -11,7 +12,7 @@
.content .content
= render "shared/invitations" = render "shared/invitations"
.section .section
.title .title
%h5.title-header %h5.title-header
= t('aspects.index.new_here.title') = t('aspects.index.new_here.title')
@ -20,7 +21,7 @@
%br %br
= link_to(t('aspects.index.new_here.learn_more'), "http://wiki.diasporafoundation.org/Welcoming_Committee") = link_to(t('aspects.index.new_here.learn_more'), "http://wiki.diasporafoundation.org/Welcoming_Committee")
.section .section
.title .title
%h5.title-header %h5.title-header
= t('aspects.index.help.need_help') = t('aspects.index.help.need_help')
@ -42,7 +43,7 @@
:tutorial => link_to(t('aspects.index.help.tutorial_link_text'), "https://diasporafoundation.org/tutorials", :target => '_blank'), :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') :wiki => link_to('Wiki','http://wiki.diasporafoundation.org', :target => '_blank'), :target => '_blank')
- unless AppConfig.configured_services.blank? || all_services_connected? - unless AppConfig.configured_services.blank? || all_services_connected?
.section .section
.title .title
%h5.title-header %h5.title-header
@ -57,14 +58,14 @@
- unless current_user.services.any?{|x| x.provider == service} - 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}") = link_to(content_tag(:div, nil, :class => "social_media_logos-#{service.to_s.downcase}-24x24", :title => service.to_s.titleize), "/auth/#{service}")
.section .section
.title .title
%h5.title-header %h5.title-header
= t('bookmarklet.heading') = t('bookmarklet.heading')
.content .content
!= t('bookmarklet.explanation', :link => link_to(t('bookmarklet.post_something'), bookmarklet_code)) != t('bookmarklet.explanation', :link => link_to(t('bookmarklet.post_something'), bookmarklet_code))
- if AppConfig.settings.paypal_donations.enable? || AppConfig.bitcoin_donation_address - if AppConfig.settings.paypal_donations.enable? || AppConfig.bitcoin_donation_address
.section .section
.title .title
%h5.title-header %h5.title-header
@ -74,7 +75,7 @@
= t('aspects.index.keep_pod_running', :pod => AppConfig.pod_uri.host) = t('aspects.index.keep_pod_running', :pod => AppConfig.pod_uri.host)
= render 'shared/donatepod' = render 'shared/donatepod'
- if AppConfig.admins.podmin_email.present? - if AppConfig.admins.podmin_email.present?
.section .section
.title .title
%h5.title-header %h5.title-header
@ -85,7 +86,7 @@
%p %p
= link_to t('aspects.index.help.mail_podmin'), "mailto:#{AppConfig.admins.podmin_email}", :class => "button" = link_to t('aspects.index.help.mail_podmin'), "mailto:#{AppConfig.admins.podmin_email}", :class => "button"
.section .section
.title .title
.content .content
%ul %ul