Download as
Browse Code »

Commit 1708eff3e40c5f1cf64deb425e642b5ed4868426

Authored by Juliana
2 parents ecd74512 2f27fcaa
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 82 additions and 31 deletions   Show diff stats
page-inicial.css
  Diff comments   View file @1708eff
... ... @@ -11,22 +11,23 @@
11 11 border-bottom: none !important;
12 12 text-align: left;
13 13 margin:5px;
14   - font-family:"open_sans", Arial;
  14 + font-family:"open_sansregular", Arial;
15 15 font-weight: normal;
  16 + font-size:22px;
16 17 padding: 5px 0px 0px 0px;
17 18 }
18 19  
19   -#search-Gadget {
20   - width:95%;
21   - padding:8px;
22   - margin:5px;
23   - border-radius:4px;
  20 +#content #search-Gadget {
  21 + width: 90%;
  22 + padding: 8px;
  23 + margin: 0 15px 9px 15px;
  24 + border-radius: 4px;
24 25 border: none;
25 26 }
26 27 .searchButton-catalog{
27 28 background-color: #1A397D; /*#193A7D;*/
28 29 color:#FFFFFF;
29   - margin:5px;
  30 + margin: 0px 0px 15px 15px;
30 31 border:1px solid #FFFFFF;
31 32 border-radius: 4px;
32 33 padding:5px 20px;
... ... @@ -50,21 +51,22 @@
50 51  
51 52 #bt_catalog-search::after {
52 53 content:'>';
53   - padding-left: 8px;
54   - padding-right: 5px;
55   - /*margin-top: -2px;*/
56   - right: 10px;
57   - width: 18px;
58   - height: 20px;
  54 + padding-left: 7px;
  55 + padding-right: 4px;
59 56 color: #172857;
60 57 background: #eee;
61 58 border-radius: 4px;
62   - font-size: 16px;
  59 + font-size: 15px;
63 60 line-height: 20px;
64 61 text-align: center;
65 62 margin-left: 5px;
  63 + position: relative;
  64 + margin-left: 5px;
  65 + top: 2px;
  66 + margin-right: 15px;
66 67 }
67 68  
  69 +
68 70 /**********************************************************/
69 71  
70 72 /*Veja mais software*/
... ... @@ -170,26 +172,52 @@
170 172  
171 173 .box-1 .software-block-finality,
172 174 .box-1 .software-block-content {
173   - padding-bottom: 20px;
  175 + padding-bottom: 32px;
174 176 }
175 177 .software-block-finality {
176 178 background-color:#f4f4f4;
177 179 /*padding:10px;*/
178 180 border-radius: 8px;
179   - width:155px;
  181 + width:142px;
180 182 height: 185px;
181 183 border: solid 1px #D7D7D7;
182 184 left:0px;
183 185 }
184 186  
185 187 .software-block-finality p {
186   - padding: 10px;
187   - height: 120px;
  188 + padding: 12px 12px 0 12px;
  189 + height: 150px;
188 190 overflow: hidden;
189 191 }
190 192  
191   -.software-block-finality a {
  193 +#content .software-block-finality a,
  194 +#content .software-block-finality a:visited,
  195 +#content .software-block-finality a:link,
  196 +#content .software-block-finality a:focus {
192 197 padding: 0 10px;
  198 + text-align: right;
  199 + color: #231F20;
  200 + text-transform: uppercase;
  201 + font-size: 10px;
  202 + display: block;
  203 + border-top: 1px solid #DDD;
  204 + padding-top: 9px;
  205 +}
  206 +
  207 +.software-block-finality a::after {
  208 + content:'>';
  209 + padding-left: 7px;
  210 + padding-right: 4px;
  211 + color: #FFF;
  212 + background: #2c65cd;
  213 + border-radius: 4px;
  214 + font-size: 15px;
  215 + line-height: 20px;
  216 + text-align: center;
  217 + margin-left: 5px;
  218 + position: relative;
  219 + margin-left: 5px;
  220 + top: 2px;
193 221 }
194 222  
195 223 .software-block-logo {
... ... @@ -206,7 +234,7 @@
206 234 .software-block-logo{
207 235 display:block;
208 236 text-align: center;
209   - width:130px;
  237 + width:140px;
210 238 height:90px;
211 239 padding-top:20px;
212 240 padding-bottom:20px;
... ... @@ -285,8 +313,16 @@ margin: -10px 0px 10px 20px; /*-20px 20px;
285 313 }
286 314  
287 315 #content .box-1 .software-block {
288   - margin: 0px 0px 14px 0px;
289   - width: 160px;
  316 + margin: 0px 26px 14px 0px;
  317 + width: 145px;
  318 +}
  319 +
  320 +/* Para que os blocos de software que ficam na borda direita fiquem sem margin-right */
  321 +#content .box-1 .software-block:nth-child(4),
  322 +#content .box-1 .software-block:nth-child(7),
  323 +#content .box-1 .software-block:nth-child(10),
  324 +#content .box-1 .software-block:nth-child(13) {
  325 + margin-right: 0px;
290 326 }
291 327  
292 328 #content .software-block-info {
... ... @@ -300,6 +336,11 @@ margin: -10px 0px 10px 20px; /*-20px 20px;
300 336 color: #2C66CE;
301 337 }
302 338  
  339 +/* Nao mostrar descricao no bloco de software */
  340 +#content .software-block-description {
  341 + display: none;
  342 +}
  343 +
