Download as
Browse Code »

Commit a11b751eb5804657508261b1d711cc10ed8ba19d

Authored by Melissa Wen
2 parents 76ab812b 80febdec
Exists in master and in 52 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_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, 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, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, refactor_download_block, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, review_message, signals_user_noosfero, sisp_catalog_header, sisp_dev_master, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_to_rails4, stable-4.1, stable-4.2, theme_header, theme_javascript_refactory, thread_dropdown, update_search_by_categories, update_softwares_boxes

Merge branch 'design_41' into 'master' 

Design 41 - MR versão 2

[Agora sim!]

Olá @melissawen, @daniela e @arthurjahn

Segue o MR das sprints 40 e 41 da equipe de design para a master. Por favor validar se está tudo ok.

Acabei "recommitando" alguns poucos fixes da sprint 40 (que estavam na branch bug_fix_40), e o CSS do block de eventos (que estava na branch event_block) feito pelo @fabio1079 e pelo @pedrodelyra . São só essas mesmo?

Obrigado.

Att, Álvaro Fernando.

See merge request !71
Showing 10 changed files with 308 additions and 50 deletions   Show diff stats
src/noosfero-spb/noosfero-spb-theme/README.md
  Diff comments   View file @a11b751
@@ -3,4 +3,154 @@ PSB Theme for Noosfero @@ -3,4 +3,154 @@ PSB Theme for Noosfero
3 3
4 Noosfero theme for the _Portal do Software Público_ project. 4 Noosfero theme for the _Portal do Software Público_ project.
5 5
6 -Install on /public/designs/themes/noosfero-spb-theme  
7 \ No newline at end of file 6 \ No newline at end of file
  7 +Install on /public/designs/themes/noosfero-spb-theme
  8 +
  9 +================================
  10 +
  11 +# Passos para configurar o tema a partir do spb/spb
  12 +
  13 +## Considerando que o clone do noosfero está na pasta home
  14 +
  15 +```bash
  16 +rm -r ~/noosfero/public/design/theme/noosfero-spb-theme
  17 +cd ~
  18 +git clone git@softwarepublico.gov.br:softwarepublico/softwarepublico.git
  19 +cd softwarepublico/src/noosfero-spb/
  20 +ln -sr noosfero-spb-theme/ ~/noosfero/public/designs/themes/
  21 +ln -sr software_communities ~/noosfero/plugins/
  22 +ln -sr gov_user ~/noosfero/plugins/
  23 +git remote add theme git@softwarepublico.gov.br:softwarepublico/noosfero-spb-theme.git
  24 +```
  25 +
  26 +# Para instalar o Colab
  27 +
  28 +```bash
  29 +cd ~
  30 +git clone https://github.com/colab/colab
  31 +```
  32 +
  33 +## Configuração
  34 +
  35 +Seguir [tutorial](https://github.com/colab/colab/blob/master/README.rst) do próprio Colab
  36 +
  37 +## Arquivos de configuração Colab
  38 +
  39 +Estando com o ambiente do vagrant levantado `(vagrant up && vagrant ssh)`,
  40 +e "trabalhando" com o colab `(workon colab)`:
  41 +
  42 +## Clone os repositórios:
  43 +
  44 +```bash
  45 +cd ~
  46 +git clone git@softwarepublico.gov.br:softwarepublico/softwarepublico.git
  47 +git clone https://github.com/colab/colab-gitlab-plugin
  48 +git clone https://github.com/colab/colab-noosfero-plugin
  49 +```
  50 +
  51 +## Criando diretórios - Plugins do Colab
  52 +
  53 +```bash
  54 +mkdir /etc/colab/plugins.d/
  55 +cd plugins.d
  56 +```
  57 +
  58 +## Crie os arquivos
  59 +
  60 +### gitlab.py
  61 +
  62 +```bash
  63 +vim gitlab.py
  64 +```
  65 +
  66 +#### Conteúdo do gitlab.py
  67 +
  68 +```python
  69 +from django.utils.translation import ugettext_lazy as _
  70 +from colab.plugins.utils.menu import colab_url_factory
  71 +
  72 +name = "colab_gitlab"
  73 +verbose_name = "Gitlab"
  74 +
  75 +upstream = ''
  76 +private_token = ''
  77 +
  78 +urls = {
  79 + "include":"colab_gitlab.urls",
  80 + "prefix": 'gitlab/',
  81 + "namespace":"gitlab"
  82 + }
  83 +
  84 +url = colab_url_factory('gitlab')
  85 +```
  86 +
  87 +### noosfero.py
  88 +
  89 +```bash
  90 +vim noosfero.py
  91 +```
  92 +
  93 +#### Conteúdo do noosfero.py
  94 +
  95 +```python
  96 +from django.utils.translation import ugettext_lazy as _
  97 +from colab.plugins.utils.menu import colab_url_factory
  98 +
  99 +name = "colab_noosfero"
  100 +verbose_name = "Noosfero"
  101 +private_token = ""
  102 +
  103 +upstream = 'http://<IP DA SUA MÁQUINA AQUI>:8080/social'
  104 +
  105 +urls = {
  106 + "include":"colab_noosfero.urls",
  107 + "prefix": '^social/',
  108 + "namespace":"social"
  109 + }
  110 +
  111 +url = colab_url_factory('social')
  112 +```
  113 +
  114 +### spb.py
  115 +
  116 +```bash
  117 +vim spb.py
  118 +```
  119 +
  120 +#### Conteúdo do spb.py
  121 +
  122 +```python
  123 +from django.utils.translation import ugettext_lazy as _
  124 +from colab.plugins.utils.menu import colab_url_factory
  125 +
  126 +name = "colab_spb"
  127 +verbose_name = "SPB Plugin"
  128 +urls = {
  129 + "include":"colab_spb.urls",
  130 + "prefix": '^spb/',
  131 + "namespace":"colab_spb"
  132 + }
  133 +
  134 +url = colab_url_factory('colab_spb')
  135 +```
  136 +### Execuntando scripts de instalação
  137 +
  138 +```bash
  139 +cd ~/softwarepublico/config/
  140 +pip install -e .
  141 +cd ~/softwarepublico/src/colab-spb-plugin/
  142 +pip install -e .
  143 +colab-admin migrate
  144 +colab-admin migrate colab_spb
  145 +cd ~/colab-gitlab-plugin/
  146 +pip install -e .
  147 +cd ~/softwarepublico/src/colab-spb-plugin/
  148 +pip install -e .
  149 +colab-admin migrate
  150 +```
  151 +
  152 +## Finalizando
  153 +
  154 +Execute o noosfero seja no ambiente local, ou schroot,
  155 +com o comando `RAILS_RELATIVE_URL_ROOT=/social unicorn`
  156 +
  157 +No vagrant, execute `colab-admin runserver 0.0.0.0:8000`
src/noosfero-spb/noosfero-spb-theme/css/community-pages.css
  Diff comments   View file @a11b751
@@ -409,18 +409,19 @@ @@ -409,18 +409,19 @@
409 } 409 }
410 410
411 #content #blog-tab .blog .blog-post h1{ 411 #content #blog-tab .blog .blog-post h1{
412 - margin: 0px 0px 10px 0px; 412 + margin: 0px 0px 4px 0px;
413 padding: 0px 0px 0px 0px; 413 padding: 0px 0px 0px 0px;
414 - max-width: 555px; 414 + max-width: 100%;
415 max-height: 40px; 415 max-height: 40px;
416 border: none; 416 border: none;
417 font: normal normal bold 16px/20px Arial; 417 font: normal normal bold 16px/20px Arial;
418 overflow: hidden; 418 overflow: hidden;
419 - display: inline-block; 419 + display: block;
  420 + text-align: left;
