Commit e7aa8b204aa8aa3bbf4ef8635656b16b828d7d12

Authored by Melissa Wen
2 parents f1086113 1255ac8a
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 internal pages style

css/home-page.css
... ... @@ -151,7 +151,7 @@
151 151 .action-home-index #content .software-block {
152 152 width: 145px;
153 153 height: 218px;
154   - margin: 0px 9px 14px 9px;
  154 + margin: 0px 18px 14px 0px;
155 155 }
156 156  
157 157 .action-home-index #content .software-block .software-block-logo {
... ... @@ -263,7 +263,6 @@
263 263 padding-right: 25px;
264 264 padding: 0px 25px 0px 0px;
265 265 border: 0px solid #c0c1c1;
266   - border-radius: 8px;
267 266 width: 150px;
268 267 display: table-cell;
269 268 }
... ...
css/news-page.css
... ... @@ -56,6 +56,10 @@
56 56 display: inline-block;
57 57 }
58 58  
  59 +#content .blog .blog-post h1.title a {
  60 + color: black;
  61 +}
  62 +
59 63 /* WARNING:
60 64 * This solution is TEMPORARY. This informations shouldn't exist
61 65 * in this area.
... ...
css/software-pages.css
1 1 /*** Software Header ***/
2   -#content .software-information-block{
3   - margin-bottom: 60px;
  2 +#content .software-information-block {
  3 + margin: 0px 0px 60px 0px;
4 4 }
5 5  
6   -#content #software-information-block-table{
7   - width: auto;
  6 +#content #software-information-block-table {
8 7 margin: 0px 15px;
  8 + width: auto;
9 9 }
10 10  
11   -#content #software-information-block-table td{
  11 +#content #software-information-block-table td {
12 12 display: table-cell;
13 13 }
14 14  
15 15 #content #software-information-block-table #col-software-name {
16   - font-style: normal;
17 16 vertical-align: top;
  17 + font-style: normal;
18 18 }
19 19  
20   -#content #software-information-block-table #col-software-name h1{
21   - line-height: 37px;
22   - font-size: 34px;
23   - font-family: Arial, open_sansbold, Helvetica, sans-serif;
24   - font-weight: 700;
  20 +#content #software-information-block-table #col-software-name h1 {
  21 + font: 700 34px/37px arial, open_sansbold, helvetica, sans-serif;
25 22 text-align: left;
26 23 }
27 24  
28   -#content #software-information-block-table #col-software-name b{
29   - line-height: 21px;
30   - font-weight: normal;
31   - font-family: Arial, open_sansregular, Helvetica, sans-serif;
32   - font-size: 15px;
  25 +#content #software-information-block-table #col-software-name b {
  26 + font: normal normal normal 15px/21px arial, 'open_sansregular', helvetica, sans-serif;
33 27 }
34 28  
35 29 /*** end of Software Header ***/
... ... @@ -38,158 +32,148 @@
38 32  
39 33 /* Software Download Block*/
40 34  
41   -#content .download-block #download-block-2{
  35 +#content .download-block #download-block-2 {
42 36 margin: 0px 15px;
43   - border:1px solid #D3D6DE;
  37 + border: 1px solid #D3D6DE;
44 38 border-radius: 10px;
45 39 }
46 40  
47   -#content .download-block #download-block-2 #download_spb-2{
48   - padding: 5px 10px;
49   - background-color: #D3D6DE;
  41 +#content .download-block #download-block-2 #download_spb-2 {
  42 + padding: 5px 10px 5px 10px;
50 43 border-top-left-radius: 8px;
51 44 border-top-right-radius: 8px;
52   - font-family: Arial;
  45 + background-color: #D3D6DE;
  46 + font-family: arial;
53 47 }
54 48  
55   -#content .download-block #download-block-2 #download_spb-2 h3{
  49 +#content .download-block #download-block-2 #download_spb-2 h3 {
56 50 margin: 6px 0px 2px 10px;
57 51 font-size: 18px;
58 52 }
59 53  
60 54 #content .download-block #download-block-2 #download-info-1,
61 55 #content .download-block #download-block-2 #download-info-2,
62   -#content .download-block #download-block-2 #download-info-3{
  56 +#content .download-block #download-block-2 #download-info-3 {
63 57 padding: 30px 10px 30px 10px;
64   - clear: both;
65 58 border-top: 1px solid #D3D6DE;
  59 + clear: both;
66 60 }
67 61  
68   -#content .download-block #download-block-2 #download-info-2{
  62 +#content .download-block #download-block-2 #download-info-2 {
