Download as
Browse Code »

Commit 8fff632e15f3fa464ff006c9c60ad7013e4ecc72

Authored by AurelioAHeckert
1 parent 3c74c169
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

ActionItem323: pequena arrumada... 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1739 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 6 additions and 5 deletions   Show diff stats
app/controllers/public/search_controller.rb
  Diff comments   View file @8fff632
@@ -73,7 +73,7 @@ class SearchController < ApplicationController @@ -73,7 +73,7 @@ class SearchController < ApplicationController
73 [ :recent_people, _('Recently registered people'), @finder.recent('people') ], 73 [ :recent_people, _('Recently registered people'), @finder.recent('people') ],
74 [ :recent_communities, _('Recently created communities'), @finder.recent('communities') ], 74 [ :recent_communities, _('Recently created communities'), @finder.recent('communities') ],
75 [ :recent_articles, _('Recent articles'), @finder.recent('articles') ], 75 [ :recent_articles, _('Recent articles'), @finder.recent('articles') ],
76 - [ :recent_comments, _('Recent comments'), @finder.recent('comments') ], 76 + [ :comments, _('Recent comments'), @finder.recent('comments') ],
77 [ :most_commented_articles, _('Most commented articles'), @finder.most_commented_articles ] 77 [ :most_commented_articles, _('Most commented articles'), @finder.most_commented_articles ]
78 ].each do |key, name, list| 78 ].each do |key, name, list|
79 @results[key] = list 79 @results[key] = list
public/designs/themes/default/stylesheets/controller_search.css
  Diff comments   View file @8fff632
@@ -123,8 +123,8 @@ body.category4 .search-results-type-profile.common-profile-list-block li a { @@ -123,8 +123,8 @@ body.category4 .search-results-type-profile.common-profile-list-block li a {
123 123
124 /* * * Category Page * * * * * * * * * * * * */ 124 /* * * Category Page * * * * * * * * * * * * */
125 125
126 -#view-category h2 {  
127 - font-size: 16px; 126 +#view-category h3 {
  127 + font-size: 14px;
128 line-height: 20px; 128 line-height: 20px;
129 margin: 0px; 129 margin: 0px;
130 padding: 20px 0px 0px 20px; 130 padding: 20px 0px 0px 20px;
public/javascripts/application.js
  Diff comments   View file @8fff632
@@ -47,11 +47,12 @@ function resizePrincipalTemplateBox() { @@ -47,11 +47,12 @@ function resizePrincipalTemplateBox() {
47 var otherBoxSum = 10; 47 var otherBoxSum = 10;
48 var i = 2; 48 var i = 2;
49 var b = $$( "div.box-" + i++ )[0]; 49 var b = $$( "div.box-" + i++ )[0];
50 - while ( b.nodeName ) { 50 + while ( b && b.nodeName ) {
51 otherBoxSum += b.clientWidth; 51 otherBoxSum += b.clientWidth;
52 b = $$( "div.box-" + i++ )[0] || false; 52 b = $$( "div.box-" + i++ )[0] || false;
53 } 53 }
54 - box1.style.width = ( $("boxes").clientWidth - otherBoxSum ) +"px" 54 + if ( box1 )
  55 + box1.style.width = ( $("boxes").clientWidth - otherBoxSum ) +"px"
55 } 56 }
56 57
57 if ( window.addEventListener ) { 58 if ( window.addEventListener ) {