420 } 421 }
421 422
422 #content #blog-tab .blog .blog-post .post-pic{ 423 #content #blog-tab .blog .blog-post .post-pic{
423 - margin:0 20px 5px 0px; 424 + margin:0 20px 25px 0px;
424 border-radius: 4px; 425 border-radius: 4px;
425 height: 62px; 426 height: 62px;
426 width: 19%; 427 width: 19%;
@@ -477,6 +478,7 @@ @@ -477,6 +478,7 @@
477 color: #172738; 478 color: #172738;
478 padding-left:0px; 479 padding-left:0px;
479 text-align: left; 480 text-align: left;
  481 + display: inline-block;
480 } 482 }
481 #content #blog-tab .blog .blog-post.position-1 .date{ 483 #content #blog-tab .blog .blog-post.position-1 .date{
482 padding-left:0px; 484 padding-left:0px;
@@ -492,6 +494,10 @@ float: left; @@ -492,6 +494,10 @@ float: left;
492 } 494 }
493 495
494 /* Read more button*/ 496 /* Read more button*/
  497 +#content #blog-tab .blog .blog-post .read-more{
  498 + display: none;
  499 +}
  500 +
495 #content #blog-tab .blog .read-more{ 501 #content #blog-tab .blog .read-more{
496 text-align: right; 502 text-align: right;
497 display: block; 503 display: block;
@@ -1206,3 +1212,37 @@ float: left; @@ -1206,3 +1212,37 @@ float: left;
1206 font-family: Arial; 1212 font-family: Arial;
1207 line-height: 22px; 1213 line-height: 22px;
1208 } 1214 }
  1215 +
  1216 +ul.software-community-events-list {
  1217 + border: 1px solid #D3D6DE;
  1218 + border-radius: 8px;
  1219 + width: 100%;
  1220 +}
  1221 +
  1222 +li.software-events-list-item {
  1223 + border-bottom: 1px dotted #D3D6DE;
  1224 + font-size: 14px;
  1225 + padding: 7px 0px;
  1226 + padding-left: 16px;
  1227 +}
  1228 +
  1229 +li.software-events-list-item:last-child{
  1230 + border: none;
  1231 +}
  1232 +
  1233 +.software-events-list-item-calendar {
  1234 + background-image: url("../images/calendar-icon.png");
  1235 + background-repeat: no-repeat;
  1236 + width: 14px;
  1237 + height: 14px;
  1238 + float: left;
  1239 + margin-top: 2px;
  1240 +}
  1241 +
  1242 +.software-events-list-item-date {
  1243 + padding-left: 5px;
  1244 +}
  1245 +
  1246 +.software-events-list-item-title {
  1247 + padding-left: 1px;
  1248 +}
