Commit 1c793ff71eeccd0ee735ad37dd0b64fc65adc472

Authored by Pedro de Lyra Pereira
2 parents a2ec3177 27bde83c
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 1 changed file with 27 additions and 3 deletions   Show diff stats
@@ -1330,6 +1330,11 @@ input.button.with-text { @@ -1330,6 +1330,11 @@ input.button.with-text {
1330 max-height: 28px; 1330 max-height: 28px;
1331 } 1331 }
1332 1332
  1333 +#content .button.with-text span{
  1334 + font-family: "open_sansregular", Arial, Helvetica, sans-serif;
  1335 + padding-right: 0;
  1336 +}
  1337 +
1333 #content input.button, #content a.button { 1338 #content input.button, #content a.button {
1334 background-color: #EEEEEE; 1339 background-color: #EEEEEE;
1335 background-repeat: no-repeat; 1340 background-repeat: no-repeat;
@@ -3060,6 +3065,8 @@ li.folder-item:first-child { @@ -3060,6 +3065,8 @@ li.folder-item:first-child {
3060 3065
3061 #content #article_image_builder_uploaded_data { 3066 #content #article_image_builder_uploaded_data {
3062 text-indent: 2px; 3067 text-indent: 2px;
  3068 + font-size: 12px;
  3069 + height: 21px;
3063 } 3070 }
3064 3071
3065 #content #edit-article-options div div { 3072 #content #edit-article-options div div {
@@ -3067,6 +3074,10 @@ li.folder-item:first-child { @@ -3067,6 +3074,10 @@ li.folder-item:first-child {
3067 margin-bottom: 13px; 3074 margin-bottom: 13px;
3068 } 3075 }
3069 3076
  3077 +#content #edit-article-options h4 {
  3078 + font-family: "open_sansbold", Arial, Helvetica, sans-serif;
  3079 +}
  3080 +
3070 #content .formfield input, 3081 #content .formfield input,
3071 #content #edit-article-options .token-input-list li { 3082 #content #edit-article-options .token-input-list li {
3072 border: 1px solid #ccc; 3083 border: 1px solid #ccc;
@@ -3085,6 +3096,14 @@ li.folder-item:first-child { @@ -3085,6 +3096,14 @@ li.folder-item:first-child {
3085 padding-right: 0px; 3096 padding-right: 0px;
3086 } 3097 }
3087 3098
  3099 +#content #edit-article-options label{
  3100 + margin-left: 5px;
  3101 +}
  3102 +
  3103 +#content #edit-article-options input{
  3104 + margin-right: 0;
  3105 +}
  3106 +
3088 #content #content-inner #boxes #fetch-external-feed { 3107 #content #content-inner #boxes #fetch-external-feed {
3089 padding-left: 20px; 3108 padding-left: 20px;
3090 } 3109 }
@@ -3118,16 +3137,21 @@ input[type=checkbox] { @@ -3118,16 +3137,21 @@ input[type=checkbox] {
3118 margin-left: 0px; 3137 margin-left: 0px;
3119 } 3138 }
3120 3139
3121 -#content #content-inner a.lead-button { 3140 +#content #content-inner .button.icon-add.with-text.lead-button {
3122 border: 1px solid #CCCCCC; 3141 border: 1px solid #CCCCCC;
3123 - background-image: url(/assets/designs/icons/tango/Tango/16x16/actions/add.png); 3142 + background: url(/assets/designs/icons/tango/Tango/16x16/actions/add.png) no-repeat;
3124 color: #555; 3143 color: #555;
  3144 + background-position: 5px;
3125 } 3145 }
3126 3146
3127 -#content #content-inner a.lead-button:hover { 3147 +#content #content-inner .button.icon-add.with-text.lead-button:hover {
3128 background-color: #fff; 3148 background-color: #fff;
3129 } 3149 }
3130 3150
  3151 +#content #content-inner .button.icon-add.with-text.lead-button:before{
  3152 + content:"";
  3153 +}
  3154 +
3131 /******************** RELATO DE USO - AVALIAÇÃO DO USUÁRIO **********************/ 3155 /******************** RELATO DE USO - AVALIAÇÃO DO USUÁRIO **********************/
3132 3156
3133 /*.main-content { 3157 /*.main-content {