Commit f10861131bf544f41d04026688122bfe60aa6d5e

Authored by Melissa Wen
1 parent 3b0e9f00
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

Style of edit blog and article and adjusts on compatibility of search page style definition

Showing 2 changed files with 183 additions and 35 deletions   Show diff stats
css/edition-pages.css
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 /*** Edit Blog and Articles ***/ 3 /*** Edit Blog and Articles ***/
4 4
5 -.controller-cms #content .main-block h1{ 5 +.controller-cms #content .main-content h1{
6 margin: 0 0 10px 0; 6 margin: 0 0 10px 0;
7 padding: 0; 7 padding: 0;
8 color: #172738; 8 color: #172738;
@@ -13,19 +13,19 @@ @@ -13,19 +13,19 @@
13 font-variant: normal; 13 font-variant: normal;
14 } 14 }
15 15
16 -.controller-cms #content .main-block form{ 16 +.controller-cms #content .main-content form{
17 font-size: 14px; 17 font-size: 14px;
18 font-family: Arial; 18 font-family: Arial;
19 } 19 }
20 20
21 -.controller-cms #content .main-block form .required-field .pseudoformlabel,  
22 -.controller-cms #content .main-block form .required-field label.formlabel:after { 21 +.controller-cms #content .main-content form .required-field .pseudoformlabel,
  22 +.controller-cms #content .main-content form .required-field label.formlabel:after {
23 color: #FF0366; 23 color: #FF0366;
24 font-size: 14px; 24 font-size: 14px;
25 font-weight: 500; 25 font-weight: 500;
26 } 26 }
27 27
28 -.controller-cms #content .main-block .formlabel{ 28 +.controller-cms #content .main-content .formlabel{
29 display: inline-block; 29 display: inline-block;
30 max-width: 100%; 30 max-width: 100%;
31 margin-bottom: 5px; 31 margin-bottom: 5px;
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 font-size: 14px; 34 font-size: 14px;
35 } 35 }
36 36
37 -.controller-cms #content .main-block .formfieldline .formfield code{ 37 +.controller-cms #content .main-content .formfieldline .formfield code{
38 display: block; 38 display: block;
39 width: auto; 39 width: auto;
40 height: 30px; 40 height: 30px;
@@ -45,21 +45,21 @@ @@ -45,21 +45,21 @@
45 font-family: Arial, helvetica; 45 font-family: Arial, helvetica;
46 } 46 }
47 47
48 -.controller-cms #content .main-block .formfieldline .formfield code *{ 48 +.controller-cms #content .main-content .formfieldline .formfield code *{
49 display: inline; 49 display: inline;
50 } 50 }
51 51
52 -.controller-cms #content .main-block .formfieldline .formfield code input[type="text"]{ 52 +.controller-cms #content .main-content .formfieldline .formfield input[type="text"]{
53 padding: 6px; 53 padding: 6px;
54 color: #585858; 54 color: #585858;
55 - background: none; 55 + background: #FFF;
56 border: 1px solid #ccc; 56 border: 1px solid #ccc;
57 border-radius: 4px; 57 border-radius: 4px;
58 font-size: 15px; 58 font-size: 15px;
59 font-family: Arial, helvetica; 59 font-family: Arial, helvetica;
60 } 60 }
61 61
62 -.controller-cms #content .main-block .formfieldline textarea{ 62 +.controller-cms #content .main-content .formfieldline textarea{
63 padding: 6px; 63 padding: 6px;
64 color: #585858; 64 color: #585858;
65 background: none; 65 background: none;
@@ -69,18 +69,18 @@ @@ -69,18 +69,18 @@
69 font-size: 15px; 69 font-size: 15px;
70 } 70 }
71 71
72 -.controller-cms #content .main-block .formfieldline .formfield code input[type="text"]:hover,  
73 -.controller-cms #content .main-block .formfieldline .formfield code input[type="text"]:focus,  
74 -.controller-cms #content .main-block .formfieldline textarea:hover,  
75 -.controller-cms #content .main-block .formfieldline textarea:focus{ 72 +.controller-cms #content .main-content .formfieldline .formfield code input[type="text"]:hover,
  73 +.controller-cms #content .main-content .formfieldline .formfield code input[type="text"]:focus,
  74 +.controller-cms #content .main-content .formfieldline textarea:hover,
  75 +.controller-cms #content .main-content .formfieldline textarea:focus{
76 border: 1px solid #172738; 76 border: 1px solid #172738;
77 } 77 }
78 78
79 -.controller-cms #content .main-block .formfieldline .type-file .type-file .formlabel{ 79 +.controller-cms #content .main-content .formfieldline .type-file .type-file .formlabel{
80 display: none; 80 display: none;
81 } 81 }
82 82
83 -.controller-cms #content .main-block .formfieldline .type-file .type-file .type-text .formlabel{ 83 +.controller-cms #content .main-content .formfieldline .type-file .type-file .type-text .formlabel{
84 display: block; 84 display: block;
85 } 85 }
86 86
@@ -136,25 +136,27 @@ @@ -136,25 +136,27 @@
136 margin-bottom: 15px; 136 margin-bottom: 15px;
137 } 137 }
138 138
139 -.controller-cms #content .main-block form .button-bar input{  
140 - min-width: 100px; 139 +.controller-cms #content .main-content form .button-bar input{
  140 + height: 30px;
  141 + padding: 2px 15px;