src/noosfero-spb/noosfero-spb-theme/css/home-page.css
  Diff comments   View file @a11b751
@@ -283,9 +283,9 @@ @@ -283,9 +283,9 @@
283 .action-home-index #content .display-content-block .image{ 283 .action-home-index #content .display-content-block .image{
284 padding-right: 25px; 284 padding-right: 25px;
285 padding: 0px 25px 0px 0px; 285 padding: 0px 25px 0px 0px;
286 - border: 0px solid #c0c1c1;  
287 - width: 150px; 286 + max-width: 150px;
288 display: table-cell; 287 display: table-cell;
  288 + vertical-align: top;
289 } 289 }
290 290
291 .controller-environment_design #content .display-content-block .image a, 291 .controller-environment_design #content .display-content-block .image a,
@@ -298,7 +298,6 @@ @@ -298,7 +298,6 @@
298 298
299 .controller-environment_design #content .display-content-block .image img, 299 .controller-environment_design #content .display-content-block .image img,
300 .action-home-index #content .display-content-block .image img{ 300 .action-home-index #content .display-content-block .image img{
301 - border: 0px solid #c0c1c1;  
302 max-width: 150px; 301 max-width: 150px;
303 } 302 }
304 303
src/noosfero-spb/noosfero-spb-theme/css/news-page.css
  Diff comments   View file @a11b751
@@ -57,13 +57,14 @@ @@ -57,13 +57,14 @@
57 57
58 #content .blog .blog-post h1.title { 58 #content .blog .blog-post h1.title {
59 margin: 0px 0px 10px 0px; 59 margin: 0px 0px 10px 0px;
60 - padding: 0px 0px 0px 0px;  
61 - max-width: 555px; 60 + padding: 0px;
  61 + max-width: 100%;
