diff --git a/app/partials/home/home-logged-in.jade b/app/partials/home/home-logged-in.jade index 81f8e879..1104a300 100644 --- a/app/partials/home/home-logged-in.jade +++ b/app/partials/home/home-logged-in.jade @@ -6,5 +6,6 @@ div.profile.centered include ../includes/modules/profile/profile-content-tabs div.content-wrapper div.content - include ../includes/modules/profile/profile-timeline + //include ../includes/modules/profile/profile-timeline + include ../includes/modules/profile/profile-projects include ../includes/modules/profile/profile-sidebar diff --git a/app/partials/includes/modules/profile/profile-sidebar.jade b/app/partials/includes/modules/profile/profile-sidebar.jade index dc351a25..d21cc246 100644 --- a/app/partials/includes/modules/profile/profile-sidebar.jade +++ b/app/partials/includes/modules/profile/profile-sidebar.jade @@ -10,5 +10,5 @@ aside.profile-sidebar p Did you know you can archive user Stories? p Archived User Stories help you organize better your columns and remove old cards. - a(href="", title="visit our archived user stories support page") If you want to know how to use it visit our archived user stories support page + a(href="", title="visit our archived user stories support page") If you want to know how to use it visit our archived user stories support page diff --git a/app/partials/includes/modules/profile/profile-timeline.jade b/app/partials/includes/modules/profile/profile-timeline.jade index 0fedd998..72ecb54b 100644 --- a/app/partials/includes/modules/profile/profile-timeline.jade +++ b/app/partials/includes/modules/profile/profile-timeline.jade @@ -2,6 +2,7 @@ section.profile-timeline - for (var x = 0; x < 3; x++) // Simple message for favorites, updates, etc. div.activity-simple + span.activity-date Yesterday 12.30h div.activity-info picture a(href="", title="{{ user.nickname }}") @@ -13,6 +14,7 @@ section.profile-timeline // Added comment in us, task or issue. div.activity-comment + span.activity-date 3 days ago div.activity-info picture a(href="", title="{{ user.nickname }}") @@ -26,6 +28,7 @@ section.profile-timeline // Added attachment type image in us, task or issue. div.activity-image + span.activity-date 5 days ago div.activity-info picture a(href="", title="{{ user.nickname }}") @@ -40,6 +43,7 @@ section.profile-timeline // Multiple update message, etc. div.activity-notification + span.activity-date 6 days ago div.activity-info picture a(href="", title="{{ user.nickname }}") @@ -59,6 +63,7 @@ section.profile-timeline // Added attachment type image in us, task or issue. div.activity-member + span.activity-date a week ago div.activity-info picture a(href="", title="{{ organization.nickname }}") @@ -76,6 +81,7 @@ section.profile-timeline // Added comment in us, task or issue. div.activity-project + span.activity-date a week ago div.activity-info picture a(href="", title="{{ organization.nickname }}") diff --git a/app/styles/core/typography.scss b/app/styles/core/typography.scss index 20de8e7d..65a21a8e 100755 --- a/app/styles/core/typography.scss +++ b/app/styles/core/typography.scss @@ -29,12 +29,11 @@ h6 { h1 { @extend %xxlarge; @extend %title; - line-height: 3.4rem; + line-height: 1.5; margin-bottom: 1rem; text-transform: uppercase; span { @extend %xxlarge; - line-height: 3.4rem; margin-right: .5rem; overflow: hidden; text-overflow: ellipsis; @@ -65,10 +64,12 @@ h1 { h2 { @extend %xlarge; @extend %title; + line-height: 1.2; margin-bottom: 1rem; } p { + line-height: 1.5; margin: 0 0 20px; img { margin: 0; diff --git a/app/styles/dependencies/helpers.scss b/app/styles/dependencies/helpers.scss index e1d484f5..d78b24d9 100644 --- a/app/styles/dependencies/helpers.scss +++ b/app/styles/dependencies/helpers.scss @@ -8,9 +8,9 @@ %xxlarge {font-size: 3rem;} // __Font Types__ // -%title {font-family: 'OpenSans-CondLight', Arial, Helvetica, sans-serif;} -%text {font-family: 'opensans-regular', Arial, Helvetica, sans-serif; line-height: 1.3rem;} -%bold {font-family: 'opensans-semibold', Arial, Helvetica, sans-serif;} +%title {font-family: 'OpenSans-CondLight', Arial, Helvetica, sans-serif; line-height: 1.5;} +%text {font-family: 'opensans-regular', Arial, Helvetica, sans-serif; line-height: 1.5;} +%bold {font-family: 'opensans-semibold', Arial, Helvetica, sans-serif; line-height: 1.5;} %taiga {font-family: 'taiga';} %mono {font-family: 'courier new', 'monospace';} diff --git a/app/styles/modules/profile/profile-timeline.scss b/app/styles/modules/profile/profile-timeline.scss index 124979dd..63c10102 100644 --- a/app/styles/modules/profile/profile-timeline.scss +++ b/app/styles/modules/profile/profile-timeline.scss @@ -4,9 +4,18 @@ %profile-activity { border-bottom: 1px solid $whitish; padding: .8rem 1rem; + position: relative; .activity-info { align-items: center; display: flex; + margin-right: 100px; + } + .activity-date { + @extend %xsmall; + color: $gray-light; + position: absolute; + right: .5rem; + top: .5rem; } picture { margin-right: .5rem; @@ -17,7 +26,7 @@ } } p { - margin: 0; + margin-bottom: .5rem; a { color: $green-taiga; } @@ -53,7 +62,7 @@ .activity-notification-list { border-left: 2px solid $whitish; margin-bottom: .5rem; - margin-left: calc(30px + .5rem); + margin-left: calc(35px + .5rem); margin-top: .5rem; padding: .2rem 1rem; li { @@ -65,7 +74,7 @@ .activity-member-view { display: flex; margin-bottom: .5rem; - margin-left: calc(30px + .5rem); + margin-left: calc(35px + .5rem); margin-top: .5rem; picture { margin-right: 1rem;