Commit
c5b9dcdda121accbaffda557474b51af218a9879
Exists in
master
and in
43 other branches
add_sisp_to_chef, add_super_archives_plugin, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, lxc_settings, margin_fix, mezuro_cookbook, refactor_download_block, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, sisp_catalog_header, sisp_dev_master, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_to_rails4, stable-4.1, stable-4.2, theme_header, theme_javascript_refactory, update_search_by_categories
Merge branch 'fix_members_pagination' into 'master'
Fix members pagination
@melissawen pra validar tbm se o que fizemos no tema foi correto
See merge request !111
| @@ -1052,7 +1052,7 @@ float: left; |
| @@ -1052,7 +1052,7 @@ float: left; |
1052
| padding-bottom: 30px; |
1052
| padding-bottom: 30px; |
1053
| } |
1053
| } |
1054
| |
1054
| |
1055
| -.action-profile-members .box-1 .common-profile-list-block span{ |
1055
| +.action-profile-members .box-1 .common-profile-list-block .profile-list-members span{ |
1056
| margin-right: 0px; |
1056
| margin-right: 0px; |
1057
| width: 90px; |
1057
| width: 90px; |
1058
| height: 86px; |
1058
| height: 86px; |
| @@ -12,3 +12,5 @@ |
| @@ -12,3 +12,5 @@ |
12
| <%= profile_image_link(u) %> |
12
| <%= profile_image_link(u) %> |
13
| <% end %> |
13
| <% end %> |
14
| </ul> |
14
| </ul> |
| |
15
| + |
| |
16
| +<%= pagination_links users, :param_name => "npage" %> |