62 max-height: 40px; 62 max-height: 40px;
63 border: none; 63 border: none;
64 font: normal normal bold 16px/20px arial; 64 font: normal normal bold 16px/20px arial;
65 overflow: hidden; 65 overflow: hidden;
66 - display: inline-block; 66 + display: block;
  67 + white-space: normal;
67 } 68 }
68 69
69 #content .blog .blog-post h1.title a { 70 #content .blog .blog-post h1.title a {
@@ -148,15 +149,24 @@ @@ -148,15 +149,24 @@
148 149
149 150
150 /** Secondary News' Block **/ 151 /** Secondary News' Block **/
  152 +
  153 +#content .blog .page-1 .position-1 .title,
  154 +#content .blog .page-1 .position-2 .title,
  155 +#content .blog .page-1 .position-3 .title,
  156 +#content .blog .page-1 .position-4 .title {
  157 + display: inline-block;
  158 +}
  159 +
151 #content .blog .page-1 .position-2, 160 #content .blog .page-1 .position-2,
152 #content .blog .page-1 .position-3, 161 #content .blog .page-1 .position-3,
153 #content .blog .page-1 .position-4 { 162 #content .blog .page-1 .position-4 {
154 - margin: 0px 0px 0px 0px;  
155 - padding: 20px 21px 45px 0px;  
156 - height: 235px; 163 + margin: 0px;
  164 + padding: 20px 4.2% 5px 0px;
  165 + height: auto;
157 width: 30.5%; 166 width: 30.5%;
158 display: block; 167 display: block;
159 float: left; 168 float: left;
  169 + border-bottom: none;
160 } 170 }
161 171
162 #content .blog .page-1 .position-2 p, 172 #content .blog .page-1 .position-2 p,
@@ -173,7 +183,7 @@ @@ -173,7 +183,7 @@
173 #content .blog .page-1 .position-2 .post-pic, 183 #content .blog .page-1 .position-2 .post-pic,
174 #content .blog .page-1 .position-3 .post-pic, 184 #content .blog .page-1 .position-3 .post-pic,
175 #content .blog .page-1 .position-4 .post-pic { 185 #content .blog .page-1 .position-4 .post-pic {
176 - margin-top: 12px; 186 + margin-bottom: 12px;
177 top: 10px; 187 top: 10px;
178 height: 120px; 188 height: 120px;
179 width: 100%; 189 width: 100%;
@@ -200,6 +210,10 @@ @@ -200,6 +210,10 @@
200 /* This rule serves to maintain the element in position-5 clear the 210 /* This rule serves to maintain the element in position-5 clear the
201 * configurations of float. 211 * configurations of float.
202 */ 212 */
  213 +#content .blog .page-1 .blog-post.position-5{
  214 + border-top:1px solid #ccc;
  215 +}
  216 +
203 #content .blog .blog-post.position-5 { 217 #content .blog .blog-post.position-5 {
204 clear: both; 218 clear: both;
205 } 219 }
src/noosfero-spb/noosfero-spb-theme/css/notifications.css
  Diff comments   View file @a11b751
@@ -51,13 +51,14 @@ @@ -51,13 +51,14 @@
51 color: #8a6d3b; 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 font-weight: bold; 58 font-weight: bold;
57 color: #8a6d3b; 59 color: #8a6d3b;
58 } 60 }
59 61
60 -  
61 .environment-notification-plugin-notification-bar .informationnotification, 62 .environment-notification-plugin-notification-bar .informationnotification,
62 .environment-notification-plugin-notification-notification-modal .informationnotification{ 63 .environment-notification-plugin-notification-notification-modal .informationnotification{
63 background: #d9edf7; 64 background: #d9edf7;
src/noosfero-spb/noosfero-spb-theme/css/search-pages.css
  Diff comments   View file @a11b751
@@ -2,7 +2,8 @@ @@ -2,7 +2,8 @@
2 2
3 .action-search-index #content form #search-header, 3 .action-search-index #content form #search-header,
4 .action-search-people #content form #search-header, 4 .action-search-people #content form #search-header,
5 -.action-search-communities #content form #search-header { 5 +.action-search-communities #content form #search-header,
  6 +.action-search-institutions #content form #search-header {
6 float: right; 7 float: right;
7 border: none; 8 border: none;
8 } 9 }
@@ -12,12 +13,14 @@ @@ -12,12 +13,14 @@
12 } 13 }
13 14
14 .action-search-people #content form #search-header, 15 .action-search-people #content form #search-header,
15 -.action-search-communities #content form #search-header {  
16 - margin: 0 0 15px 0 ; 16 +.action-search-communities #content form #search-header,
  17 +.action-search-institutions #content form #search-header {
  18 + margin: 0 0 15px 0;
