diff --git a/app/partials/home/home-logged-in.jade b/app/partials/home/home-logged-in.jade index 42b5ded5..20760956 100644 --- a/app/partials/home/home-logged-in.jade +++ b/app/partials/home/home-logged-in.jade @@ -6,7 +6,7 @@ div.profile.centered include ../includes/modules/profile/profile-content-tabs div.content-wrapper 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-contacts //include ../includes/modules/profile/profile-favorites diff --git a/app/partials/includes/modules/profile/profile-contacts.jade b/app/partials/includes/modules/profile/profile-contacts.jade index ed0bce30..e3ed4c1f 100644 --- a/app/partials/includes/modules/profile/profile-contacts.jade +++ b/app/partials/includes/modules/profile/profile-contacts.jade @@ -6,7 +6,7 @@ section.profile-contacts a(href="", title="Only show people follow you") followers - for (var x = 0; x < 3; x++) div.profile-contact-single - picture + div.profile-contact-picture a(href="", title="See {{ user.nickname }} profile") img(src="https://s3.amazonaws.com/uifaces/faces/twitter/koridhandy/128.jpg", alt="{{ user.nickname }}") div.profile-contact-data @@ -26,7 +26,7 @@ section.profile-contacts span.stat-num 4 div.profile-contact-single - picture + div.profile-contact-picture a(href="", title="See {{ user.nickname }} profile") img(src="https://s3.amazonaws.com/uifaces/faces/twitter/marktimemedia/128.jpg", alt="{{ user.nickname }}") div.profile-contact-data diff --git a/app/partials/includes/modules/profile/profile-timeline.jade b/app/partials/includes/modules/profile/profile-timeline.jade index 72ecb54b..f4daf1fb 100644 --- a/app/partials/includes/modules/profile/profile-timeline.jade +++ b/app/partials/includes/modules/profile/profile-timeline.jade @@ -4,7 +4,7 @@ section.profile-timeline div.activity-simple span.activity-date Yesterday 12.30h div.activity-info - picture + div.profile-contact-picture a(href="", title="{{ user.nickname }}") img(src="https://s3.amazonaws.com/uifaces/faces/twitter/gerrenlamson/128.jpg", alt="{{ user.nickname }}") p @@ -16,7 +16,7 @@ section.profile-timeline div.activity-comment span.activity-date 3 days ago div.activity-info - picture + div.profile-contact-picture a(href="", title="{{ user.nickname }}") img(src="https://s3.amazonaws.com/uifaces/faces/twitter/tonystubblebine/128.jpg", alt="{{ user.nickname }}") p @@ -30,7 +30,7 @@ section.profile-timeline div.activity-image span.activity-date 5 days ago div.activity-info - picture + div.profile-contact-picture a(href="", title="{{ user.nickname }}") img(src="https://s3.amazonaws.com/uifaces/faces/twitter/jina/128.jpg", alt="{{ user.nickname }}") p @@ -45,7 +45,7 @@ section.profile-timeline div.activity-notification span.activity-date 6 days ago div.activity-info - picture + div.profile-contact-picture a(href="", title="{{ user.nickname }}") img(src="https://s3.amazonaws.com/uifaces/faces/twitter/idiot/128.jpg", alt="{{ user.nickname }}") p @@ -65,14 +65,14 @@ section.profile-timeline div.activity-member span.activity-date a week ago div.activity-info - picture + div.profile-contact-picture a(href="", title="{{ organization.nickname }}") img(src="https://s3.amazonaws.com/uifaces/faces/twitter/tofslie/128.jpg", alt="{{ organization.nickname }}") p a(href="", title="See {{ organization.nickname }} profile") Mozilla span has a new member div.activity-member-view - picture + div.profile-member-picture img(src="https://s3.amazonaws.com/uifaces/faces/twitter/BillSKenney/128.jpg", alt="{{ organization.nickname }}") div.activity-member-info a(href="", title="See {{ user.nickname }} profile") @@ -83,7 +83,7 @@ section.profile-timeline div.activity-project span.activity-date a week ago div.activity-info - picture + div.profile-contact-picture a(href="", title="{{ organization.nickname }}") img(src="https://s3.amazonaws.com/uifaces/faces/twitter/ekvium/128.jpg", alt="{{ organization.nickname }}") p diff --git a/app/styles/modules/profile/profile-bar.scss b/app/styles/modules/profile/profile-bar.scss index 83ddc082..882781ac 100644 --- a/app/styles/modules/profile/profile-bar.scss +++ b/app/styles/modules/profile/profile-bar.scss @@ -31,7 +31,7 @@ display: flex; justify-content: space-between; margin-bottom: 1rem; - padding: 1rem; + padding: .5rem 1rem; .stat { padding: 0 .2rem; text-align: center; @@ -40,7 +40,7 @@ @extend %xlarge; @extend %title; display: block; - margin-bottom: .3rem; + line-height: 1; } .stat-name { @extend %title; diff --git a/app/styles/modules/profile/profile-contacts.scss b/app/styles/modules/profile/profile-contacts.scss index 568ae0a0..bd76eee4 100644 --- a/app/styles/modules/profile/profile-contacts.scss +++ b/app/styles/modules/profile/profile-contacts.scss @@ -25,7 +25,7 @@ display: flex; flex-wrap: wrap; padding: .8rem 1rem; - picture { + .profile-contact-picture { flex-grow: 0; margin-right: 1rem; max-width: 100px; diff --git a/app/styles/modules/profile/profile-timeline.scss b/app/styles/modules/profile/profile-timeline.scss index 63c10102..e660bb4a 100644 --- a/app/styles/modules/profile/profile-timeline.scss +++ b/app/styles/modules/profile/profile-timeline.scss @@ -17,7 +17,7 @@ right: .5rem; top: .5rem; } - picture { + .profile-contact-picture { margin-right: .5rem; vertical-align: center; width: 35px; @@ -76,12 +76,6 @@ margin-bottom: .5rem; margin-left: calc(35px + .5rem); margin-top: .5rem; - picture { - margin-right: 1rem; - max-width: 64px; - min-width: 32px; - width: 100%; - } .activity-member-info { flex: 1; } @@ -92,5 +86,13 @@ color: $gray-light; } } + .profile-member-picture { + img { + margin-right: 1rem; + max-width: 64px; + min-width: 32px; + width: 100%; + } + } } }