Commit d4661b0269f965b47c0a1d936d0ac66e435645cb
1 parent
8083c699
Exists in
master
and in
52 other branches
Fixes of sprint 40
Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com> Signed-off-by: ArthurJahn <stutrzbecher@gmail.com> Signed-off-by: Bruna Moreira <brunanayaramlima@gmail.com> Signed-off-by: Juliana Hilario <julianahdesousa@gmail.com> Signed-off-by: Melissa Wen <melissa.srw@gmail.com> Signed-off-by: Pedro de Lyra Pereira <pedrodelyra@gmail.com> Conflicts solved: src/noosfero-spb/noosfero-spb-theme/css/search-pages.css
Showing
4 changed files
with
18 additions
and
13 deletions
Show diff stats
src/noosfero-spb/noosfero-spb-theme/css/notifications.css
| ... | ... | @@ -51,13 +51,14 @@ |
| 51 | 51 | color: #8a6d3b; |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | -.environment-notification-plugin-notification-bar .warningnotification p a, | |
| 55 | -.environment-notification-plugin-notification-notification-modal .warningnotification p a{ | |
| 54 | +#content .environment-notification-plugin-notification-bar .warningnotification p a, | |
| 55 | +#content .environment-notification-plugin-notification-bar .warningnotification p a:visited, | |
| 56 | +#content .environment-notification-plugin-notification-notification-modal .warningnotification p a | |
| 57 | +#content .environment-notification-plugin-notification-notification-modal .warningnotification p a:visited{ | |
| 56 | 58 | font-weight: bold; |
| 57 | 59 | color: #8a6d3b; |
| 58 | 60 | } |
| 59 | 61 | |
| 60 | - | |
| 61 | 62 | .environment-notification-plugin-notification-bar .informationnotification, |
| 62 | 63 | .environment-notification-plugin-notification-notification-modal .informationnotification{ |
| 63 | 64 | background: #d9edf7; | ... | ... |
src/noosfero-spb/noosfero-spb-theme/css/software-pages.css
| ... | ... | @@ -89,14 +89,15 @@ |
| 89 | 89 | display: block; |
| 90 | 90 | } |
| 91 | 91 | |
| 92 | -#content .download-block .download-button #download-size { | |
| 93 | - border: 1px solid #1a397d; | |
| 94 | - border-radius: 0px 0px 8px 8px; | |
| 95 | - background-color: #1a397d; | |
| 96 | - color: #ffffff; | |
| 97 | - font-size: 12px; | |
| 92 | +#content .download-block .download-button .download-size { | |
| 98 | 93 | text-align: center; |
| 99 | - display: none; | |
| 94 | + display: block; | |
| 95 | + background: rgb(0, 40, 140) none repeat scroll 0% 0%; | |
| 96 | + color: rgb(255, 255, 255); | |
| 97 | + border-bottom-left-radius: 5px; | |
| 98 | + border-bottom-right-radius: 5px; | |
| 99 | + margin-top: -15px; | |
| 100 | + line-height: 20px; | |
| 100 | 101 | } |
| 101 | 102 | |
| 102 | 103 | #content .download-block .download-info { |
| ... | ... | @@ -208,9 +209,7 @@ |
| 208 | 209 | } |
| 209 | 210 | |
| 210 | 211 | #content .box-1 .categories-and-tags-block .category_cloud{ |
| 211 | - display: inline-flex; | |
| 212 | 212 | margin: 13px 0 10px 0; |
| 213 | - max-width: 87%; | |
| 214 | 213 | } |
| 215 | 214 | |
| 216 | 215 | #content .box-1 .categories-and-tags-block .category_cloud a{ |
| ... | ... | @@ -590,7 +589,7 @@ |
| 590 | 589 | padding: 45px 40px 4px 10px; |
| 591 | 590 | border: 1px solid #2C66CE; |
| 592 | 591 | border-radius: 4px; |
| 593 | - background: #2C66CE url("../images/download-mini_icon.png") center center no-repeat; | |
| 592 | + background: #2C66CE url("../images/history-mini_icon.png") center center no-repeat; | |
| 594 | 593 | display: block; |
| 595 | 594 | float: left; |
| 596 | 595 | } | ... | ... |
476 Bytes
src/noosfero-spb/noosfero-spb-theme/theme.js
| ... | ... | @@ -268,10 +268,15 @@ $('#link-buscar').click(function(e) { |
| 268 | 268 | } |
| 269 | 269 | } |
| 270 | 270 | |
| 271 | + function move_breadcrumbs() { | |
| 272 | + $('.breadcrumbs-plugin_content-breadcrumbs-block').prependTo('#wrap-2'); | |
| 273 | + } | |
| 274 | + | |
| 271 | 275 | $(document).ready(function(){ |
| 272 | 276 | add_tooltips(); |
| 273 | 277 | add_popovers(); |
| 274 | 278 | move_article_buttons(); |
| 279 | + move_breadcrumbs(); | |
| 275 | 280 | insert_notice_div(); |
| 276 | 281 | set_uploaded_files_names(); |
| 277 | 282 | set_tooltip_content(); | ... | ... |