17 } 19 }
18 20
19 .action-search-people #content form #search-header #search-filters .sod_select, 21 .action-search-people #content form #search-header #search-filters .sod_select,
20 -.action-search-communities #content form #search-header #search-filters .sod_select { 22 +.action-search-communities #content form #search-header #search-filters .sod_select,
  23 +.action-search-institutions #content form #search-header #search-filters .sod_select {
21 color: #3E67B1; 24 color: #3E67B1;
22 border: 1px solid #3E67B1; 25 border: 1px solid #3E67B1;
23 border-radius: 4px; 26 border-radius: 4px;
@@ -28,7 +31,8 @@ @@ -28,7 +31,8 @@
28 } 31 }
29 32
30 .action-search-people #content form #search-header #search-filters .sod_select .sod_list, 33 .action-search-people #content form #search-header #search-filters .sod_select .sod_list,
31 -.action-search-communities #content form #search-header #search-filters .sod_select .sod_list { 34 +.action-search-communities #content form #search-header #search-filters .sod_select .sod_list,
  35 +.action-search-institutions #content form #search-header #search-filters .sod_select .sod_list {
32 margin: -2px 0 0 -1px; 36 margin: -2px 0 0 -1px;
33 color: #3E67B1; 37 color: #3E67B1;
34 border: 1px solid #3E67B1; 38 border: 1px solid #3E67B1;
@@ -40,34 +44,41 @@ @@ -40,34 +44,41 @@
40 } 44 }
41 45
42 .action-search-people #content form #search-header #search-filters .sod_select .sod_list .active, 46 .action-search-people #content form #search-header #search-filters .sod_select .sod_list .active,
43 -.action-search-communities #content form #search-header #search-filters .sod_select .sod_list .active { 47 +.action-search-communities #content form #search-header #search-filters .sod_select .sod_list .active,
  48 +.action-search-institutions #content form #search-header #search-filters .sod_select .sod_list .active {
44 border-radius: 0px 0px 4px 4px; 49 border-radius: 0px 0px 4px 4px;
45 } 50 }
46 51
47 .action-search-people #content form #search-header #search-filters .sod_select .sod_list .selected, 52 .action-search-people #content form #search-header #search-filters .sod_select .sod_list .selected,
48 -.action-search-communities #content form #search-header #search-filters .sod_select .sod_list .selected { 53 +.action-search-communities #content form #search-header #search-filters .sod_select .sod_list .selected,
  54 +.action-search-institutions #content form #search-header #search-filters .sod_select .sod_list .selected {
49 padding-right: 21px; 55 padding-right: 21px;
50 } 56 }
51 57
52 .action-search-people #content form #search-subheader .sod_select, 58 .action-search-people #content form #search-subheader .sod_select,
53 -.action-search-communities #content form #search-subheader .sod_select { 59 +.action-search-communities #content form #search-subheader .sod_select,
  60 +.action-search-institutions #content form #search-subheader .sod_select {
54 line-height: 15px; 61 line-height: 15px;
55 } 62 }
56 63
57 .action-search-index #content form .search-field, 64 .action-search-index #content form .search-field,
58 .action-search-people #content form .search-field, 65 .action-search-people #content form .search-field,
59 -.action-search-communities #content form .search-field{ 66 +.action-search-communities #content form .search-field,
  67 +.action-search-institutions #content form .search-field {
