Download as
Browse Code »

Commit e4bb0c3bcdb2d29bdd02abce2afdf050c709c505

Authored by Juliana
2 parents fbf847a1 fc2f3996
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 'r4' of portal.softwarepublico.gov.br:softwarepublico/noosfero-spb-theme into r4 

Conflicts:
	css/community-pages.css
Showing 5 changed files with 89 additions and 17 deletions   Show diff stats
css/software-pages.css
  Diff comments   View file @e4bb0c3
... ... @@ -273,24 +273,32 @@
273 273 font-weight: bold;
274 274 }
275 275  
276   -/* Repository block */
  276 +/* Repository and Wiki blocks */
  277 +
  278 +.template-default #content .box-3 .wiki-block,
277 279 .template-default #content .box-3 .repository-block{
278 280 padding: 0 0 0 10px;
279 281 }
280 282  
281   -.template-default .box-3 #bt_repositorio,
282   -.template-default .box-3 #bt_repositorio:active,
283   -.template-default .box-3 #bt_repositorio:visited{
  283 +.template-default .box-3 #bt_wiki,
  284 +.template-default .box-3 #bt_repositorio {
284 285 border-radius: 4px;
285 286 padding: 12px 10px;
286 287 background: #EAEBEE;
  288 + color: #2C66CE;
287 289 font: normal normal bold 12px 'open_sansbold', arial, helvetica, sans-serif;
288 290 text-transform: uppercase;
289 291 display: block;
290 292 position: relative;
291 293 }
292 294  
293   -.template-default .box-3 #bt_repositorio::after{
  295 +.template-default .box-3 #bt_wiki:hover,
  296 +.template-default .box-3 #bt_repositorio:hover {
  297 + color:#172738;
  298 +}
  299 +
  300 +.template-default .box-3 #bt_wiki:after,
  301 +.template-default .box-3 #bt_repositorio:after{
294 302 margin-top: -2px;
295 303 padding: 4px 0px 4px 2px;
296 304 border-radius: 4px;
... ... @@ -305,6 +313,7 @@
305 313 content: url('../images/right-arrow.png');
306 314 }
307 315  
  316 +.template-default .box-3 #content #bt_wiki:hover,
308 317 .template-default .box-3 #content #bt_repositorio:hover{
309 318 color: #FFF;
310 319 background: #2C66CE;
... ... @@ -377,6 +386,7 @@
377 386 }
378 387  
379 388 /* Repository block */
  389 +
380 390 .template-lefttopright #content .box-2 .repository-block{
381 391 padding: 0 0 0 10px;
382 392 }
... ... @@ -416,6 +426,68 @@
416 426  
417 427 /*** WARNING - WITH BOX-4 ***/
418 428  
  429 +/* Metrics Block */
  430 +.software-metrics-block {
  431 + font-family: Arial;
  432 + padding: 3px 0px 0px 10px;
  433 +}
  434 +
  435 +.software-metrics-block .metrics-list {
  436 + border-bottom: 1px dotted #D3D6DE;
  437 +}
  438 +
  439 +.software-metrics-block .metrics-list li {
  440 + display: table;
  441 + margin-bottom: 10px;
  442 +}
  443 +
  444 +.software-metrics-block .metrics-list li span,
  445 +.software-metrics-block .metrics-list li a {
  446 + display: table-cell;
  447 + vertical-align: top;
  448 +}
  449 +
  450 +.software-metrics-block .metrics-list li a:link {
  451 + color: #2c66ce !important;
  452 +}
  453 +
  454 +.software-metrics-block span.arrow-globe-icon {
  455 + content: url('../images/arrow-globe-icon.png');
  456 + padding-right: 5px;
  457 +}
  458 +
  459 +.software-metrics-block span.downloads-icon {
  460 + content: url('../images/downloads-icon.png');
  461 + padding-right: 14px;
  462 + padding-left: 1px;
  463 +}
  464 +
  465 +.software-metrics-block span.face-icon {
  466 + content: url('../images/beneficiados-icon.png');
  467 + padding-right: 14px;
  468 + padding-left: 1px;
  469 +}
  470 +
  471 +.software-metrics-block span.pig-safe-icon {
  472 + content: url('../images/economizados-icon.png');
  473 + padding-right: 11px;
  474 +}
  475 +
  476 +.software-metrics-block .metrics-list li a {
  477 + letter-spacing: -0.1px;
  478 +}
  479 +
  480 +.software-metrics-block .admin-estimation {
  481 + font-size: 11px;
  482 + line-height: 15px;
  483 + margin-top: 7px;
  484 + margin-left: 4px;
  485 +}
  486 +
  487 +.software-metrics-block .metrics-list .saved-money {
  488 + font-size: 14px;
  489 +}
  490 +
