Download as
Browse Code »

Commit 30300dece1e675af7303fb697d4475b38efc3932

Authored by Daniel Cunha
Committed by Daniela Feitosa
1 parent 73a75da0
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

Adding ArticleBlock to acceptable center blocks

Showing 2 changed files with 2 additions and 0 deletions   Show diff stats
app/models/box.rb
  Diff comments   View file @30300de
@@ -11,6 +11,7 @@ class Box < ActiveRecord::Base @@ -11,6 +11,7 @@ class Box < ActiveRecord::Base
11 11
12 def acceptable_center_blocks 12 def acceptable_center_blocks
13 %w{ 13 %w{
  14 + ArticleBlock
14 CommunitiesBlock 15 CommunitiesBlock
15 EnterprisesBlock 16 EnterprisesBlock
16 FriendsBlock 17 FriendsBlock
public/stylesheets/application.css
  Diff comments   View file @30300de
@@ -1394,6 +1394,7 @@ a.comment-picture { @@ -1394,6 +1394,7 @@ a.comment-picture {
1394 position: relative; 1394 position: relative;
1395 display: inline; 1395 display: inline;
1396 } 1396 }
  1397 +#content #boxes .box-1 .article-block img,
1397 #content #article .article-body img { 1398 #content #article .article-body img {
1398 max-width: 100%; 1399 max-width: 100%;
1399 height: auto; 1400 height: auto;