69 63 background: #ECEDF1;
70 64 }
71 65  
72   -#content .download-block #download-block-2 #version01{
  66 +#content .download-block #download-block-2 #version01 {
  67 + margin: 0px 20px 0px 15px;
73 68 width: 80px;
74 69 float: left;
75   - margin-right: 20px;
76   - margin-left: 15px;
77 70 clear: both;
78 71 }
79 72  
80   -#content .download-block #download-block-2 #version01 #image-download{
81   - display: block;
82   - height: 18px; /*fix when display file size*/
  73 +#content .download-block #download-block-2 #version01 #image-download {
83 74 padding: 50px 0px 8px 0px;
84   - background-color: #2c66ce;
85   - background-image: url("../images/download-icon.png");
86   - background-repeat: no-repeat;
87   - background-position: center;
88 75 border: 1px solid #2c66ce;
89   - border-radius: 8px; /*fix when display file size*/
  76 + border-radius: 8px;
  77 + height: 18px;
  78 + background: #2C66CE url("../images/download-icon.png") center no-repeat;
  79 + display: block;
90 80 }
91 81  
92   -#content .download-block #download-block-2 #version01 #size-download{
93   - display: none; /*fix when display file size*/
94   - color: #ffffff;
95   - background-color: #1a397d;
  82 +#content .download-block #download-block-2 #version01 #size-download {
96 83 border: 1px solid #1a397d;
97   - border-bottom-right-radius: 8px;
98   - border-bottom-left-radius: 8px;
  84 + border-radius: 0px 0px 8px 8px;
  85 + background-color: #1a397d;
  86 + color: #ffffff;
99 87 font-size: 12px;
100 88 text-align: center;
  89 + display: none;
101 90 }
102 91  
103   -#content .download-block #download-block-2 #info-software-download{
104   - position: relative;
  92 +#content .download-block #download-block-2 #info-software-download {
105 93 margin: 5px 0px 0px 100px;
  94 + position: relative;
106 95 font-size: 16px;
107 96 }
108 97  
109   -#content .download-block #download-block-2 #info-software-download .download-name{
  98 +#content .download-block #download-block-2 #info-software-download .download-name {
110 99 display: block;
111 100 font-weight: bold;
112 101 }
113 102  
114   -#content .download-block #download-block-2 #info-software-download .download-system{
  103 +#content .download-block #download-block-2 #info-software-download .download-system {
115 104 display: block;
116 105 font-size: 14px;
117 106 }
118 107  
119   -#content .download-block #download-block-2 #info-software-download .req_min_spb{
  108 +#content .download-block #download-block-2 #info-software-download .req_min_spb {
120 109 font-size: 12px;
121 110 }
122 111  
123   -#content .download-block #download-block-2 #info-software-download .req_min_spb a{
124   - color: #3E67B1;
  112 +#content .download-block #download-block-2 #info-software-download .req_min_spb a {
125 113 line-height: 40px;
  114 + color: #3E67B1;
126 115 text-decoration: underline;
127 116 }
128 117  
129   -#content .download-block #download-block-2 #licensed-software{
  118 +#content .download-block #download-block-2 #licensed-software {
130 119 padding:14px;
131   - background-color: #D3D6DE;
132 120 border-top: 1px solid #D3D6DE;
133   - border-bottom-right-radius: 8px;
134   - border-bottom-left-radius: 8px;
  121 + border-radius: 0px 0px 8px 8px;
  122 + background-color: #D3D6DE;
135 123 font-size: 12px;
136 124 text-align: right;
137 125 }
138 126  
139   -#content .download-block #download-block-2 #licensed-software a{
  127 +#content .download-block #download-block-2 #licensed-software a {
140 128 color: #3e67b1;
141 129 text-decoration: underline;
142 130 }
143 131  
144 132 /* About Software - Article on homepage */
145 133  
146   -.profile-homepage #article h1{
147   - padding: 0;
148   - margin: 0 0 10px;
  134 +.profile-homepage #article #article-toolbar #article-header h1 {
  135 + margin: 0px 0px 10px 0px;
  136 + padding: 0px;
149 137 color: #172738;
150   - font-family: Arial, open_sansbold, Helvetica, sans-serif;
151   - font-variant: normal;
152   - font-weight: bold;
153   - font-size: 22px;
154   - line-height: 1.3em;
  138 + font: normal normal bold 22px/1.3em arial, 'open_sansbold', helvetica, sans-serif;
155 139 }
156 140  
157   -.profile-homepage #article #article-header h1.title{
158   - border: none;
  141 +.profile-homepage #article #article-toolbar #article-header h1.title {
  142 + border: none;
