Download as
Browse Code »

Commit fd30e6ed5c97b5fa89eb13b85159dc32f094c578

Authored by Sidney Ricardo
2 parents 52aa6538 fba56313
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

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

Showing 2 changed files with 6 additions and 5 deletions   Show diff stats
cabecalho-cinza-theme.css
  Diff comments   View file @fd30e6e
... ... @@ -477,7 +477,7 @@ color:#000000;
477 477  
478 478 /************* Bar Psocial Style - Menu Horizontal**************/
479 479 #user{
480   - top: -53px;
  480 + top: -60px; /*-53px;*/
481 481 font-size: 12px;
482 482 /*right: 10px;*/
483 483 }
... ... @@ -495,10 +495,11 @@ color:#000000;
495 495 display: block;
496 496 background:url("images/barra-menu-user-bg.png") repeat-x bottom center #FEFEFE;
497 497 display: block;
498   - padding: 1em;
  498 + padding-top:1em;
499 499 text-align: left;
500 500 width: 130px;
501 501 border-radius: 10px
  502 +
502 503 }
503 504  
504 505 #user .logged-in:hover {
... ...
style.css
  Diff comments   View file @fd30e6e
... ... @@ -361,7 +361,7 @@ p {
361 361 font-size: 12px;
362 362 text-align: left;
363 363 border-top: 4px solid #757575;
364   - background: #eeefff;
  364 + background: #eee; /*#eeefff;*/
365 365 border-bottom: none;
366 366 color: #757575;
367 367 padding: 8px 8px 24px 10px;
... ... @@ -406,7 +406,7 @@ p {
406 406 }
407 407  
408 408 #content .recent-documents-block li {
409   - background: none repeat scroll 0 0 #EEEFFF;
  409 + background: none repeat scroll 0 0 #FFF;
410 410 border-bottom: 1px solid #CCCCCC;
411 411 display: block;
412 412 margin: 0;
... ... @@ -933,7 +933,7 @@ display: none;
933 933 #content {
934 934 left: -480px;
935 935 margin-left: 50%;
936   - margin-top: 30px;
  936 + margin-top: 38px; /*30px;*/
937 937 position: relative;
938 938 width: 960px;
939 939 }
... ...