Download as
Browse Code »

Commit d616b4869cc3587b1ddb8cf3c544da627745e902

Authored by Pedro de Lyra Pereira
2 parents 2cd06fe1 a1172355
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 

Conflicts:
	theme.js
Showing 2 changed files with 41 additions and 52 deletions   Show diff stats
page-catalog-software.css
  Diff comments   View file @d616b48
... ... @@ -4,15 +4,13 @@
4 4 display:none;
5 5 }
6 6  
  7 +.action-search-software_infos .org {
  8 + display:none !important;
  9 +}
  10 +
7 11 #catalog-filter{
8 12 display: none;
9 13 }
10   -.action-search-software_infos h1,
11   -.action-search-software_infos h2,
12   -.action-search-software_infos h3,
13   -.action-search-software_infos h4{
14   - background: transparent !important;
15   -}
16 14  
17 15 .action-search-software_infos .main-content {
18 16 border: none;
... ... @@ -22,7 +20,7 @@
22 20 vertical-align:sub;
23 21 }
24 22  
25   -.action-search-software_infos #content #main-content-wrapper-8 {
  23 +.action-search-software_infos #content {
26 24 padding:0px !important;
27 25 margin-top: 10px;
28 26 }
... ... @@ -40,18 +38,8 @@
40 38 font-size: 35px !important;
41 39 font-variant: normal;
42 40 }
43   -.action-search-software_infos #content #main-content-wrapper-8 h1{
44   - border-top: 4px solid #3E67B1 !important;
45   - color: #2B65cd !important;
46   - text-transform: uppercase;
47   - font-size: 16px !important;
48   - padding: 15px 0px 10px 15px;
49   - border-bottom:none !important;
50   - background-color:#eee;
51   -}
52 41  
53   -.action-search-software_infos #main-content-wrapper-8 .search-form{
54   - margin-top:-10px;
  42 +.action-search-software_infos .search-form {
55 43 background-color: #eee; /*#f1f1f1;*/
56 44 }
57 45  
... ... @@ -63,17 +51,18 @@
63 51 margin-top:28px;
64 52 }
65 53  
66   -.action-search-software_infos .search-form h3{
  54 +.action-search-software_infos #software-search-container .search-form h3{
67 55 padding:16px 0 10px 14px;
68 56 font-family:"open_sansregular", Arial, Helvetica, sans-serif;
69   - margin:0 !important;
  57 + margin:0;
70 58 font-weight:bold;
71   - font-size: 15px !important;
  59 + font-size: 15px;
72 60 }
73 61  
74 62 .search-form #search-subheader{
75 63 padding-left: 14px;
76 64 }
  65 +
77 66 .search-form #search-header #search-filters{
78 67 float: left !important;
79 68 padding-left: 14px;
... ... @@ -147,10 +136,6 @@
147 136 padding:0px;
148 137 }
149 138  
150   -.action-search-software_infos .icon-search{
151   - background-image:none !important;
152   -}
153   -
154 139 .action-search-software_infos #filter-option-catalog-software:hover {
155 140 background-color: #c7c7c7;
156 141 }
... ... @@ -213,9 +198,15 @@
213 198 border:none;
214 199 }
215 200  
216   -.action-search-software_infos #filter-catalog-software #filter-categories-option h4 {
217   - color: black !important;
218   - margin: 5px 0 10px 5px;
  201 +.action-search-software_infos #group-categories #group-catalog-01 {
  202 + float: left;
  203 + width: 50%;
  204 +}
  205 +
  206 +.action-search-software_infos #filter-catalog-software #filter-categories-catalog h4 {
  207 + color: black;
  208 + margin: 5px 0 10px 5px;
  209 + background: transparent;
