Download as
Browse Code »

Commit 46140a9b6dd9c00111d58512cd680d1c1e6601df

Authored by Pedro de Lyra Pereira
2 parents 71059f9e c59d9b4d
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 3 changed files with 19 additions and 25 deletions   Show diff stats
page-catalog-software.css
  Diff comments   View file @46140a9
1 1 /*controller-search action-search-software_infos template-default webkit*/
2 2  
3   -.action-search-software_infos br {
4   - display:none;
  3 +.action-search-software_infos .org {
  4 + display:none !important;
5 5 }
6 6  
7 7 .action-search-software_infos .org {
... ... @@ -16,6 +16,7 @@
16 16 border: none;
17 17 box-shadow: none;
18 18 }
  19 +
19 20 .action-search-software_infos input[type="checkbox"]{
20 21 vertical-align:sub;
21 22 }
... ... @@ -76,6 +77,7 @@
76 77 .search-form #search-subheader{
77 78 padding-left: 14px;
78 79 }
  80 +
79 81 .search-form #search-header #search-filters{
80 82 float: left !important;
81 83 padding-left: 14px;
... ... @@ -89,8 +91,8 @@
89 91 border-bottom: 1px solid #ccc !important;
90 92 }
91 93  
92   -#search-input {
93   - width:95% !important;
  94 +.action-search-software_infos #search-input {
  95 + width:96%;
94 96 font-size:110%;
95 97 margin: 4px 0px 0px 13px;
96 98 border-radius: 4px;
... ... @@ -222,21 +224,13 @@
222 224 font-family:Arial;
223 225 font-size: 14px;
224 226 }
  227 +
225 228 .action-search-software_infos #group-categories label span {
226 229 font-family:Arial;
227 230 font-size: 14px;
228 231 }
229 232  
230   -.action-search-software_infos #group-categories br {
231   - display:inline;
232   -}
233   -
234   -.project-software span{
235   - margin-left: 5px;
236   - color:transparent;
237   -}
238   -.project-software span:before {
239   - content:"?";
  233 +.project-software span {
240 234 border-radius: 50%;
241 235 font-size: 16px;
242 236 padding: 2px 6px;
... ...
style.css
  Diff comments   View file @46140a9
... ... @@ -3309,11 +3309,10 @@ input[type=checkbox] {
3309 3309 border-radius: 90%;
3310 3310 font-size: 12px;
3311 3311 font-weight: 700;
3312   - background: #5E82C6;
  3312 + background: #3867b7;
3313 3313 color: #fff;
3314 3314 margin-left: 4px;
3315   - padding: 0px 5px 0px 6px;
3316   - cursor: pointer;
  3315 + padding: 0px 6px;
3317 3316 }
3318 3317  
3319 3318 /* IMAGEM DE REFERÊNCIA
... ... @@ -3438,4 +3437,4 @@ input[type=checkbox] {
3438 3437  
3439 3438 #content .main-content .tiny-mce-article .article-body-tiny-mce-article p a {
3440 3439 color: #2c66ce;
3441   -}
3442 3440 \ No newline at end of file
  3441 +}
... ...
theme.js
  Diff comments   View file @46140a9
... ... @@ -136,15 +136,16 @@ $('#link-buscar').click(function(e) {
136 136  
137 137 /* Finds all uploaded files from manuals page and sets its names on the right format */
138 138 function set_uploaded_files_names() {
139   - var article = document.getElementById('article');
140   - if(article != null){
  139 + try {
  140 + var article = document.getElementById('article');
141 141 var folderList = article.getElementsByClassName('folder-content')[0];
142   - if(folderList != null){
143   - var folderItens = folderList.getElementsByClassName('item-description');
144   - for(var i = 0; i < folderItens.length; i++) {
145   - split_file_extension(folderItens[i].getElementsByTagName('a')[0]);
146   - }
  142 + var folderItens = folderList.getElementsByClassName('item-description');
  143 +
  144 + for(var i = 0; i < folderItens.length; i++) {
  145 + split_file_extension(folderItens[i].getElementsByTagName('a')[0]);
147 146 }
  147 + } catch(e) {
  148 +
148 149 }
149 150 }
150 151  
... ...