159 143 }
160 144  
161   -.profile-homepage #article #article-header .publishing-info{
  145 +.profile-homepage #article #article-header .publishing-info {
162 146 display: none;
163 147 }
164 148  
165   -.profile-homepage #article .article-body h1{
166   - padding-top: 25px;
  149 +.profile-homepage #article .article-body h1 {
167 150 border-top: 1px solid #ECEDF1;
168 151 border-bottom: none;
  152 + padding-top: 25px;
169 153 }
170 154  
171   -.profile-homepage #article .article-body p{
172   - text-align: left;
173   - font-size: 15px;
174   - line-height: 21px;
175   - margin-bottom: 20px;
  155 +.profile-homepage #article .article-body p {
  156 + margin: 0px 0px 20px 0px;
  157 + line-height: 21px;
  158 + text-align: left;
  159 + font-size: 15px;
176 160 }
177 161  
178   -.profile-homepage #article .article-body hr{
  162 +.profile-homepage #article .article-body hr {
179 163 display: none;
180 164 }
181 165  
182 166 .profile-homepage #article .article-body ul {
  167 + background-repeat: no-repeat;
183 168 list-style-position: inside;
184 169 list-style-type: disc;
185   - background-repeat: no-repeat;
186 170 }
187 171  
188   -.profile-homepage #article .article-body ul li{
189   - list-style: inherit;
  172 +.profile-homepage #article .article-body ul li {
  173 + line-height: 21px;
190 174 text-align: left;
191   - font-size: 15px;
192   - line-height: 21px;
  175 + font-size: 15px;
  176 + list-style: inherit;
193 177 }
194 178  
195 179 /*** end of Software Homepage ***/
... ... @@ -228,9 +212,9 @@
228 212 }
229 213  
230 214 #content .box-1 .categories-and-tags-block .category_cloud a:hover {
  215 + border-color: #3a70d1;
231 216 background: #3a70d1;
232 217 color: white;
233   - border-color: #3a70d1;
234 218 }
235 219  
236 220 #content .box-1 .categories-and-tags-block .category_cloud a:link {
... ... @@ -243,31 +227,31 @@
243 227  
244 228 /* Link-list block */
245 229 #content .box-3 .block-title {
246   - background: #eee;
247   - color: #4562b1;
248   - border-top: 4px solid #4562b1;
249   - line-height: 15px;
  230 + border-top: 4px solid #4562b1;
  231 + line-height: 15px;
  232 + background: #eee;
  233 + color: #4562b1;
250 234 }
251 235  
252 236 #content .box-3 .link-list-block li {
253   - margin: 0;
254   - padding: 0;
  237 + margin: 0px;
  238 + padding: 0px;
255 239 border-bottom: 1px solid #ddd;
256 240 border-top: none;
257 241 }
258 242  
259 243 #content .box-3 .link-list-block li a {
260   - width: auto;
  244 + border-right: none;
  245 + border-top: 0px solid #64946E;
  246 + border-radius: 0px 0px 0px 0px;
261 247 padding: 6px 5px 8px 18px;
  248 + width: auto;
  249 + line-height: 17px;
262 250 background-color: #fff;
263 251 background-position: 0px 50%;
264 252 color: #2C66CE;
265   - border-right: none;
266   - border-top: 0px solid #64946E;
267   - border-radius: 0 0 0 0;
268 253 font-weight: normal;
269 254 font-size: 14px;
270   - line-height: 17px;
271 255 }
272 256  
273 257 #content .box-3 .link-list-block h3.empty + ul {
... ... @@ -285,8 +269,8 @@
285 269 }
286 270  
287 271 #content .box-3 .link-list-block li a.link-this-page {
288   - width: auto;
289 272 margin-left: 0px;
  273 + width: auto;
290 274 background-color: #ffffff;
291 275 font-weight: bold;
292 276 }
... ... @@ -294,37 +278,35 @@
294 278 /* Repository block */
295 279 .box-3 #bt_repositorio,
296 280 .box-3 #bt_repositorio:active,
297   -.box-3 #bt_repositorio:visited{
298   - display: block;
299   - position: relative;
300   - padding: 12px 10px;
301   - background: #EAEBEE;
302   - border-radius: 4px;
303   - font-size: 12px;
304   - font-family: open_sansbold, Arial, Helvetica, sans-serif;
305   - font-weight: bold;
306   - text-transform: uppercase;
307   -}
308   -
309   -.box-3 #bt_repositorio::after{
310   - content: url('../images/right-arrow.png');
311   - position: absolute;
  281 +.box-3 #bt_repositorio:visited {
  282 + border-radius: 4px;
  283 + padding: 12px 10px;
  284 + background: #EAEBEE;
  285 + font: normal normal bold 12px 'open_sansbold', arial, helvetica, sans-serif;
  286 + text-transform: uppercase;
  287 + display: block;
  288 + position: relative;
  289 +}
  290 +
  291 +.box-3 #bt_repositorio::after {
  292 + margin-top: -2px;
  293 + padding: 4px 0px 4px 2px;
  294 + border-radius: 4px;