60 margin-bottom: 30px; 68 margin-bottom: 30px;
61 } 69 }
62 70
63 .action-search-index #content form .search-field .formfield, 71 .action-search-index #content form .search-field .formfield,
64 .action-search-people #content form .search-field .formfield, 72 .action-search-people #content form .search-field .formfield,
65 -.action-search-communities #content form .search-field .formfield{ 73 +.action-search-communities #content form .search-field .formfield,
  74 +.action-search-institutions #content form .search-field .formfield {
66 width: 99%; 75 width: 99%;
67 } 76 }
  77 +
68 .action-search-index #content form .search-field .formfield input, 78 .action-search-index #content form .search-field .formfield input,
69 .action-search-people #content form .search-field .formfield input, 79 .action-search-people #content form .search-field .formfield input,
70 -.action-search-communities #content form .search-field .formfield input { 80 +.action-search-communities #content form .search-field .formfield input,
  81 +.action-search-institutions #content form .search-field .formfield input {
71 margin-top: 0px; 82 margin-top: 0px;
72 padding: 6px; 83 padding: 6px;
73 height: 19px; 84 height: 19px;
@@ -81,7 +92,8 @@ @@ -81,7 +92,8 @@
81 92
82 .action-search-index #content form input.button.submit, 93 .action-search-index #content form input.button.submit,
83 .action-search-people #content form input.button.submit, 94 .action-search-people #content form input.button.submit,
84 -.action-search-communities #content form input.button.submit { 95 +.action-search-communities #content form input.button.submit,
  96 +.action-search-institutions #content form input.button.submit {
85 background: #3E67B1; 97 background: #3E67B1;
86 color: #FFF; 98 color: #FFF;
87 border-radius: 4px; 99 border-radius: 4px;
@@ -94,12 +106,14 @@ @@ -94,12 +106,14 @@
94 106
95 .action-search-index #content form input.button.submit:hover, 107 .action-search-index #content form input.button.submit:hover,
96 .action-search-people #content form input.button.submit:hover, 108 .action-search-people #content form input.button.submit:hover,
97 -.action-search-communities #content form input.button.submit:hover { 109 +.action-search-communities #content form input.button.submit:hover,
  110 +.action-search-institutions #content form input.button.submit:hover {
98 background: #5E82C6; 111 background: #5E82C6;
99 } 112 }
100 113
101 .action-search-people #search-results .search-results-type-people, 114 .action-search-people #search-results .search-results-type-people,
102 -.action-search-communities #search-results .search-results-type-community { 115 +.action-search-communities #search-results .search-results-type-community,
  116 +.action-search-institutions #search-results .search-results-type-institution {
103 background: none; 117 background: none;
104 border: 1px solid #ccc; 118 border: 1px solid #ccc;
105 border-radius: 10px; 119 border-radius: 10px;
@@ -119,3 +133,31 @@ @@ -119,3 +133,31 @@
119 background: none; 133 background: none;
120 border: 1px solid #ccc; 134 border: 1px solid #ccc;
121 } 135 }
  136 +
  137 +.search-software-item .search-software-content-block .search-content-result a {
  138 + color: #172738 !important;
  139 +}
  140 +
  141 +.action-search-institutions .common-profile-list-block .vcard a.profile_link, .comment-actions .vcard a.profile_link{
  142 + height: 108px;
  143 + max-height: 108px;
  144 +}
  145 +
  146 +.action-search-institutions #content .search-results-box .vcard{
  147 + margin: 8.5px
  148 +}
  149 +
  150 +.action-search-institutions .menu-submenu-content{
  151 + height: auto;
  152 +}
  153 +
  154 +.action-search-institutions #content .menu-submenu h4{
  155 + text-align: center;
  156 +}
  157 +
  158 +.action-search-institutions #content .menu-submenu-content ul a{
  159 + padding-left: 0;
  160 + text-align: center;
  161 +}
  162 +
  163 +
src/noosfero-spb/noosfero-spb-theme/css/software-pages.css
  Diff comments   View file @a11b751
