Download as
Browse Code »

Commit b3c92cdd7735256cc526f37dcade82ab976c248d

Authored by Melissa Wen
1 parent 3a0e28ed
Exists in master and in 54 other branches add_you_are_here_breadcrumbs_label, api_for_colab, backup_not_prod, create_institution_bootstrap_modal, design_validation, dev_env_minimal, disable_email_dev, fix_edit_software_permission, fix_edit_software_with_another_license, fix_hover_button_whitening, fix_members_pagination, fix_models_translations, fix_software_api, fix_software_block_migration, fix_validations_and_tests, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc, margin_fix, mezuro_cookbook, organization_rating_style_changes, prezento, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_community_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_improvements, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

Just remove bad lines (unsolved merge conflicts and unnecessary meta data

Showing 2 changed files with 0 additions and 5 deletions   Show diff stats
@@ -134,11 +134,7 @@ body { @@ -134,11 +134,7 @@ body {
134 134
135 #content h1, #content h2, #content h3, #content h4, #content h5, #content h6{ 135 #content h1, #content h2, #content h3, #content h4, #content h5, #content h6{
136 margin-top: 20px; 136 margin-top: 20px;
137 -<<<<<<< 22561cf84ef741968c2784eb32a3c64c4cc35acc  
138 margin-bottom: 10px; 137 margin-bottom: 10px;
139 -=======  
140 - margin-bottom:10px  
141 ->>>>>>> adjust headers styles on general and specific cases  
142 color: inherit; 138 color: inherit;
143 font-family: Arial; 139 font-family: Arial;
144 font-weight: 700; 140 font-weight: 700;
1 name: "Software Público" 1 name: "Software Público"
2 layout: "application-ng" 2 layout: "application-ng"
3 -icon_theme: []