Commit 22561cf84ef741968c2784eb32a3c64c4cc35acc

Authored by Álvaro Fernando Matos de Souza
Committed by Thiago Ribeiro
1 parent 500ca7e3
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

Passing CSS rules from plugin to theme

Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com>
Signed-off-by: ArthurJahn <stutrzbecher@gmail.com>
css/software-catalog-page.css
@@ -42,6 +42,7 @@ @@ -42,6 +42,7 @@
42 padding: 16px 0 10px 14px; 42 padding: 16px 0 10px 14px;
43 color: #2C4B6B; 43 color: #2C4B6B;
44 font-family:"open_sansregular", Arial, Helvetica, sans-serif; 44 font-family:"open_sansregular", Arial, Helvetica, sans-serif;
  45 + color: #2B51A8;
45 font-weight: bold; 46 font-weight: bold;
46 font-size: 15px; 47 font-size: 15px;
47 text-transform: uppercase; 48 text-transform: uppercase;
@@ -79,9 +80,13 @@ @@ -79,9 +80,13 @@
79 max-height: 30px; 80 max-height: 30px;
80 margin: 14px; 81 margin: 14px;
81 padding: 0 14px 0 14px; 82 padding: 0 14px 0 14px;
82 - background-color: #3E67B1; 83 + background: #3E67B1;
83 line-height: 14px; 84 line-height: 14px;
  85 + border-radius: 4px;
  86 + color: #ffffff;
84 text-transform: uppercase; 87 text-transform: uppercase;
  88 + font-family: "open_sansbold",Arial,sans-serif;
  89 + font-size: 14px;
85 } 90 }
86 91
87 /* Filter options */ 92 /* Filter options */
@@ -94,8 +99,11 @@ @@ -94,8 +99,11 @@
94 padding: 14px; 99 padding: 14px;
95 background-color: #D3D6DE; 100 background-color: #D3D6DE;
96 border: none; 101 border: none;
  102 + border-bottom-left-radius: 4px;
  103 + border-bottom-right-radius: 4px;
97 font-size: 11px; 104 font-size: 11px;
98 text-align: right; 105 text-align: right;
  106 + text-transform: uppercase;
99 } 107 }
100 108
101 .action-search-software_infos #filter-option-catalog-close { 109 .action-search-software_infos #filter-option-catalog-close {
@@ -138,6 +146,7 @@ @@ -138,6 +146,7 @@
138 .action-search-software_infos #group-categories ul { 146 .action-search-software_infos #group-categories ul {
139 font-family: Arial; 147 font-family: Arial;
140 font-size: 14px; 148 font-size: 14px;
  149 + line-height: 31px;
141 columns: 2; 150 columns: 2;
142 -webkit-columns: 2; 151 -webkit-columns: 2;
143 -moz-columns: 2; 152 -moz-columns: 2;
@@ -155,6 +164,7 @@ @@ -155,6 +164,7 @@
155 font-weight: bold; 164 font-weight: bold;
156 font-size: 15px; 165 font-size: 15px;
157 font-family: Arial; 166 font-family: Arial;
  167 + padding: 10px;
158 } 168 }
159 169
160 .action-search-software_infos #filter-catalog-software .project-software label { 170 .action-search-software_infos #filter-catalog-software .project-software label {
@@ -173,11 +183,24 @@ @@ -173,11 +183,24 @@
173 cursor: pointer; 183 cursor: pointer;
174 background-color: #3E67B1; 184 background-color: #3E67B1;
175 font-size: 14px; 185 font-size: 14px;
176 - font-family:Arial; 186 + font-family: Arial;
  187 + color: #ffffff;
  188 + border: 1px solid #2B65CD;
  189 + border-radius: 4px;
  190 + margin: 5px 0 0 5px;
  191 + padding: 5px 10px;
177 } 192 }
178 193
179 .action-search-software_infos button#close-filter-catalog { 194 .action-search-software_infos button#close-filter-catalog {
180 cursor:pointer; 195 cursor:pointer;
  196 + float: right;
  197 + border: none;
  198 + background: none;
  199 + font-size: 12px;
  200 + margin-top: 5px;
  201 + color: #000;
  202 + text-transform: uppercase;
  203 + padding: 5px;
181 } 204 }
182 205
183 .action-search-software_infos button#close-filter-catalog:after { 206 .action-search-software_infos button#close-filter-catalog:after {
@@ -200,11 +223,22 @@ @@ -200,11 +223,22 @@
200 223
201 .action-search-software_infos #catalog-display-options #catalog-display-options-count{ 224 .action-search-software_infos #catalog-display-options #catalog-display-options-count{
202 padding: 45px 0 4px 0; 225 padding: 45px 0 4px 0;
  226 + float: left;
  227 + width: 50%;
203 } 228 }
204 229
205 .action-search-software_infos #catalog-display-options #catalog-display-options-show-and-sort{ 230 .action-search-software_infos #catalog-display-options #catalog-display-options-show-and-sort{
206 padding: 38px 0 5px 0; 231 padding: 38px 0 5px 0;
207 font-weight: bold; 232 font-weight: bold;
  233 + float: left;
  234 + width: 50%;
  235 +}
  236 +.action-search-software_infos #catalog-display-options #catalog-display-options-sort,
  237 +.action-search-software_infos #catalog-display-options #catalog-display-options-show{
  238 + position: relative;
  239 + float: left;
  240 + width: 50%;
  241 + text-align: right;
208 } 242 }
209 243
210 /*** Search Results ***/ 244 /*** Search Results ***/
css/software-pages.css
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 background-color: #D3D6DE; 43 background-color: #D3D6DE;
44 border-top-left-radius: 8px; 44 border-top-left-radius: 8px;
45 border-top-right-radius: 8px; 45 border-top-right-radius: 8px;
46 - font-family: Arial; 46 + font-family: "open_sansbold", Arial, Helvetica, sans-serif;
47 margin: 0; 47 margin: 0;
48 color: #172738; 48 color: #172738;
49 font-size: 18px; 49 font-size: 18px;