Download as
Browse Code »

Commit 7a1c5fc6beab93f8d1028509a08f07dca4c91330

Authored by Juliana
2 parents 81fe0b7c c9b64d93
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 94 additions and 13 deletions   Show diff stats
page-inicial.css
  Diff comments   View file @7a1c5fc
... ... @@ -174,6 +174,7 @@ text-align: center;
174 174 .box-1 .softwares-block .common-profile-list-block span {
175 175 margin-top:40px;
176 176 width:110px;
  177 + color: #2c66ce;
177 178 }
178 179  
179 180 .box-1 .softwares-block .common-profile-list-block .org{
... ... @@ -217,6 +218,73 @@ margin: -10px 0px 10px 20px; /*-20px 20px;
217 218 display:none;
218 219 }
219 220  
  221 +
  222 +/* Bloco de notícias (Display contents) */
  223 +
  224 +#content .block.display-content-block .block-title {
  225 + margin: 0px 0px 0px 0px;
  226 + border-top: 4px solid #643C67;
  227 + background: #eee;
  228 + color: #643C67;
  229 +}
  230 +
  231 +.block.display-content-block li {
  232 + min-height: 120px;
  233 + border-top: 1px solid #eee;
  234 + padding-top: 15px;
  235 +}
  236 +
  237 +.block.display-content-block li:first-child {
  238 + border-top: 0px solid #eee;
  239 +}
  240 +
  241 +.block.display-content-block .image {
  242 + width: 100px;
  243 + height: 90px;
  244 + position: absolute;
  245 + margin-top: 35px;
  246 +}
  247 +
  248 +.block.display-content-block .image img {
  249 + max-width: 150px;
  250 + max-height: 90px;
  251 + border: 1px solid #c0c1c1;
  252 + border-radius: 8px;
  253 +}
  254 +
  255 +.block.display-content-block .published-at {
  256 + padding-bottom: 15px;
  257 + color: #643C67;
  258 +}
  259 +
  260 +.block.display-content-block .title {
  261 + padding-left: 160px;
  262 + padding-right: 0px;
  263 +}
  264 +
  265 +.block.display-content-block .title a {
  266 + font-size: 16px;
  267 + font-family: Arial, Helvetica, sans-serif;
  268 + line-height: 1.3em;
  269 + color: #172938
  270 +}
  271 +
  272 +.block.display-content-block .lead {
  273 + padding-left: 160px;
  274 + padding-right: 0px;
  275 +}
  276 +
  277 +.block.display-content-block .lead p {
  278 + font-size: 15px;
  279 + font-family: Arial;
  280 + line-height: 1.3em;
  281 +}
  282 +
  283 +.block.display-content-block .read_more, .block.display-content-block .tags {
  284 + display: none;
  285 +}
  286 +
  287 +
220 288 /*
221 289 .menu-submenu down{
222 290  
... ... @@ -225,4 +293,4 @@ margin: -10px 0px 10px 20px; /*-20px 20px;
225 293 .menu-submenu-content,
226 294 .menu-submenu-footer {
227 295  
228   -}*/
229 296 \ No newline at end of file
  297 +}*/
... ...
style.css
  Diff comments   View file @7a1c5fc
... ... @@ -390,6 +390,10 @@ p {
390 390 display: inline-block;
391 391 }
392 392  
  393 +.block a:hover {
  394 + text-decoration: none;
  395 +}
  396 +
393 397 .box-1 {
394 398 /* display: inline-block;*/
395 399 /*width: 490px;*/
... ... @@ -428,6 +432,7 @@ p {
428 432 text-transform: uppercase;
429 433 font-family: "open_sansbold", Arial, Helvetica, sans-serif;
430 434 font-variant: normal;
  435 + margin: 0px 0px 2px 0px;
431 436 }
432 437  
433 438 #content .box .read-more {
... ... @@ -511,6 +516,14 @@ p {
511 516 margin-bottom: 0;
512 517 }
513 518  
  519 +#content .link-list-block li a {
  520 + line-height: 30px;
  521 +}
  522 +
  523 +#content .link-list-block h3.empty + ul {
  524 + border-top: 1px solid #ddd;
  525 +}
  526 +
514 527 #content .link-list-block li {
515 528 border-bottom: 1px solid #ddd;
516 529 border-top: none;
... ... @@ -522,17 +535,16 @@ p {
522 535 #content .link-list-block li a {
523 536 background-color: #fff;
524 537 /*border-bottom: 1px solid #64946E !important;*/
525   - border-bottom: 1px solid #ccc !important;
526 538 border-radius: 0 0 0 0;
527 539 border-right: medium none;
528 540 border-top: 0px solid #64946E !important;
529   - color: #454545; /*#436976;*/
  541 + color: #2C66CE; /*#454545;*/
530 542 font-weight: normal;
531 543 width: auto;
532   - font-size: 12px;
533   - padding-left: 30px;
  544 + font-size: 15px;
  545 + padding-left: 18px;
534 546 padding-right: 5px;
535   - background-position: 7px 50%;
  547 + background-position: 0px 50%;
536 548 }
537 549  
538 550 #content .link-list-block li a.link-this-page,
... ... @@ -542,27 +554,28 @@ p {
542 554 }
543 555  
544 556  
545   -#content .box-2 .link-list-block li a:hover {
546   - background-color: #eee;
  557 +#content .box .link-list-block li a:hover {
  558 + background-color: #FFFFFF;
547 559 color: #000;
548 560 }
549 561  
550   -#content .box-2 .link-list-block li a.link-this-page {
  562 +#content .box .link-list-block li a.link-this-page {
551 563 background-color: #ffffff; /*#EEEFFF;*/
552 564 font-weight: bold;
553 565 width: auto;
  566 + margin-left: 0px;
554 567 }
555 568 /* Menu List footer */
556   -
  569 +/*
557 570 #content .box-3 .block-title{
558   - margin:0;}
  571 + margin:0;
  572 +}
559 573  
560 574  
561 575 #content .box-3 .link-list-block li a.link-this-page {
562 576 width: auto;
563 577 border-right: none;
564 578 font-weight: bold;
565   - /*background-color:#eeefff;*/
566 579 border-radius: 0px;
567 580 }
568 581  
... ... @@ -586,7 +599,7 @@ p {
586 599 padding: 0;
587 600 margin: 0;
588 601 }
589   -
  602 +*/
590 603 .agenda-item a {
591 604 color: black;
592 605 }
... ...