taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CrossBrowser fixes

stable
Xavier Julián 2015-03-27 08:32:25 +01:00 committed by Juanfran
parent 3d8a8b29cd
commit d3a38b9fb5
6 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/partials/home/home-logged-in.jade
View File

@ -6,7 +6,7 @@ div.profile.centered
include ../includes/modules/profile/profile-content-tabs include ../includes/modules/profile/profile-content-tabs
div.content-wrapper div.content-wrapper
div.content div.content
//clude ../includes/modules/profile/profile-timeline //include ../includes/modules/profile/profile-timeline
//include ../includes/modules/profile/profile-projects //include ../includes/modules/profile/profile-projects
include ../includes/modules/profile/profile-contacts include ../includes/modules/profile/profile-contacts
//include ../includes/modules/profile/profile-favorites //include ../includes/modules/profile/profile-favorites

4
app/partials/includes/modules/profile/profile-contacts.jade
View File

@ -6,7 +6,7 @@ section.profile-contacts
a(href="", title="Only show people follow you") followers a(href="", title="Only show people follow you") followers
- for (var x = 0; x < 3; x++) - for (var x = 0; x < 3; x++)
div.profile-contact-single div.profile-contact-single
picture div.profile-contact-picture
a(href="", title="See {{ user.nickname }} profile") a(href="", title="See {{ user.nickname }} profile")
img(src="https://s3.amazonaws.com/uifaces/faces/twitter/koridhandy/128.jpg", alt="{{ user.nickname }}") img(src="https://s3.amazonaws.com/uifaces/faces/twitter/koridhandy/128.jpg", alt="{{ user.nickname }}")
div.profile-contact-data div.profile-contact-data
@ -26,7 +26,7 @@ section.profile-contacts
span.stat-num 4 span.stat-num 4
div.profile-contact-single div.profile-contact-single
picture div.profile-contact-picture
a(href="", title="See {{ user.nickname }} profile") a(href="", title="See {{ user.nickname }} profile")
img(src="https://s3.amazonaws.com/uifaces/faces/twitter/marktimemedia/128.jpg", alt="{{ user.nickname }}") img(src="https://s3.amazonaws.com/uifaces/faces/twitter/marktimemedia/128.jpg", alt="{{ user.nickname }}")
div.profile-contact-data div.profile-contact-data

14
app/partials/includes/modules/profile/profile-timeline.jade
View File

