Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactoring #491

Merged
merged 26 commits into from
May 6, 2017
Merged

Refactoring #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
e174643
colocando opção de enviar foto junto com o comentario em relatorios
May 5, 2017
de10b96
improved styling as well as displaying most active users as well as m…
fbormann May 5, 2017
bcf2559
finished user charts
fbormann May 5, 2017
54304f2
resolvendo problemas com traduções nos relatorios de webpage
May 5, 2017
082830a
colocando a opção de enviar mensagem junto com o texto quando for env…
May 5, 2017
0d54eff
resolvendo problemas com traduções nos relatorios de pdf_file
May 5, 2017
160dc1e
Merge branch 'refactoring' of https://github.com/amadeusproject/amade…
May 5, 2017
f90a61a
criando a página de relatórios para link para arquivo
May 5, 2017
7f4a42b
criando a opção de enviar mensagem em file_link
May 5, 2017
ec57dec
colocando as traduções do relatórios de file_link
May 5, 2017
46dd764
Criando o log de visualizar link
May 5, 2017
b7b7e74
criando a página de relatórios para links
May 5, 2017
8409d42
criando a opção de enviar mensagem em links
May 5, 2017
69fad6b
colocando as traduções do relatórios de links
May 5, 2017
772fbb0
criando a página de relatórios para videos do youtube
May 6, 2017
351d1d8
criando a opção de enviar mensagem em relatórios de videos do youtube
May 6, 2017
e7f3386
colocando as traduções do relatórios de videos do youtube
May 6, 2017
7fe9c24
concertando breadcumps de relatorios de video do youtube
May 6, 2017
d0b0c69
concertando breadcumps de relatorios de links
May 6, 2017
ccdc780
concertando breadcumps de relatorios de file_link
May 6, 2017
5edc22c
Style adjusts
Zambom May 6, 2017
abe904f
colocando a tradução do tipo de ação realizada em webpage
May 6, 2017
39426db
colocando a tradução do tipo de ação realizada em file_link
May 6, 2017
e3cdad6
colocando a tradução do tipo de ação realizada em links
May 6, 2017
7c07a12
colocando a tradução do tipo de ação realizada em pdf_file
May 6, 2017
c2ff223
Merge branch 'refactoring' of https://github.com/amadeusproject/amade…
May 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified amadeus/static/css/.sass-cache/a7f87b90919294b62ab4f8079e31dcda8f485534/green.sassc
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion amadeus/static/css/base/amadeus.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1612,7 +1612,7 @@ div.dataTables_wrapper div.dataTables_paginate {
font-size: 14px;
}

.subject-related-panel .panel {
.subject-related-panel .panel:not(.participant) {
margin-bottom: 0px;
}

Expand Down
20 changes: 0 additions & 20 deletions amadeus/static/css/base/amadeus_responsive.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@
height: 38px;
}

.mural .post_make .user-img img {
max-width: 70px;
max-height: 70px;
}

.mural .post_make .post-field h4 {
line-height: 2.6em;
}
Expand All @@ -35,11 +30,6 @@
height: 38px;
}

.mural .post_make .user-img img {
max-width: 65px;
max-height: 65px;
}

.mural .post_make .post-field h4 {
line-height: 2.3em;
}
Expand Down Expand Up @@ -134,11 +124,6 @@
height: 60px;
}

.mural .post_make .user-img img {
max-width: 60px;
max-height: 60px;
}

.mural .post_make .post-field h4 {
line-height: 2em;
}
Expand Down Expand Up @@ -228,11 +213,6 @@
height: 50px;
}

.mural .post_make .user-img img {
max-width: 50px;
max-height: 50px;
}

.mural .post_make .post-field h4 {
line-height: 1.6em;
}
Expand Down
3 changes: 0 additions & 3 deletions amadeus/static/css/themes/green.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion amadeus/static/css/themes/green.css.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions amadeus/static/css/themes/green.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,10 +544,6 @@ a.add-row
background: $white


.mural .post_make .user-img, .post .post-img, .post .post-comment .user-img div, .comment .comment-img div
background: #CCCCCC


.mural .post_make .post-field div
border-color: #CCCCCC

Expand Down
Binary file modified analytics/static/.sass-cache/9bdb779ec82a4a96f72be09b83b7c997addd0129/general.sassc
View file
Open in desktop
Binary file not shown.
27 changes: 25 additions & 2 deletions analytics/static/analytics/general.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion analytics/static/analytics/general.css.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 29 additions & 3 deletions analytics/static/analytics/general.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,39 @@ $title-color: #009688
color: $title-color

.selector
width: 80%
height: 40px
width: 90%
height: 20%
color: white
padding-left: 5px
background-color: #009688
margin-top: 10px
border-radius: 0px 20px 20px 0px
p
padding-top: 10px
font-size: 16px
font-size: 16px


.middle-chart
article
text-align: center

.user-tooltip
background: linear-gradient( #0e8999, #6bf0ce)
color: white
border-radius: 10px
padding: 7px

.most-accessed-list
background-color: #52b7bd
width: 80%
margin-left: 2%
margin-top: 2%
padding-left: 0
color: white
transition: width 2s, height 2s, background-color 2s, transform 2s

li
padding-left: 1%

.most-accessed-item:hover
background-color: #3aa7ad
Loading