Download as
Browse Code »

Commit e2f08f021f2b12650ec2122b153742109ddb57b2

Authored by Juliana
2 parents 08bce909 f16980d1
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

Merge branch 'master' of https://gitlab.com/softwarepublico/noosfero-spb-theme

Showing 3 changed files with 76 additions and 14 deletions   Show diff stats
cabecalho-cinza-theme.css
  Diff comments   View file @e2f08f0
... ... @@ -89,7 +89,7 @@ background-repeat: no-repeat;
89 89 #logo #portal-title {
90 90 background-image: url("images/logotipo_spb_beta.svg");
91 91 background-repeat: no-repeat;
92   - background-size: 374px 78px;
  92 + background-size: 374px 56px;
93 93 height: 78px;
94 94 width: 374px;
95 95 margin: 20px 0px 10px 0px;
... ... @@ -397,6 +397,71 @@ opacity: 1;
397 397 filter: alpha(opacity=100);
398 398 }
399 399  
  400 +
  401 +
  402 +/* */
  403 +
  404 +/* Social Box */
  405 +
  406 +#social-box {
  407 + border-top: 4px solid #2c66ce;
  408 +}
  409 +
  410 +
  411 +#social-buttons a {
  412 + width: 18px;
  413 + height: 20px;
  414 + margin-right: 3px;
  415 + margin-top: 10px;
  416 +}
  417 +
  418 +#social-box li a {
  419 + width: 20px;
  420 + height: 20px;
  421 + padding: 0px;
  422 + display: inline-block;
  423 + opacity: .85;
  424 + background-repeat: no-repeat;
  425 + margin-right: 8px;
  426 +}
  427 +
  428 +#social-box li {
  429 + float: left;
  430 + margin: 8px;
  431 + padding-top: 10px;
  432 + vertical-align: middle;
  433 +}
  434 +
  435 +#sb_face,
  436 +#sb_tweet,
  437 +#sb_youtb,
  438 +#sb_flickr {
  439 + background: url(images/icones_home_branco.jpg) 0px;
  440 +
  441 +}
  442 +
  443 +#social-box span { display: none; }
  444 +
  445 +#sb_flickr {
  446 +background-position: -100px;
  447 +}
  448 +
  449 +#sb_face {
  450 +background-position: -12px;
  451 +}
  452 +#sb_tweet {
  453 +background-position: -42px;
  454 +}
  455 +#sb_youtb {
  456 + background-position: -71px;
  457 +}
  458 +
  459 +#social-box a:focus,
  460 +#social-box a:hover {
  461 +opacity: 1;
  462 +filter: alpha(opacity=100);
  463 +}
  464 +
400 465 /*
401 466  
402 467 #social-icons #sb_face {
... ... @@ -738,9 +803,11 @@ text-decoration:underline
738 803 footer .container-menus {
739 804 /*padding:46px 0 0 0*/
740 805 }
  806 +
741 807 footer .row {
742   -margin-bottom: 46px; /*13px*/
  808 + margin-bottom: 20px;
743 809 }
  810 +
744 811 footer nav {
745 812 border-left:1px dotted #2c66ce; /*#555;*/ /*#dbdbc8;*/
746 813 padding:0 5px 0 10px
... ... @@ -751,7 +818,7 @@ font-weight:bold;
751 818 color: #2c66ce; /*#3b3f44;*/
752 819 line-height:1.3em;
753 820 padding: 0px; /*30px 0 0px 0;*/
754   -margin: 0 0 18px 0;
  821 +margin: 0 0 8px 0;
755 822 }
756 823  
757 824 footer nav ul {
... ...
footer.html.erb
  Diff comments   View file @e2f08f0
... ... @@ -82,17 +82,9 @@
82 82 <span class="hide">Fim da navegação de rodapé</span>
83 83 </div>
84 84 <!-- fim .row -->
85   - <!-- </div>
  85 + </div>
86 86 <!-- fim .container2 -->
87   - <div class="footer-logos">
88   - <!-- <div class="container2">
89   - <a href="http://www.acessoainformacao.gov.br/" class="logo-acesso pull-left"><img src="{{ STATIC_URL }}img/acesso-a-informacao.png" alt="Acesso a Informação"></a> -->
90   - <!-- separador para fins de acessibilidade -->
91   - <span class="hide">&nbsp;</span>
92   - <!-- fim separador para fins de acessibilidade -->
93   - <!-- <a href="http://www.brasil.gov.br/" class="brasil pull-right"><img src="{{ STATIC_URL }}img/brasil.png" alt="Brasil - Governo Federal"></a> -->
94   - </div>
95   - </div>
  87 +
96 88  
97 89 <div class="footer-atalhos visible-phone">
98 90 <div class="container2">
... ...
style.css
  Diff comments   View file @e2f08f0
... ... @@ -1112,7 +1112,9 @@ div#article-parent {
1112 1112 .pagination .prev_page{margin-right: 0.5em; font-weight: bold;}
1113 1113 .pagination .next_page{margin-left: 0.5em; font-weight: bold;}
1114 1114  
1115   -
  1115 +#profile-header {
  1116 + position: absolute; /* Corrige link de login */
  1117 +}
1116 1118  
1117 1119 #public-profile-search, #profile-search-results form, .profile-search-block form {
1118 1120 background-color: transparent;
... ... @@ -1121,6 +1123,7 @@ div#article-parent {
1121 1123 #public-profile-search .search-field .formfield {
1122 1124 float: left;
1123 1125 }
  1126 +
1124 1127 #public-profile-search .search-field .formfield input {
1125 1128 margin-top: 0px;
1126 1129 }
... ...