303 344 #content .block.display-content-block .block-title,
304 345 #content .block.softwares-block .block-title {
305 346 margin: 0px 0px 25px 0px;
... ...
style.css
  Diff comments   View file @1708eff
... ... @@ -407,9 +407,10 @@ p {
407 407 width: 190px; /*230px;*/
408 408 }
409 409  
  410 +
410 411 .box-2 .block .block-inner-2,
411 412 .box-3 .block .block-inner-2{
412   - padding: 0 0 1em;
  413 +/* padding: 0 0 1em;*/
413 414 }
414 415  
415 416  
... ... @@ -434,7 +435,7 @@ p {
434 435 font-size: 12px;
435 436 text-align: left;
436 437 border-bottom: none;
437   - padding: 8px 8px 22px 10px;
  438 + padding: 5px 8px 18px 7px;
438 439 text-transform: uppercase;
439 440 font-family: "open_sansbold", Arial, Helvetica, sans-serif;
440 441 font-variant: normal;
... ... @@ -475,9 +476,10 @@ p {
475 476  
476 477  
477 478 #content .box-1 .block-title {
478   - font-size: 20px;
  479 + font-size: 18px;
479 480 text-transform: none;
480 481 font-family: "open_sansregular", Arial, Helvetica, sans-serif;
  482 + padding: 5px 8px 20px 10px;
481 483 }
482 484  
483 485 #content .box-1 .block-title span{
... ... @@ -487,17 +489,18 @@ p {
487 489  
488 490 /* Bloco de busca pagina inicial*/
489 491 #content .search-catalog-block h1 {
490   - padding: 10px 10px 0 10px;
  492 + margin: 0 15px 10px 15px;
  493 + padding: 10px 0 0 0;
491 494 }
492 495  
493 496 #content .search-catalog-block form {
494   - padding: 0 10px 10px 10px;
  497 +/* padding: 0 15px;*/
495 498 }
496 499  
497 500 #content .search-catalog-block #search-catalog-footer a {
498 501 display: block;
499 502 color: #FFF;
500   - padding: 10px;
  503 + padding: 5px 0px 10px 0px;
501 504 }
502 505  
503 506 #content .search-catalog-block #search-catalog-footer p {
... ... @@ -549,14 +552,21 @@ p {
549 552 }
550 553  
551 554 #content .link-list-block li a {
552   - line-height: 20px;
553   - padding:10px 0px;
  555 + line-height: 17px;
  556 + padding: 6px 0px 8px 0px;
554 557 }
555 558  
556 559 #content .link-list-block h3.empty + ul {
557 560 border-top: 1px solid #ddd;
558 561 }
559 562  
  563 +/* Menus que nao tiverem titulo, nao tem padding left e right e nao mostra os icones caso seja inserido */
  564 +#content .link-list-block h3.empty + ul li a {
  565 + padding-left: 0px;
  566 + padding-right: 0px;
  567 + background-image: none;
  568 +}
  569 +
560 570 #content .link-list-block li {
561 571 border-bottom: 1px solid #ddd;
562 572 border-top: none;
... ... @@ -704,7 +714,7 @@ p {
704 714 }
705 715  
706 716 .block-outer {
707   - margin-top: 45px;
  717 + margin-bottom: 45px;
708 718 clear: both;
709 719 }
710 720  
... ...