Commit
467bd6b237740e50437c99a0466290e93376904f
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 'header_fix' into 'master'
Header fix
See merge request !116
| @@ -113,6 +113,7 @@ |
| @@ -113,6 +113,7 @@ |
113
| </div> |
113
| </div> |
114
| </div> |
114
| </div> |
115
| </div> |
115
| </div> |
| |
116
| +</header> |
116
| |
117
| |
117
| {% block main_content %} |
118
| {% block main_content %} |
118
| <a name="acontent" id="acontent"></a> |
119
| <a name="acontent" id="acontent"></a> |
| @@ -161,6 +161,7 @@ |
| @@ -161,6 +161,7 @@ |
161
| </div> |
161
| </div> |
162
| </div> |
162
| </div> |
163
| </div> |
163
| </div> |
| |
164
| +</header> |
164
| |
165
| |
165
| {% block main_content %} |
166
| {% block main_content %} |
166
| <a name="acontent" id="acontent"></a> |
167
| <a name="acontent" id="acontent"></a> |