Download as
Browse Code »

Commit b1eb09460a698549c0142cfac072362174fbce1a

Authored by Juliana
2 parents 60f52263 fec8afa2
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 gitlab.com:softwarepublico/noosfero-spb-theme

Showing 2 changed files with 29 additions and 0 deletions   Show diff stats
css/article-page.css
  Diff comments   View file @b1eb094
@@ -28,13 +28,37 @@ @@ -28,13 +28,37 @@
28 line-height: 21px; 28 line-height: 21px;
29 } 29 }
30 30
  31 +#content #article-parent{
  32 + margin: 0px 0px 10px 0;
  33 + font-style: normal;
  34 + text-align: left;
  35 +}
  36 +
31 #content #article-parent a.button.with-text{ 37 #content #article-parent a.button.with-text{
  38 + height: 18px;
  39 + padding: 5px;
32 background-color: #3E67B1; 40 background-color: #3E67B1;
33 color: #FFF; 41 color: #FFF;
  42 + border-radius: 4px;
  43 + border: 1px solid #3E67B1;
  44 + font-size: 12px;
  45 + line-height: 18px;
  46 + text-transform: none;
34 } 47 }
35 48
36 #content #article-parent a.button.with-text:hover{ 49 #content #article-parent a.button.with-text:hover{
37 background-color: #5E82C6; 50 background-color: #5E82C6;
  51 + border-color: #5E82C6;
  52 +}
  53 +
  54 +#content #article-parent a.button.with-text::before{
  55 + content: "\f053";
  56 + font-family: FontAwesome;
  57 + padding-right: 4px;
  58 + padding-left: 2px;
  59 + color: #ffffff;
  60 + border-radius: 4px;
  61 + text-align: center;
38 } 62 }
39 63
40 /* Need a dev solution - blog internal pages*/ 64 /* Need a dev solution - blog internal pages*/
@@ -123,6 +147,7 @@ @@ -123,6 +147,7 @@
123 /*** Tags ***/ 147 /*** Tags ***/
124 148
125 #content .main-block #article-tags{ 149 #content .main-block #article-tags{
  150 + display: none; /* wait to fix label */
126 width: 100%; 151 width: 100%;
127 color: #5E82C6; 152 color: #5E82C6;
128 border-bottom: 1px solid #D3D6DE; 153 border-bottom: 1px solid #D3D6DE;
css/main-content.css
  Diff comments   View file @b1eb094
@@ -107,6 +107,10 @@ @@ -107,6 +107,10 @@
107 text-transform: none; 107 text-transform: none;
108 } 108 }
109 109
  110 +#content #article-actions a.button.with-text span{
  111 + padding: 0;
  112 +}
  113 +
110 .action-profile-members #content .button-bar a.button.with-text{ 114 .action-profile-members #content .button-bar a.button.with-text{
111 height: auto; 115 height: auto;
112 border: 1px solid #D3D6DE; 116 border: 1px solid #D3D6DE;