diff --git a/src/styles/base/about.scss b/src/styles/base/about.scss index ead128a..ab2026a 100644 --- a/src/styles/base/about.scss +++ b/src/styles/base/about.scss @@ -1,6 +1,4 @@ #about{ - $main-color: rgb(236, 94, 92); - $second-color: white; h2,h3{ text-transform: uppercase; } @@ -37,10 +35,10 @@ } .main-cta{ - background: $second-color none repeat scroll 0% 0%; - border: 1px solid $main-color; + background: var(--color-white) none repeat scroll 0% 0%; + border: 1px solid var(--color-primary); border-radius: 55px; - color: $main-color; + color: var(--color-primary); cursor: pointer; font-weight: bold; text-transform: uppercase; @@ -51,8 +49,8 @@ } .main-cta:hover{ - background: $main-color none repeat scroll 0% 0%; - border : 1px solid $second-color; - color: $second-color; + background: var(--color-primary) none repeat scroll 0% 0%; + border : 1px solid var(--color-primary); + color: var(--color-white); } } \ No newline at end of file diff --git a/src/styles/base/user-thumb.scss b/src/styles/base/user-thumb.scss index 4b6f874..9dfa593 100644 --- a/src/styles/base/user-thumb.scss +++ b/src/styles/base/user-thumb.scss @@ -48,7 +48,7 @@ &::before { display: inline-block; - color: #FF6765; + color: var(--color-primary); } } } diff --git a/src/views/circle/page-circle-profile.pug b/src/views/circle/page-circle-profile.pug index 892ba4e..c62abae 100644 --- a/src/views/circle/page-circle-profile.pug +++ b/src/views/circle/page-circle-profile.pug @@ -87,11 +87,15 @@ solid-router(default-route='circle-profile', hidden) bind-resources nested-field='members' loader-id='loader-circle-profile' - fields='classGroup(user.account.picture, sup(user.name, is_admin), sub(user.profile.city))' + fields='classGroup(user.account.picture, sup(user.name, send, is_admin), sub(user.profile.city))' + + action-send="messages" + label-send="" class-classGroup='user-thumb is-spaced' class-user.account.picture='avatar user-thumb__picture' class-user.name='user-thumb__name' + class-send='user-thumb__send' class-is_admin='user-thumb__admin' class-user.profile.city='user-thumb__city' diff --git a/src/views/project/page-project-profile.pug b/src/views/project/page-project-profile.pug index 30d39f2..b21502f 100644 --- a/src/views/project/page-project-profile.pug +++ b/src/views/project/page-project-profile.pug @@ -5,6 +5,10 @@ solid-router(default-route='project-profile', hidden) #project-profile(hidden) include ../../templates/hubl-captain.pug + solid-widget(name='hubl-project-team-contact') + template + solid-link(data-src='\${value}', next='messages') + .content-box__info.flex div#loader-project-profile.loader @@ -85,11 +89,14 @@ solid-router(default-route='project-profile', hidden) solid-display.block( bind-resources nested-field='members' - fields='classGroup(user.account.picture, sup(user.name, is_admin), sub(user.profile.city, name))' + fields='classGroup(user.account.picture, sup(user.name, user, is_admin), sub(user.profile.city, name))' + + widget-user='hubl-project-team-contact' class-classGroup='user-thumb is-spaced' class-user.account.picture='avatar user-thumb__picture' class-user.name='user-thumb__name' + class-user='user-thumb__send' class-is_admin='user-thumb__admin' class-user.profile.city='user-thumb__city' class-name='user-thumb__lead'