Download as
Browse Code »

Commit ce7c9f08f88e44dbf1870f1fe51b270f63123130

Authored by Sergio Oliveira
1 parent 7d676e73
Exists in master and in 53 other branches add_sisp_to_chef, add_super_archives_plugin, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, 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_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, header_fix, lxc_settings, margin_fix, mezuro_cookbook, refactor_download_block, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_to_rails4, stable-4.1, stable-4.2, stable-4.x, theme_header, theme_javascript_refactory, thread_dropdown, update_search_by_categories, update_software_api

Revert "Added global search box" 

This reverts commit d93b189832d820a41f88caff1c393d111d2b29b2.
Showing 3 changed files with 7 additions and 83 deletions   Show diff stats
src/colab-spb-theme-plugin/colab_spb_theme/static/css/screen.css
  Diff comments   View file @ce7c9f0
1 @import url(footer.css); 1 @import url(footer.css);
2 @import url(header.css); 2 @import url(header.css);
3 @import url(font-awesome.min.css); 3 @import url(font-awesome.min.css);
4 -@import url(search.css);  
5 4
6 @font-face { 5 @font-face {
7 font-weight: normal; 6 font-weight: normal;
src/colab-spb-theme-plugin/colab_spb_theme/static/css/search.css
View file @7d676e7
@@ -1,58 +0,0 @@ @@ -1,58 +0,0 @@
1 -  
2 -.search-form {  
3 - margin-top: 28px;  
4 - padding-top: 0px;  
5 - padding-bottom: 15px;  
6 - padding-left: 25px;  
7 - padding-right: 25px;  
8 - background: #ecedf1;  
9 - border-radius: 4px;  
10 - border: 1px solid #d3d6de;  
11 -}  
12 -  
13 -.search-title {  
14 - color: #3e67b1;  
15 - margin: 5px 0px 3px;  
16 - padding: 16px 0px 0px 0px;  
17 - font-family: "open_sansregular", Arial, Helvetica, sans-serif;  
18 - font-weight: bold;  
19 - font-size: 15px;  
20 - text-transform: uppercase;  
21 -}  
22 -  
23 -.search-input {  
24 - width: 100%;  
25 - padding: 7px;  
26 - font-size: 14px;  
27 - margin-top: 15px;  
28 - margin-bottom: 15px;  
29 - border-radius: 4px;  
30 - border: 1px solid #d3d6de;  
31 -}  
32 -  
33 -.search-blue {  
34 - background: #3e67b1;  
35 - color: white;  
36 - width: auto;  
37 - height: 30px;  
38 - padding: 0 14px;  
39 - line-height: 14px;  
40 - border-radius: 4px;  
41 - text-transform: uppercase;  
42 - font-family: "open_sansbold", Arial, sans-serif;  
43 - font-size: 14px;  
44 -}  
45 -  
46 -.search-divisor {  
47 - margin-top: 0px;  
48 -}  
49 -  
50 -.search-summary {  
51 - margin-top: 50px;  
52 -}  
53 -  
54 -.search-total {  
55 - font-size: 14px;  
56 - font-family: Arial;  
57 - font-weight: bold;  
58 -}  
59 \ No newline at end of file 0 \ No newline at end of file
src/colab-spb-theme-plugin/colab_spb_theme/templates/search/search.html
  Diff comments   View file @ce7c9f0
@@ -31,36 +31,19 @@ @@ -31,36 +31,19 @@
31 31
32 {% block main-content %} 32 {% block main-content %}
33 <div class="search-results" style="width: 980px;margin: auto;"> 33 <div class="search-results" style="width: 980px;margin: auto;">
34 -  
35 -<div class="container">  
36 <div class="row"> 34 <div class="row">
37 - <div class="col-md-12">  
38 - <div class="search-form">  
39 - <h3 class="search-title"> {% trans "BUSCAR NO PORTAL" %} </h3>  
40 -  
41 - <form accept-charset="UTF-8" action="/search/" method="get">  
42 - <div class="search-field">  
43 - <span class="formfield">  
44 - <input class="search-input" id="search-input" name="q" value="" type="text">  
45 - </span>  
46 - </div>  
47 - <input class="btn search-blue with-text icon-search submit" name="commit" value="Buscar" type="submit">  
48 - </form>  
49 - </div> 35 + <div class="col-xs-6 col-sm-4 col-md-2 col-lg-2">
  36 + <h2>{% trans "Search" %}</h2>
50 </div> 37 </div>
51 - </div>  
52 -</div>  
53 -  
54 -<div class="container search-summary">  
55 - <div class="row">  
56 <div class="col-xs-6 col-sm-8 col-md-10 col-lg-10"> 38 <div class="col-xs-6 col-sm-8 col-md-10 col-lg-10">
57 - <p class="text-left search-total">  
58 - {% trans "Total de "%}{{ page.paginator.count }}{% trans " respostas na sua pesquisa"%} 39 + <br/><br/>
  40 + <p class="text-right quiet">
  41 + {{ page.paginator.count }} {% trans "documents found" %}
59 </p> 42 </p>
60 </div> 43 </div>
61 </div> 44 </div>
62 - <hr class="search-divisor" />  
63 -</div> 45 +
  46 + <hr/>
64 47
65 <div class="row"> 48 <div class="row">
66 <div class="col-md-12 col-lg-12"> 49 <div class="col-md-12 col-lg-12">