Download as
Browse Code »

Commit 1dbeca00a15d42c3b5cef203f5d640fce18998ce

Authored by Juliana
2 parents 5d79a459 506e3920
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, 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_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Merge branch 'v2_members_page_and_block' of gitlab.com:softwarepublico/noosfero-… 

…spb-theme into v2_members_page_and_block

Conflicts:
	css/community-pages.css
Showing 1 changed file with 2 additions and 4 deletions   Show diff stats
css/community-pages.css
  Diff comments   View file @1dbeca0
... ... @@ -151,7 +151,6 @@
151 151  
152 152 /*Members Page*/
153 153  
154   -
155 154 /*area do select*/
156 155  
157 156 .action-profile-members #profile-members-sort-options{
... ... @@ -165,7 +164,6 @@
165 164 .action-profile-members #profile-members-sort-options label{
166 165 font-weight: 700;
167 166 color:#172738;
168   -}
169 167  
170 168 .action-profile-members #profile-members-sort-options select{
171 169 background: none;
... ... @@ -176,14 +174,14 @@
176 174 font-size: 14px;
177 175 }
178 176 /*fim select*/
  177 +
179 178 .action-profile-members .profile-members{
180 179 padding-left: 5px; /*34px;*/
181   - /*background-image: url(members.png);*/
182 180 }
183 181 .action-profile-members .profile-admins{
184 182 padding-left: 5px;
185   - /*background-image: url(members.png);*/
186 183 }
  184 +
187 185 /*area da imagem*/
188 186 .action-profile-members .box-1 .common-profile-list-block span{
189 187 margin-right: 9px;
... ...