141 margin-right: 10px; 142 margin-right: 10px;
142 - padding: 2px 5px;  
143 color: #FFF; 143 color: #FFF;
144 background: #3E67B1; 144 background: #3E67B1;
145 font-size: 15px; 145 font-size: 15px;
146 - border: none;  
147 } 146 }
148 147
149 -.controller-cms #content .main-block form .button-bar input:hover{ 148 +.controller-cms #content .main-content form .button-bar input:hover{
150 background: #5E82C6; 149 background: #5E82C6;
151 border: none; 150 border: none;
152 } 151 }
153 152
154 -.controller-cms #content .main-block form .button-bar a.button{  
155 - height: 29px;  
156 - min-width: 100px;  
157 - padding: 1px 0 0 0; 153 +.controller-cms #content .main-content form .button-bar input.button.with-text{
  154 + height: 36px;
  155 +}
  156 +
  157 +.controller-cms #content .main-content form .button-bar a.button{
  158 + height: 30px;
  159 + padding: 2px 15px;
158 color: #3E67B1; 160 color: #3E67B1;
159 background: #FFF; 161 background: #FFF;
160 border: 1px solid #3E67B1; 162 border: 1px solid #3E67B1;
@@ -162,48 +164,48 @@ @@ -162,48 +164,48 @@
162 text-align: center; 164 text-align: center;
163 } 165 }
164 166
165 -.controller-cms #content .main-block form .button-bar a.button:hover{ 167 +.controller-cms #content .main-content form .button-bar a.button:hover{
166 background: none; 168 background: none;
167 color: #3E67B1; 169 color: #3E67B1;
168 border-color: #3E67B1; 170 border-color: #3E67B1;
169 } 171 }
170 172
171 -.controller-cms #content .main-block form .box-title{ 173 +.controller-cms #content .main-content form .box-title{
172 font-size: 15px; 174 font-size: 15px;
173 font-family: Arial, helvetica; 175 font-family: Arial, helvetica;
174 } 176 }
175 177
176 -.controller-cms #content .main-block #category-ajax-selector{ 178 +.controller-cms #content .main-content #category-ajax-selector{
177 border-style: dotted; 179 border-style: dotted;
178 } 180 }
179 181
180 -.controller-cms #content .main-block #category-ajax-selector label{ 182 +.controller-cms #content .main-content #category-ajax-selector label{
181 font-size: 14px; 183 font-size: 14px;
182 } 184 }
183 185
184 -.controller-cms #content .main-block #category-ajax-selector .select-subcategory-link{ 186 +.controller-cms #content .main-content #category-ajax-selector .select-subcategory-link{
185 background: #FFF; 187 background: #FFF;
186 border: 1px solid #2C66CE; 188 border: 1px solid #2C66CE;
187 color: #2C66CE; 189 color: #2C66CE;
188 padding: 3px; 190 padding: 3px;
189 } 191 }
190 192
191 -.controller-cms #content .main-block #category-ajax-selector .select-subcategory-link:hover{ 193 +.controller-cms #content .main-content #category-ajax-selector .select-subcategory-link:hover{
192 background: #2C66CE; 194 background: #2C66CE;
193 color: #FFF; 195 color: #FFF;
194 } 196 }
195 197
196 -.controller-cms #content .main-block .inputosaurus-required{ 198 +.controller-cms #content .main-content .inputosaurus-required{
197 background: none; 199 background: none;
198 border: 1px solid #ccc; 200 border: 1px solid #ccc;
199 } 201 }
200 202
201 -.controller-cms #content .main-block .inputosaurus-required:hover,  
202 -.controller-cms #content .main-block .inputosaurus-required:focus{ 203 +.controller-cms #content .main-content .inputosaurus-required:hover,
  204 +.controller-cms #content .main-content .inputosaurus-required:focus{
203 border: 1px solid #172738; 205 border: 1px solid #172738;
204 } 206 }
205 207
206 -.controller-cms #content .main-block .inputosaurus-required input:hover{ 208 +.controller-cms #content .main-content .inputosaurus-required input:hover{
207 background: none; 209 background: none;
208 } 210 }
209 211
@@ -216,3 +218,34 @@ @@ -216,3 +218,34 @@
216 margin-top: 13px; 218 margin-top: 13px;
217 margin-bottom: 13px; 219 margin-bottom: 13px;
218 } 220 }
  221 +
  222 +/*** Article's edition page ***/
  223 +
  224 +#content .text-editor-sidebar .header{
  225 + padding: 13px 10px;
  226 + color: #172738;
  227 + background: #D3D6DE;
  228 + border-radius: 4px;
  229 + font-size: 14px;
  230 + font-weight: 300;
  231 + font-family: Arial;
  232 +}
  233 +
  234 +#content .text-editor-sidebar .header a.button.icon-vertical-toggle{
  235 + padding: 0 15px;
  236 + background: #3E67B1;
  237 + color: #FFF;
  238 + font-size: 14px;
  239 + font-weight: 300;
  240 + font-family: Arial;
  241 +}
  242 +
  243 +#content .text-editor-sidebar .header a.button.icon-vertical-toggle:hover{
  244 + background: #5E82C6;
  245 +}
  246 +
  247 +#content .text-editor-sidebar-box{
  248 + background: #ECEDF1;
  249 + border-radius: 4px;
  250 + border: 1px solid #D3D6DE;
  251 +}