312 295 width: 18px;
313 296 right: 10px;
314   - padding: 4px 0px 4px 2px;
315   - margin-top: -2px;
316   - background: #2C66CE;
317   - color: #FFF;
318   - border-radius: 4px;
319   - font-size: 16px;
320   - line-height: 20px;
321   - text-align: center;
  297 + line-height: 20px;
  298 + position: absolute;
  299 + background: #2C66CE;
  300 + color: #FFF;
  301 + font-size: 16px;
  302 + text-align: center;
  303 + content: url('../images/right-arrow.png');
322 304 }
323 305  
324   -.box-3 #content #bt_repositorio:hover{
325   - color: #FFF;
326   - background: #2C66CE;
327   - text-decoration: none;
  306 +.box-3 #content #bt_repositorio:hover {
  307 + color: #FFF;
  308 + background: #2C66CE;
  309 + text-decoration: none;
328 310 }
329 311 /*** end of right bar ***/
330 312  
... ... @@ -343,15 +325,15 @@
343 325 }
344 326  
345 327 #content .main-block .article-body ul.etapas-publicacao li strong {
346   - padding: 2px 8px;
347 328 margin-right: 6px;
  329 + border-radius: 50%;
  330 + padding: 2px 8px;
348 331 background: #333;
349 332 color: #fff;
350 333 float: left;
351   - border-radius: 50%;
352 334 }
353 335  
354   -#content .main-block .article-body .etapas-publicacao-2{
  336 +#content .main-block .article-body .etapas-publicacao-2 {
355 337 font-weight: bold;
356 338 }
357 339  
... ... @@ -364,44 +346,44 @@
364 346 /* Manual page */
365 347  
366 348 #content .main-block #article .folder-content .item-info {
367   - padding: 30px 20px 32px 0px;
368 349 border-top: 1px solid #ccc;
  350 + padding: 30px 20px 32px 0px;
369 351 }
370 352  
371   -#content .main-block #article .folder-content .folder-item:last-child .item-info{
  353 +#content .main-block #article .folder-content .folder-item:last-child .item-info {
372 354 border-bottom: 1px solid #ccc;
373 355 }
374 356  
375 357 #content .main-block #article .folder-content .item-icon {
376   - display: block;
377   - float: left;
378 358 margin: 2px 0px auto auto;
379 359 padding: 45px 40px 4px 10px;
380   - background: #2C66CE url("../images/download-mini_icon.png") center center no-repeat;
381 360 border: 1px solid #2C66CE;
382 361 border-radius: 4px;
  362 + background: #2C66CE url("../images/download-mini_icon.png") center center no-repeat;
  363 + display: block;
  364 + float: left;
383 365 }
384 366  
385   -#content .main-block #article .folder-content .item-icon a{
  367 +#content .main-block #article .folder-content .item-icon a {
386 368 display: none;
387 369 }
388 370  
389 371  
390   -#content .main-block #article .folder-content .item-description{
391   - padding-left: 0px;
  372 +#content .main-block #article .folder-content .item-description {
392 373 margin-left: 65px;
  374 + padding-left: 0px;
393 375 }
394 376  
395   -#content .main-block #article .folder-content .item-description a{
  377 +#content .main-block #article .folder-content .item-description a {
396 378 color: #172938;
397 379 font-size: 18px;
398 380 font-family: Arial;
399 381 font-weight: 700;
400 382 }
401 383  
402   -#content .main-block #article .folder-content .item-date{
403   - padding-left: 0px;
  384 +#content .main-block #article .folder-content .item-date {
404 385 margin-left: 65px;
  386 + padding-left: 0px;
405 387 }
406 388  
407 389 /*** end fo software internal pages ***/
... ...
style.css
... ... @@ -80,7 +80,7 @@ url("fonts/opensans-800-webfont.ttf") format("truetype"),
80 80 url("fonts/opensans-800-webfont.svg#open_sansextrabold") format("svg");
81 81 }
82 82  
83   -/***********Regras Gerais ************/
  83 +/*********** General Rules ************/
84 84  
85 85 * {
86 86 margin: 0;
... ...