219 210 }
220 211  
221 212 .project-software{
... ... @@ -263,9 +254,10 @@
263 254 padding: 0;
264 255 }
265 256  
266   -.action-search-software_infos .only-one-result-box .search-enterprise-item {
  257 +.action-search-software_infos .only-one-result-box .search-software-item {
267 258 padding: 29px 0 31px 0 !important;
268 259 background: #ffffff;
  260 + border-bottom: 1px solid #d7d7d7;
269 261 }
270 262  
271 263 .action-search-software_infos .search-results-innerbox {
... ... @@ -286,13 +278,14 @@
286 278 float:left;
287 279 }
288 280  
289   -.action-search-software_infos .search-enterprise-item-column-left{
  281 +.action-search-software_infos .search-software-item-column-left{
290 282 border-right: 1px dotted #ccc;
291 283 width: 130px;
292 284 height: 130px;
  285 + float: left;
293 286 }
294 287  
295   -.action-search-software_infos .search-enterprise-item-column-right{
  288 +.action-search-software_infos .search-software-item-column-right{
296 289 width:60%; /*440px;*/
297 290 float:left;
298 291 margin-left: 130px;
... ... @@ -311,11 +304,7 @@
311 304 border: none;
312 305 }
313 306  
314   -.action-search-software_infos .org {
315   - display:none !important;
316   -}
317   -
318   -.action-search-software_infos .search-enterprise-item-column-left .vcard img {
  307 +.action-search-software_infos .search-software-item-column-left .vcard img {
319 308 max-width: 90px;
320 309 height: auto;
321 310 margin-left:170px;
... ... @@ -350,36 +339,37 @@
350 339 float: left;
351 340 }
352 341  
353   -.action-search-software_infos .search-enterprise-item .search-enterprise-item-column-right {
  342 +.action-search-software_infos .search-software-item .search-software-item-column-right {
354 343 font-size: 15px;
355 344 padding: 0 0 0 8px;
356 345 font-family: Arial;
357 346 }
358 347  
359   -.action-search-software_infos .search-enterprise-item-column-right .search-community-content-block {
  348 +.action-search-software_infos .search-software-item-column-right .search-software-content-block {
360 349 }
361   -.action-search-software_infos .search-enterprise-item-column-right .search-community-content-block h4 a {
  350 +.action-search-software_infos .search-software-item-column-right .search-software-content-block h4 a {
362 351 color:#172938 !important;
363 352 font-size:19px !important;
364 353 }
365   -.action-search-software_infos .search-enterprise-item-column-right span b{
  354 +.action-search-software_infos .search-software-item-column-right span b{
366 355 font-weight: normal;
367 356 font-size: 13px;
368 357 }
369 358  
370   -.action-search-software_infos .search-enterprise-item-column-right span b:last-child {
  359 +.action-search-software_infos .search-software-item-column-right span b:last-child {
371 360 float: left;
372 361 }
373 362  
374   -.action-search-software_infos .search-community-content-block #categories-list{
  363 +.action-search-software_infos .search-software-content-block #categories-list{
375 364 margin-top:30px;
376 365 margin-bottom: 10px;
377 366 }
378   -.action-search-software_infos .search-community-content-block #categories-list li a{
  367 +
  368 +.action-search-software_infos .search-software-content-block #categories-list li a{
379 369 color:#2B65cd;
380 370 }
381 371  
382   -.action-search-software_infos .search-community-content-block #categories-list li{
  372 +.action-search-software_infos .search-software-content-block #categories-list li{
383 373 text-decoration: underline;
384 374 font-size: 13px;
385 375 color:#2B65cd;
... ...
theme.js
  Diff comments   View file @d616b48
... ... @@ -136,16 +136,15 @@ $('#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   - try {
140   - var article = document.getElementById('article');
  139 + var article = document.getElementById('article');
  140 + if(article != null){
141 141 var folderList = article.getElementsByClassName('folder-content')[0];
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]);
  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 + }
146 147 }
147   - } catch(e) {
148   -
149 148 }
150 149 }
151 150  
... ...