css/search-pages.css 0 → 100644
@@ -0,0 +1,115 @@ @@ -0,0 +1,115 @@
  1 +/*** Search Community ***/
  2 +
  3 +.action-search-index #content form #search-header,
  4 +.action-search-people #content form #search-header,
  5 +.action-search-communities #content form #search-header{
  6 + margin-top: 5px;
  7 + float: right;
  8 + border: none;
  9 +}
  10 +
  11 +.action-search-people #content form #search-header #search-filters .sod_select,
  12 +.action-search-communities #content form #search-header #search-filters .sod_select{
  13 + color: #3E67B1;
  14 + border: 1px solid #3E67B1;
  15 + border-radius: 4px;
  16 + font-family: Arial;
  17 + font-variant: normal;
  18 + font-weight: 300;
  19 + box-shadow: none;
  20 +}
  21 +
  22 +.action-search-people #content form #search-header #search-filters .sod_select .sod_list,
  23 +.action-search-communities #content form #search-header #search-filters .sod_select .sod_list{
  24 + margin: -2px 0 0 -1px;
  25 + color: #3E67B1;
  26 + border: 1px solid #3E67B1;
  27 + border-top: none;
  28 + border-radius: 0px 0px 4px 4px;
  29 + font-family: Arial;
  30 + font-variant: normal;
  31 + font-weight: 300;
  32 +}
  33 +
  34 +.action-search-people #content form #search-header #search-filters .sod_select .sod_list .active,
  35 +.action-search-communities #content form #search-header #search-filters .sod_select .sod_list .active{
  36 + border-radius: 0px 0px 4px 4px;
  37 +}
  38 +
  39 +.action-search-people #content form #search-header #search-filters .sod_select .sod_list .selected,
  40 +.action-search-communities #content form #search-header #search-filters .sod_select .sod_list .selected{
  41 + padding-right: 21px;
  42 +}
  43 +
  44 +.action-search-people #content form #search-subheader .sod_select,
  45 +.action-search-communities #content form #search-subheader .sod_select{
  46 + line-height: 15px;
  47 +}
  48 +
  49 +.action-search-index #content form .search-field,
  50 +.action-search-people #content form .search-field,
  51 +.action-search-communities #content form .search-field{
  52 + margin-bottom: 30px;
  53 +}
  54 +
  55 +.action-search-index #content form .search-field .formfield,
  56 +.action-search-people #content form .search-field .formfield,
  57 +.action-search-communities #content form .search-field .formfield{
  58 + float: left;
  59 + width: 99%;
  60 +}
  61 +.action-search-index #content form .search-field .formfield input,
  62 +.action-search-people #content form .search-field .formfield input,
  63 +.action-search-communities #content form .search-field .formfield input{
  64 + margin-top: 0px;
  65 + padding: 6px;
  66 + height: 19px;
  67 + max-height: 19px;
  68 + max-width: 98%;
  69 + background: none;
  70 + border: 1px solid #ccc;
  71 + border-radius: 4px;
  72 +}
  73 +
  74 +.action-search-index #content form input.button.submit,
  75 +.action-search-people #content form input.button.submit,
  76 +.action-search-communities #content form input.button.submit{
  77 + height: 32px;
  78 + margin-top: 8px;
  79 + padding: 5px 15px;
  80 + background: #3E67B1 none;
  81 + color: #FFF;
  82 + border-radius: 4px;
  83 + border: 1px solid #3E67B1;
  84 + font-size: 14px;
  85 + line-height: 14px;
  86 + text-transform: uppercase;
  87 +}
  88 +
  89 +.action-search-index #content form input.button.submit:hover,
  90 +.action-search-people #content form input.button.submit:hover,
  91 +.action-search-communities #content form input.button.submit:hover{
  92 + background: #5E82C6;
  93 +}
  94 +
  95 +.action-search-people #search-results .search-results-type-people,
  96 +.action-search-communities #search-results .search-results-type-community{
  97 + background: none;
  98 + border: 1px solid #ccc;
  99 + border-radius: 10px;
  100 +}
  101 +
  102 +.action-search-index #search-results h3{
  103 + margin: 20px 0 10px 0;
  104 + color: #172738;
  105 + font-size:18px;
  106 + line-height: 21px;
  107 + font-family: Arial;
  108 + font-weight: 700;
  109 + font-variant: normal;
  110 +}
  111 +
  112 +.action-search-index #search-results .search-results-innerbox{
  113 + background: none;
  114 + border: 1px solid #ccc;
  115 +}