Commit
03752b2ab3d3e15acc9bd03919b6f5ac1ae973bd
Authored by
Juliana
Exists in
master
and in
52 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_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, header_fix, lxc_settings, margin_fix, mezuro_cookbook, refactor_download_block, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_to_rails4, stable-4.1, stable-4.2, stable-4.x, theme_header, theme_javascript_refactory, thread_dropdown, update_search_by_categories, update_software_api
Alignment posts 2,3 and 4 blog page - #437
Conflicts:
src/noosfero-spb/noosfero-spb-theme/css/news-page.css
| @@ -151,9 +151,9 @@ |
| @@ -151,9 +151,9 @@ |
151
| #content .blog .page-1 .position-2, |
151
| #content .blog .page-1 .position-2, |
152
| #content .blog .page-1 .position-3, |
152
| #content .blog .page-1 .position-3, |
153
| #content .blog .page-1 .position-4 { |
153
| #content .blog .page-1 .position-4 { |
154
| - margin: 0px 0px 0px 0px; |
| |
155
| - padding: 20px 21px 45px 0px; |
| |
156
| - height: 235px; |
154
| + margin: 0px; |
| |
155
| + padding: 20px 4.2% 5px 0px; |
| |
156
| + height: auto; |
157
| width: 30.5%; |
157
| width: 30.5%; |
158
| display: block; |
158
| display: block; |
159
| float: left; |
159
| float: left; |