419 491 /*** end of right bar ***/
420 492  
421 493 /************ END DUPLICATE ************/
... ...
css/use-report.css
  Diff comments   View file @e4bb0c3
1 1 /*** Profile homepage ***/
2 2  
3 3 /* Ratings Header */
4   -.profile-homepage #content .community-average-rating-container{
  4 +.profile-homepage #content .community-average-rating-container {
5 5 margin-top: 21px;
6 6 overflow: auto;
7 7 }
8 8  
9   -.profile-homepage #content .community-average-rating-container .star-rate-text{
  9 +.profile-homepage #content .community-average-rating-container .star-rate-text {
10 10 font-size: 14px;
11 11 letter-spacing: 0.2px;
12 12 margin-right: 5px;
13 13 padding: 4px 0px 0px 3px;
14 14 }
15 15  
16   -.profile-homepage #content .community-average-rating-container .star-container{
  16 +.profile-homepage #content .community-average-rating-container .star-container {
17 17 margin-top: 2px;
18 18 }
19 19  
20   -.profile-homepage #content .community-average-rating-container .rate-this-community{
  20 +.profile-homepage #content .community-average-rating-container .rate-this-community {
21 21 font-size: 14px;
22 22 text-decoration: underline;
23 23 margin: 4px 0px 0px 6px;
24 24 padding: 0px 0px 0px 15px;
25 25 }
26 26  
27   -.profile-homepage #content .community-average-rating-container .rate-this-community a{
  27 +.profile-homepage #content .community-average-rating-container .rate-this-community a {
28 28 color: #2c66ce;
29 29 }
30 30  
31 31 .profile-homepage #content .community-average-rating-container .star-container .medium-star-negative,
32   -.profile-homepage #content .community-average-rating-container .star-container .medium-star-positive{
  32 +.profile-homepage #content .community-average-rating-container .star-container .medium-star-positive {
33 33 margin-right: 3px;
34 34 }
35 35  
36   -.profile-homepage #content .communities-ratings-block .button-bar a.button.with-text{
  36 +.profile-homepage #content .communities-ratings-block .button-bar a.button.with-text {
37 37 height: 32px;
38 38 padding: 0px 5px;
39 39 border: 1px solid #3E67B1;
... ... @@ -265,14 +265,14 @@
265 265 }
266 266  
267 267 #content .star-rate-form .star-comment-container .comments-software-extra-fields .comments-software-people-benefited,
268   -#content .star-rate-form .star-comment-container .comments-software-extra-fields .comments-software-saved-values{
  268 +#content .star-rate-form .star-comment-container .comments-software-extra-fields .comments-software-saved-values {
269 269 font-size: 12px;
270 270 float: left;
271 271 padding-right: 10px;
272 272 height: 50px;
273 273 }
274 274  
275   -#content .star-rate-form .star-comment-container .comments-software-extra-fields .comments-software-saved-values{
  275 +#content .star-rate-form .star-comment-container .comments-software-extra-fields .comments-software-saved-values {
276 276 padding-right: 0px;
277 277 height: 70px;
278 278 }
... ... @@ -307,15 +307,15 @@
307 307 padding-right: 6px;
308 308 }
309 309  
310   -.action-communities_ratings_plugin_profile-new_rating #content .star-rate-form .star-comment-container .comments-display-fields .comments-arrow-down::after{
  310 +.action-communities_ratings_plugin_profile-new_rating #content .star-rate-form .star-comment-container .comments-display-fields .comments-arrow-down::after {
311 311 content: url('../images/bottom-arrow-black.png');
312 312 float: right;
313 313 padding-top: 7px;
314 314 padding-right: 6px;
315 315 }
316 316  
317   -#content .star-rate-form .star-comment-container .comments-software-extra-fields #comments_people_benefited,
318   -#content .star-rate-form .star-comment-container .comments-software-extra-fields #comments_saved_value {
  317 +#content .star-rate-form .star-comment-container .comments-software-extra-fields #community_rating_people_benefited,
  318 +#content .star-rate-form .star-comment-container .comments-software-extra-fields #community_rating_saved_value {
319 319 display: block;
320 320 height: 19px;
321 321 width: 155px;
... ...
images/beneficiados-icon.png 0 → 100644
View file @e4bb0c3

895 Bytes
images/downloads-icon.png 0 → 100644
View file @e4bb0c3

609 Bytes
images/economizados-icon.png 0 → 100644
View file @e4bb0c3

517 Bytes