@ -4,7 +4,7 @@ section.profile-timeline
div.activity-simple div.activity-simple
span.activity-date Yesterday 12.30h span.activity-date Yesterday 12.30h
div.activity-info div.activity-info
picture div.profile-contact-picture
a(href="", title="{{ user.nickname }}") a(href="", title="{{ user.nickname }}")
img(src="https://s3.amazonaws.com/uifaces/faces/twitter/gerrenlamson/128.jpg", alt="{{ user.nickname }}") img(src="https://s3.amazonaws.com/uifaces/faces/twitter/gerrenlamson/128.jpg", alt="{{ user.nickname }}")
p p
@ -16,7 +16,7 @@ section.profile-timeline
div.activity-comment div.activity-comment
span.activity-date 3 days ago span.activity-date 3 days ago
div.activity-info div.activity-info
picture div.profile-contact-picture
a(href="", title="{{ user.nickname }}") a(href="", title="{{ user.nickname }}")
img(src="https://s3.amazonaws.com/uifaces/faces/twitter/tonystubblebine/128.jpg", alt="{{ user.nickname }}") img(src="https://s3.amazonaws.com/uifaces/faces/twitter/tonystubblebine/128.jpg", alt="{{ user.nickname }}")
p p
@ -30,7 +30,7 @@ section.profile-timeline
div.activity-image div.activity-image
span.activity-date 5 days ago span.activity-date 5 days ago
div.activity-info div.activity-info
picture div.profile-contact-picture
a(href="", title="{{ user.nickname }}") a(href="", title="{{ user.nickname }}")
img(src="https://s3.amazonaws.com/uifaces/faces/twitter/jina/128.jpg", alt="{{ user.nickname }}") img(src="https://s3.amazonaws.com/uifaces/faces/twitter/jina/128.jpg", alt="{{ user.nickname }}")
p p
@ -45,7 +45,7 @@ section.profile-timeline
div.activity-notification div.activity-notification
span.activity-date 6 days ago span.activity-date 6 days ago
div.activity-info div.activity-info
picture div.profile-contact-picture
a(href="", title="{{ user.nickname }}") a(href="", title="{{ user.nickname }}")
img(src="https://s3.amazonaws.com/uifaces/faces/twitter/idiot/128.jpg", alt="{{ user.nickname }}") img(src="https://s3.amazonaws.com/uifaces/faces/twitter/idiot/128.jpg", alt="{{ user.nickname }}")
p p
@ -65,14 +65,14 @@ section.profile-timeline
div.activity-member div.activity-member
span.activity-date a week ago span.activity-date a week ago
div.activity-info div.activity-info
picture div.profile-contact-picture
a(href="", title="{{ organization.nickname }}") a(href="", title="{{ organization.nickname }}")
img(src="https://s3.amazonaws.com/uifaces/faces/twitter/tofslie/128.jpg", alt="{{ organization.nickname }}") img(src="https://s3.amazonaws.com/uifaces/faces/twitter/tofslie/128.jpg", alt="{{ organization.nickname }}")
p p
a(href="", title="See {{ organization.nickname }} profile") Mozilla a(href="", title="See {{ organization.nickname }} profile") Mozilla
span has a new member span has a new member
div.activity-member-view div.activity-member-view
picture div.profile-member-picture
img(src="https://s3.amazonaws.com/uifaces/faces/twitter/BillSKenney/128.jpg", alt="{{ organization.nickname }}") img(src="https://s3.amazonaws.com/uifaces/faces/twitter/BillSKenney/128.jpg", alt="{{ organization.nickname }}")
div.activity-member-info div.activity-member-info
a(href="", title="See {{ user.nickname }} profile") a(href="", title="See {{ user.nickname }} profile")
@ -83,7 +83,7 @@ section.profile-timeline
div.activity-project div.activity-project
span.activity-date a week ago span.activity-date a week ago
div.activity-info div.activity-info
picture div.profile-contact-picture
a(href="", title="{{ organization.nickname }}") a(href="", title="{{ organization.nickname }}")
img(src="https://s3.amazonaws.com/uifaces/faces/twitter/ekvium/128.jpg", alt="{{ organization.nickname }}") img(src="https://s3.amazonaws.com/uifaces/faces/twitter/ekvium/128.jpg", alt="{{ organization.nickname }}")
p p

4
app/styles/modules/profile/profile-bar.scss
View File

@ -31,7 +31,7 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin-bottom: 1rem; margin-bottom: 1rem;
padding: 1rem; padding: .5rem 1rem;
.stat { .stat {
padding: 0 .2rem; padding: 0 .2rem;
text-align: center; text-align: center;
@ -40,7 +40,7 @@
@extend %xlarge; @extend %xlarge;
@extend %title; @extend %title;
display: block; display: block;
margin-bottom: .3rem; line-height: 1;
} }
.stat-name { .stat-name {
@extend %title; @extend %title;

2
app/styles/modules/profile/profile-contacts.scss
View File

@ -25,7 +25,7 @@
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
padding: .8rem 1rem; padding: .8rem 1rem;
picture { .profile-contact-picture {
flex-grow: 0; flex-grow: 0;
margin-right: 1rem; margin-right: 1rem;
max-width: 100px; max-width: 100px;

16
app/styles/modules/profile/profile-timeline.scss
View File

@ -17,7 +17,7 @@
right: .5rem; right: .5rem;
top: .5rem; top: .5rem;
} }
picture { .profile-contact-picture {
margin-right: .5rem; margin-right: .5rem;
vertical-align: center; vertical-align: center;
width: 35px; width: 35px;
@ -76,12 +76,6 @@
margin-bottom: .5rem; margin-bottom: .5rem;
margin-left: calc(35px + .5rem); margin-left: calc(35px + .5rem);
margin-top: .5rem; margin-top: .5rem;
picture {
margin-right: 1rem;
max-width: 64px;
min-width: 32px;
width: 100%;
}
.activity-member-info { .activity-member-info {
flex: 1; flex: 1;
} }
@ -92,5 +86,13 @@
color: $gray-light; color: $gray-light;
} }
} }
.profile-member-picture {
img {
margin-right: 1rem;
max-width: 64px;
min-width: 32px;
width: 100%;
}
}
} }
} }