Download as
Browse Code »

Commit 1d55984a535ece1a6f6d45d64c598260559f191c

Authored by Juliana
2 parents 35985907 5ec333c2
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 47 additions and 13 deletions   Show diff stats
page-inicial.css
  Diff comments   View file @1d55984
... ... @@ -32,6 +32,7 @@
32 32 padding:5px 20px;
33 33 text-transform: uppercase;
34 34 font-weight: bold;
  35 + font-size: 14px;
35 36 }
36 37  
37 38 #search-catalog-footer{
... ... @@ -169,18 +170,31 @@
169 170  
170 171 .box-1 .software-block-finality,
171 172 .box-1 .software-block-content {
172   - padding-top:20px;
  173 + padding-bottom: 20px;
173 174 }
174   -.software-block-finality{
  175 +.software-block-finality {
175 176 background-color:#f4f4f4;
176   - padding:10px;
177   - border-radius:8px;
178   - width:120px;
  177 + /*padding:10px;*/
  178 + border-radius: 8px;
  179 + width:155px;
  180 + height: 185px;
  181 + border: solid 1px #D7D7D7;
  182 + left:0px;
  183 +}
  184 +
  185 +.software-block-finality p {
  186 + padding: 10px;
  187 + height: 120px;
  188 + overflow: hidden;
  189 +}
  190 +
  191 +.software-block-finality a {
  192 + padding: 0 10px;
179 193 }
180 194  
181 195 .software-block-logo {
182 196 border: 1px solid #ccc;
183   - border-radius: 4px;
  197 + border-radius: 8px;
184 198 /*padding: 20px;*/
185 199 }
186 200  
... ... @@ -270,11 +284,30 @@ margin: -10px 0px 10px 20px; /*-20px 20px;
270 284 display:none;
271 285 }
272 286  
  287 +#content .box-1 .software-block {
  288 + margin: 0px 0px 14px 0px;
  289 + width: 160px;
  290 +}
  291 +
  292 +#content .software-block-info {
  293 + height: 85px;
  294 + overflow: hidden;
  295 +}
  296 +
  297 +#content .software-block-info h3 {
  298 + font-size: 14px;
  299 + font-family: "open_sansregular", Arial, Helvetica, sans-serif;
  300 + color: #2C66CE;
  301 +}
  302 +
  303 +#content .block.display-content-block .block-title,
  304 +#content .block.softwares-block .block-title {
  305 + margin: 0px 0px 25px 0px;
  306 +}
273 307  
274 308 /* Bloco de notícias (Display contents) */
275 309  
276 310 #content .block.display-content-block .block-title {
277   - margin: 0px 0px 0px 0px;
278 311 border-top: 4px solid #643C67;
279 312 background: #eee;
280 313 color: #643C67;
... ...
style.css
  Diff comments   View file @1d55984
... ... @@ -138,7 +138,7 @@ vertical-align: baseline;
138 138 /* */
139 139 body {
140 140 background-color: #fff;
141   - color: #000000;
  141 + color: #172938;
142 142 font-size: 12px;
143 143 font-family: "open_sansregular", Arial, Helvetica, sans-serif;
144 144 }
... ... @@ -434,7 +434,7 @@ p {
434 434 font-size: 12px;
435 435 text-align: left;
436 436 border-bottom: none;
437   - padding: 8px 8px 24px 10px;
  437 + padding: 8px 8px 22px 10px;
438 438 text-transform: uppercase;
439 439 font-family: "open_sansbold", Arial, Helvetica, sans-serif;
440 440 font-variant: normal;
... ... @@ -497,11 +497,12 @@ p {
497 497 #content .search-catalog-block #search-catalog-footer a {
498 498 display: block;
499 499 color: #FFF;
500   - padding: 8px;
  500 + padding: 10px;
501 501 }
502 502  
503 503 #content .search-catalog-block #search-catalog-footer p {
504 504 margin: 0px;
  505 + font-size: 11px;
505 506 }
506 507  
507 508 #content .search-catalog-block #search-catalog-footer a:hover {
... ... @@ -573,7 +574,7 @@ p {
573 574 color: #2C66CE; /*#454545;*/
574 575 font-weight: normal;
575 576 width: auto;
576   - font-size: 15px;
  577 + font-size: 14px;
577 578 padding-left: 18px;
578 579 padding-right: 5px;
579 580 background-position: 0px 50%;
... ... @@ -703,8 +704,8 @@ p {
703 704 }
704 705  
705 706 .block-outer {
706   - margin-top: 2em;
707   - clear: both;
  707 + margin-top: 45px;
  708 + clear: both;
708 709 }
709 710  
710 711 .box-1 .block,
... ...