diff --git a/app/fonts/taiga.eot b/app/fonts/taiga.eot index 39b73c70..f8cdfc90 100644 Binary files a/app/fonts/taiga.eot and b/app/fonts/taiga.eot differ diff --git a/app/fonts/taiga.svg b/app/fonts/taiga.svg index 018e647f..435c7a92 100644 --- a/app/fonts/taiga.svg +++ b/app/fonts/taiga.svg @@ -30,16 +30,13 @@ - - - @@ -49,7 +46,6 @@ - @@ -59,4 +55,9 @@ + + + + + diff --git a/app/fonts/taiga.ttf b/app/fonts/taiga.ttf index 6b27df58..67c906cc 100644 Binary files a/app/fonts/taiga.ttf and b/app/fonts/taiga.ttf differ diff --git a/app/fonts/taiga.woff b/app/fonts/taiga.woff index 48f74d8f..5c346f3a 100644 Binary files a/app/fonts/taiga.woff and b/app/fonts/taiga.woff differ diff --git a/app/partials/home/home-logged-in.jade b/app/partials/home/home-logged-in.jade index 39d87b3a..01d37d8f 100644 --- a/app/partials/home/home-logged-in.jade +++ b/app/partials/home/home-logged-in.jade @@ -6,6 +6,4 @@ div.profile.centered include ../includes/modules/profile/profile-content-tabs div.content-wrapper section.content - section.sidebar Sidebar - - + include ../includes/modules/profile/profile-sidebar diff --git a/app/partials/includes/modules/profile/profile-content-tabs.jade b/app/partials/includes/modules/profile/profile-content-tabs.jade index f28d9c3e..c5c956d5 100644 --- a/app/partials/includes/modules/profile/profile-content-tabs.jade +++ b/app/partials/includes/modules/profile/profile-content-tabs.jade @@ -1,13 +1,13 @@ nav.profile-content-tabs a.tab.active(href="", title="Activity Tab") - span.icon.icon-plus + span.icon.icon-timeline span activity a.tab(href="", title="Projects Tab") - span.icon.icon-plus + span.icon.icon-project span projects a.tab(href="", title="Contacts Tab") - span.icon.icon-plus + span.icon.icon-team span contacts a.tab(href="", title="Favorites Tab") - span.icon.icon-plus + span.icon.icon-star-fill span favorites diff --git a/app/partials/includes/modules/profile/profile-sidebar.jade b/app/partials/includes/modules/profile/profile-sidebar.jade new file mode 100644 index 00000000..a9edb1c0 --- /dev/null +++ b/app/partials/includes/modules/profile/profile-sidebar.jade @@ -0,0 +1,14 @@ +section.profile-sidebar + h4 Your profile + p Lots of people could see what do you do and what are you working on. Add tags so you will give an enhanced version of your information. + a.trans-button + span Add info + + h4 + span.icon.icon-help + span Hint + + 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 + diff --git a/app/styles/core/typography.scss b/app/styles/core/typography.scss index 67e91155..20de8e7d 100755 --- a/app/styles/core/typography.scss +++ b/app/styles/core/typography.scss @@ -198,18 +198,12 @@ a:visited { .icon-move:before { content: 'w'; } -.icon-drag-h:before { - content: 'x'; -} .icon-drag-v:before { content: 'y'; } .icon-filter:before { content: 'z'; } -.icon-github:before { - content: 'A'; -} .icon-help:before { content: 'B'; } @@ -225,9 +219,6 @@ a:visited { .icon-floppy:before { content: 'F'; } -.icon-idea:before { - content: 'G'; -} .icon-warning-alt:before { content: 'H'; } @@ -255,9 +246,6 @@ a:visited { .icon-team:before { content: 'T'; } -.icon-spinner:before { - content: 'J'; -} .icon-vfold:before { content: 'N'; } @@ -285,3 +273,18 @@ a:visited { .icon-upload:before { content: 'Z'; } +.icon-github:before { + content: 'A'; +} +.icon-timeline:before { + content: 'x'; +} +.icon-project:before { + content: 'G'; +} +.icon-star-fill:before { + content: 'J'; +} +.icon-star:before { + content: '0'; +} diff --git a/app/styles/layout/profile.scss b/app/styles/layout/profile.scss index f0beb45c..76a860fc 100644 --- a/app/styles/layout/profile.scss +++ b/app/styles/layout/profile.scss @@ -26,8 +26,7 @@ flex: 1; margin-right: 1rem; } - .sidebar { - background: #121212; + .profile-sidebar { width: 150px; } } diff --git a/app/styles/modules/profile/profile-content-tabs.scss b/app/styles/modules/profile/profile-content-tabs.scss index b5905eb5..8c26c58e 100644 --- a/app/styles/modules/profile/profile-content-tabs.scss +++ b/app/styles/modules/profile/profile-content-tabs.scss @@ -4,7 +4,7 @@ background: $white; color: $gray-light; display: inline-block; - padding: .3rem 1rem; + padding: .4rem 1rem; &:hover, &.active { color: $grayer; @@ -20,6 +20,6 @@ } } .icon { - margin-right: .3rem; + margin-right: .4rem; } } diff --git a/app/styles/modules/profile/profile-sidebar.scss b/app/styles/modules/profile/profile-sidebar.scss new file mode 100644 index 00000000..299821cb --- /dev/null +++ b/app/styles/modules/profile/profile-sidebar.scss @@ -0,0 +1,20 @@ +.profile-sidebar { + h4 { + @extend %bold; + background: $whitish; + color: $gray; + margin-bottom: .5rem; + padding: .5rem; + .icon { + color: $gray-light; + margin-right: .3rem; + } + } + p { + @extend %small; + color: $gray-light; + } + .trans-button { + margin-bottom: 1rem; + } +}