@@ -89,14 +89,15 @@ @@ -89,14 +89,15 @@
89 display: block; 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 text-align: center; 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 #content .download-block .download-info { 103 #content .download-block .download-info {
@@ -208,9 +209,7 @@ @@ -208,9 +209,7 @@
208 } 209 }
209 210
210 #content .box-1 .categories-and-tags-block .category_cloud{ 211 #content .box-1 .categories-and-tags-block .category_cloud{
211 - display: inline-flex;  
212 margin: 13px 0 10px 0; 212 margin: 13px 0 10px 0;
213 - max-width: 87%;  
214 } 213 }
215 214
216 #content .box-1 .categories-and-tags-block .category_cloud a{ 215 #content .box-1 .categories-and-tags-block .category_cloud a{
@@ -590,7 +589,7 @@ @@ -590,7 +589,7 @@
590 padding: 45px 40px 4px 10px; 589 padding: 45px 40px 4px 10px;
591 border: 1px solid #2C66CE; 590 border: 1px solid #2C66CE;
592 border-radius: 4px; 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 display: block; 593 display: block;
595 float: left; 594 float: left;
596 } 595 }
src/noosfero-spb/noosfero-spb-theme/css/use-report.css
  Diff comments   View file @a11b751
@@ -322,8 +322,12 @@ @@ -322,8 +322,12 @@
322 padding-right: 6px; 322 padding-right: 6px;
323 } 323 }
324 324
  325 +/*FIX_ME - tmp css solution for development tmp solution, remove when fixed on plugin*/
  326 +
325 #content .star-rate-form .star-comment-container .comments-software-extra-fields #organization_rating_people_benefited, 327 #content .star-rate-form .star-comment-container .comments-software-extra-fields #organization_rating_people_benefited,
326 -#content .star-rate-form .star-comment-container .comments-software-extra-fields #organization_rating_saved_value { 328 +#content .star-rate-form .star-comment-container .comments-software-extra-fields #organization_rating_saved_value,
  329 +#content .star-rate-form .star-comment-container .comments-software-extra-fields #people_benefited_tmp,
  330 +#content .star-rate-form .star-comment-container .comments-software-extra-fields #saved_value_tmp {
327 display: block; 331 display: block;
328 height: 19px; 332 height: 19px;
329 width: 155px; 333 width: 155px;
@@ -344,13 +348,17 @@ @@ -344,13 +348,17 @@
344 #content .star-rate-form .star-comment-container .star-tooltip { 348 #content .star-rate-form .star-comment-container .star-tooltip {
345 cursor: default; 349 cursor: default;
346 content: '?'; 350 content: '?';
347 - border-radius: 90%;  
348 - font-size: 12px;  
349 - font-weight: 700;  
350 - background: #3867b7;  
351 - color: #fff;  
352 - margin-left: 4px;  
353 - padding: 0px 6px; 351 + padding-top: 2px;
  352 + background-color: #3867b7;
  353 + color: #ffffff;
  354 + font-weight: bold;
  355 + cursor: pointer;
  356 + height: 15px;
  357 + font-family: arial;
  358 + width: 17px;
  359 + display: inline-block;
  360 + text-align: center;
  361 + border-radius: 50%
354 } 362 }
355 363
356 .ratings-list { 364 .ratings-list {
src/noosfero-spb/noosfero-spb-theme/images/history-mini_icon.png 0 → 100644
View file @a11b751

476 Bytes
src/noosfero-spb/noosfero-spb-theme/theme.js
  Diff comments   View file @a11b751
@@ -268,10 +268,15 @@ $(&#39;#link-buscar&#39;).click(function(e) { @@ -268,10 +268,15 @@ $(&#39;#link-buscar&#39;).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 $(document).ready(function(){ 275 $(document).ready(function(){
272 add_tooltips(); 276 add_tooltips();
273 add_popovers(); 277 add_popovers();
274 move_article_buttons(); 278 move_article_buttons();
  279 + move_breadcrumbs();
275 insert_notice_div(); 280 insert_notice_div();
276 set_uploaded_files_names(); 281 set_uploaded_files_names();
277 set_tooltip_content(); 282 set_tooltip_content();