Download as
Browse Code »

Commit a8dac7fc7f85c8fab2efc60d957ba3187d17237e

Authored by Antonio Terceiro
1 parent 0e65d20c
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Always wrap content to have nice boxes around it

Showing 5 changed files with 4 additions and 14 deletions   Show diff stats
app/helpers/boxes_helper.rb
  Diff comments   View file @a8dac7f
... ... @@ -10,7 +10,7 @@ module BoxesHelper
10 10 else
11 11 content_tag('div',
12 12 content_tag('div',
13   - content_tag('div', content, :class => 'no-boxes-inner-2'),
  13 + content_tag('div', wrap_main_content(content), :class => 'no-boxes-inner-2'),
14 14 :class => 'no-boxes-inner-1'
15 15 ),
16 16 :class => 'no-boxes'
... ...
app/views/shared/access_denied.rhtml
  Diff comments   View file @a8dac7f
1 1 <div id='access-denied'>
2 2  
3   - <% noosfero_wrap do %>
4 3 <h1> <%= @title || _('Access denied') %> </h1>
5 4  
6 5 <% unless @message.nil? %>
... ... @@ -15,6 +14,5 @@
15 14 <%= button :home, _('Go to the site home page'), :controller => 'home' %>
16 15 <% end %>
17 16  
18   - <% end %>
19 17  
20 18 </div>
... ...
app/views/shared/not_found.rhtml
  Diff comments   View file @a8dac7f
1 1 <div id='not-found'>
2   - <% noosfero_wrap do %>
3 2 <h1><%= _('There is no such page: %s') % (content_tag('tt', @path)) %></h1>
4 3 <p>
5 4 <%= _('You may have clicked an expired link or mistyped the address.') %>
... ... @@ -9,5 +8,4 @@
9 8 <%= button :back, _('Go back'), :back %>
10 9 <%= button :home, _('Go to %s home page') % environment.name, :controller => 'home' %>
11 10 <% end %>
12   - <% end %>
13 11 </div>
... ...
public/designs/themes/base/style.css
  Diff comments   View file @a8dac7f
... ... @@ -773,7 +773,7 @@ X.sep {
773 773 width: 48%;
774 774 }
775 775  
776   -.controller-search #content .no-boxes h1 {
  776 +#content .no-boxes h1 {
777 777 font-variant: small-caps;
778 778 color: #555753;
779 779 font-size: 18px;
... ...
public/stylesheets/application.css
  Diff comments   View file @a8dac7f
... ... @@ -454,8 +454,6 @@ div.pending-tasks {
454 454 #content #not-found,
455 455 #content #access-denied {
456 456 -moz-border-radius: 6px;
457   - margin-left: 20%;
458   - margin-right: 20%;
459 457 }
460 458  
461 459 #content #not-found p,
... ... @@ -3006,12 +3004,8 @@ h1#agenda-title {
3006 3004 display: inline;
3007 3005 }
3008 3006  
3009   -.controller-profile .no-boxes {
3010   - margin: 0px 260px 0px 260px;
3011   -}
3012   -
3013   -.controller-profile #content .no-boxes h1 {
3014   - margin: 1px 0px 1px 160px;
  3007 +.no-boxes {
  3008 + margin: 0px 200px 0px 200px;
3015 3009 }
3016 3010  
3017 3011 .controller-profile #content .no-boxes h1,
... ...