autonomic-cooperative/hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: redo 722

Browse Source
This commit is contained in:
Jean-Baptiste Pasquier 2020-10-08 09:55:56 +02:00
parent 4578b30ff9
commit d2f2d594d0
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/styles/base/about.scss
View File

@ -1,6 +1,4 @@
#about{ #about{
$main-color: rgb(236, 94, 92);
$second-color: white;
h2,h3{ h2,h3{
text-transform: uppercase; text-transform: uppercase;
} }
@ -37,10 +35,10 @@
} }
.main-cta{ .main-cta{
background: $second-color none repeat scroll 0% 0%; background: var(--color-white) none repeat scroll 0% 0%;
border: 1px solid $main-color; border: 1px solid var(--color-primary);
border-radius: 55px; border-radius: 55px;
color: $main-color; color: var(--color-primary);
cursor: pointer; cursor: pointer;
font-weight: bold; font-weight: bold;
text-transform: uppercase; text-transform: uppercase;
@ -51,8 +49,8 @@
} }
.main-cta:hover{ .main-cta:hover{
background: $main-color none repeat scroll 0% 0%; background: var(--color-primary) none repeat scroll 0% 0%;
border : 1px solid $second-color; border : 1px solid var(--color-primary);
color: $second-color; color: var(--color-white);
} }
} }

2
src/styles/base/user-thumb.scss
View File

@ -48,7 +48,7 @@
&::before { &::before {
display: inline-block; display: inline-block;
color: #FF6765; color: var(--color-primary);
} }
} }
} }

6
src/views/circle/page-circle-profile.pug
View File

@ -87,11 +87,15 @@ solid-router(default-route='circle-profile', hidden)
bind-resources bind-resources
nested-field='members' nested-field='members'
loader-id='loader-circle-profile' 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-classGroup='user-thumb is-spaced'
class-user.account.picture='avatar user-thumb__picture' class-user.account.picture='avatar user-thumb__picture'
class-user.name='user-thumb__name' class-user.name='user-thumb__name'
class-send='user-thumb__send'
class-is_admin='user-thumb__admin' class-is_admin='user-thumb__admin'
class-user.profile.city='user-thumb__city' class-user.profile.city='user-thumb__city'

9
src/views/project/page-project-profile.pug
View File

@ -5,6 +5,10 @@ solid-router(default-route='project-profile', hidden)
#project-profile(hidden) #project-profile(hidden)
include ../../templates/hubl-captain.pug include ../../templates/hubl-captain.pug
solid-widget(name='hubl-project-team-contact')
template
solid-link(data-src='\${value}', next='messages')
.content-box__info.flex .content-box__info.flex
div#loader-project-profile.loader div#loader-project-profile.loader
@ -85,11 +89,14 @@ solid-router(default-route='project-profile', hidden)
solid-display.block( solid-display.block(
bind-resources bind-resources
nested-field='members' 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-classGroup='user-thumb is-spaced'
class-user.account.picture='avatar user-thumb__picture' class-user.account.picture='avatar user-thumb__picture'
class-user.name='user-thumb__name' class-user.name='user-thumb__name'
class-user='user-thumb__send'
class-is_admin='user-thumb__admin' class-is_admin='user-thumb__admin'
class-user.profile.city='user-thumb__city' class-user.profile.city='user-thumb__city'
class-name='user-thumb__lead' class-name='user-thumb__lead'