Commit 6536fc8b3fe25c9ab9709b1e374d4c1821a291fc

Authored by Carlos Coêlho
1 parent 43f44ed1
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

Footer alignment

Signed-off-by: Carlos Oliveira <carlospecter@gmail.com>
Signed-off-by: Peter Lima <peterlima@gmail.com>
src/colab_spb_theme/static/css/footer.css
1 /*Footer*/ 1 /*Footer*/
2 2
3 #btn-top { 3 #btn-top {
4 - min-width: 960px;  
5 - max-width: 960px;  
6 - padding-right: 0px; 4 + min-width: 960px;
  5 + max-width: 960px;
  6 + padding-right: 0px;
  7 + margin-bottom: 22px;
  8 + text-decoration: none;
  9 + font-family: 'open_sansregular', Arial, Helvetica, sans-serif;
  10 + font-size: 14px;
  11 + position: relative;
7 } 12 }
8 13
  14 +#btn-top a {
  15 + padding-left: 20px;
  16 + background: url("../img/voltar-topo.png") no-repeat left center;
  17 + color: #777;
  18 + font-size: 14px;
  19 +}
9 20
10 #footer { 21 #footer {
11 padding: 4px 0 20px 0; 22 padding: 4px 0 20px 0;
@@ -61,7 +72,7 @@ @@ -61,7 +72,7 @@
61 72
62 #doormat-container .doormatColumn { 73 #doormat-container .doormatColumn {
63 float: left; 74 float: left;
64 - margin: 0 1em; 75 + margin: 0 1.1em 0 0.8em;
65 text-align: left; 76 text-align: left;
66 } 77 }
67 78
@@ -76,16 +87,13 @@ @@ -76,16 +87,13 @@
76 #extra-footer p { 87 #extra-footer p {
77 margin: 1em auto; 88 margin: 1em auto;
78 max-width: 960px; 89 max-width: 960px;
  90 + font-size: 12px;
79 } 91 }
80 92
81 #footer .clear { 93 #footer .clear {
82 clear: both; 94 clear: both;
83 } 95 }
84 96
85 -.go-top{  
86 - font-size: 13px;  
87 - height: 2em;  
88 -}  
89 97
90 .go-top a{ 98 .go-top a{
91 color: #717782; 99 color: #717782;
@@ -95,5 +103,9 @@ @@ -95,5 +103,9 @@
95 .go-top i { 103 .go-top i {
96 margin-right: 5px; 104 margin-right: 5px;
97 text-decoration: none; 105 text-decoration: none;
98 - font-size: 12px; 106 + font-size: 12px;
  107 +}
  108 +
  109 +html footer div#wrapper-footer-brasil {
  110 + padding: 0;
99 } 111 }
src/colab_spb_theme/templates/footer.html
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <footer> 4 <footer>
5 <div id="btn-top" class="container"> 5 <div id="btn-top" class="container">
6 <div class="pull-right go-top"> 6 <div class="pull-right go-top">
7 - <a id="link-top" href="#link-rodape"><i class="fa fa-chevron-up"></i>Voltar ao topo</a> 7 + <a id="link-top" href="#link-rodape">Voltar para o topo</a>
8 </div> 8 </div>
9 </div> 9 </div>
10 <div id="footer" role="contentinfo"> 10 <div id="footer" role="contentinfo">
@@ -88,8 +88,11 @@ @@ -88,8 +88,11 @@
88 </div> 88 </div>
89 <div id="extra-footer"> 89 <div id="extra-footer">
90 <p> 90 <p>
91 - Desenvolvido com o CMS de código aberto  
92 - <a href="#"></a> 91 + Desenvolvido com os projetos de software livre
  92 + <a href="http://github.com/colab/colab">Colab</a>,
  93 + <a href="http://gitlab.com">Gitlab</a>,
  94 + <a href="http://www.gnu.org/software/mailman/">Mailman</a> e
  95 + <a href="http://noosfero.org">Noosfero</a>
93 </p> 96 </p>
94 </div> 97 </div>
95 </footer> 98 </footer>