Skip to content
Snippets Groups Projects
Commit e6d74bb3 authored by Jean-Baptiste Pasquier's avatar Jean-Baptiste Pasquier
Browse files

Merge branch 'staging' into 'alpha' 

Staging

See merge request startinblox/applications/sib-app!61
parents 84847865 72a519e5
No related branches found
No related tags found
1 merge request!61Staging
Hide whitespace changes
Inline Side-by-side
src/dependencies.pug
+ 4
− 4
View file @ e6d74bb3
...@@ -12,13 +12,13 @@ link(rel='stylesheet', href='https://fonts.googleapis.com/css?family=Open+Sans:3 ...@@ -12,13 +12,13 @@ link(rel='stylesheet', href='https://fonts.googleapis.com/css?family=Open+Sans:3
//- script(type="module" src="/lib/sib-notifications/sib-notifications.js") //- script(type="module" src="/lib/sib-notifications/sib-notifications.js")
//- script(type="module" src="/lib/sib-conversation/sib-conversation.js") //- script(type="module" src="/lib/sib-conversation/sib-conversation.js")
//- script(type="module" src="/lib/sib-directory/sib-directory.js") //- script(type="module" src="/lib/sib-directory/sib-directory.js")
//- script(type="module" src="/lib/sib-joboffers/sib-job-board.js") //- script(type="module" src="/lib/sib-job-board/sib-job-board.js")
//- CDN //- CDN
script(type="module" src="https://unpkg.com/@startinblox/core@0.8") script(type="module" src="https://unpkg.com/@startinblox/core@0.8")
script(type="module" src="https://unpkg.com/@startinblox/router@0.7") script(type="module" src="https://unpkg.com/@startinblox/router@0.7")
script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.2") script(type="module" src="https://unpkg.com/@startinblox/component-chat@0.2")
script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.2") script(type="module" src="https://unpkg.com/@startinblox/component-notifications@0.2")
//- script(type="module" src="https://unpkg.com/@startinblox/component-conversation@0.3") script(type="module" src="https://unpkg.com/@startinblox/component-conversation@0.3")
//- script(type="module" src="https://unpkg.com/@startinblox/component-directory@beta") script(type="module" src="https://unpkg.com/@startinblox/component-directory@0.3")
//- script(type="module" src="https://unpkg.com/@startinblox/component-job-board@beta") script(type="module" src="https://unpkg.com/@startinblox/component-job-board@0.3")
src/menu-left.pug
+ 2
− 0
View file @ e6d74bb3
...@@ -44,6 +44,7 @@ nav#main__menu ...@@ -44,6 +44,7 @@ nav#main__menu
widget-name='sib-display-div', widget-name='sib-display-div',
widget-badge='hd-counter' widget-badge='hd-counter'
action-badge='badge' action-badge='badge'
order-by='name'
next='circle' next='circle'
) )
div.divider div.divider
...@@ -61,6 +62,7 @@ nav#main__menu ...@@ -61,6 +62,7 @@ nav#main__menu
widget-username='sib-display-div' widget-username='sib-display-div'
widget-badge='hd-counter' widget-badge='hd-counter'
action-badge='badge' action-badge='badge'
order-by='username'
next='messages' next='messages'
) )
......
src/styles/layout/members/member-profile.scss
+ 2
− 2
View file @ e6d74bb3
...@@ -34,10 +34,10 @@ ...@@ -34,10 +34,10 @@
width: 28vh; width: 28vh;
img { img {
height: 255px; height: 265px;
object-fit: cover; object-fit: cover;
object-position: center; object-position: center;
width: 255px; width: 265px;
} }
object { object {
......
src/styles/layout/members/members.scss
+ 106
− 88
View file @ e6d74bb3
%member-info { %member-info {
sib-multiple[name^='user.'], sib-multiple[name^='user.'],
> member-info > div, >member-info>div,
> sib-display-value { >sib-display-value {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
margin-bottom: 0; margin-bottom: 0;
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
padding: 0 0.6em 0 0; padding: 0 0.6em 0 0;
} }
} }
[name$='profile.city'] * { [name$='profile.city'] * {
@include mdi('atom'); @include mdi('atom');
} }
...@@ -36,7 +36,6 @@ member-info-groups { ...@@ -36,7 +36,6 @@ member-info-groups {
} }
#members-list { #members-list {
@extend %grid-layer;
#members-list__content { #members-list__content {
@extend %grid-layer; @extend %grid-layer;
...@@ -44,12 +43,13 @@ member-info-groups { ...@@ -44,12 +43,13 @@ member-info-groups {
nav { nav {
align-items: center; align-items: center;
display: flex; display: flex;
flex-wrap: wrap;
font-size: 2.4rem; font-size: 2.4rem;
justify-content: center; justify-content: center;
button { button {
color: $color-210-25-95; color: $color-210-25-95;
&:before { &:before {
color: $color-216-4-22; color: $color-216-4-22;
@include icon('arrow-left-circle'); @include icon('arrow-left-circle');
...@@ -70,62 +70,81 @@ member-info-groups { ...@@ -70,62 +70,81 @@ member-info-groups {
} }
} }
& > sib-form { &>sib-form {
grid-column-start: start; grid-column-start: start;
grid-column-end: middle; grid-column-end: middle;
grid-row-start: start; grid-row-start: start;
grid-row-end: middle; grid-row-end: middle;
} }
& > div, &>div,
& > nav { &>nav {
display: flex;
flex-wrap: wrap;
grid-column-start: start; grid-column-start: start;
grid-column-end: end; grid-column-end: end;
margin-bottom: 1.7rem; margin-bottom: 1.7rem;
} }
& > div {
justify-content: space-between;
&:first-of-type {
color: $color-0-0-29;
font-weight: bold;
justify-content: center;
margin: 3.75rem 0;
position: relative;
&::before { &>div:first-of-type {
border-top: 1px solid $color-0-0-85; display: flex;
bottom: 0; color: $color-0-0-29;
content: ''; flex-wrap: wrap;
left: 0; font-weight: bold;
margin: 0 auto; justify-content: center;
position: absolute; margin: 3.75rem 0;
right: 0; position: relative;
top: 50%;
width: 100%; &::before {
z-index: -1; border-top: 1px solid $color-0-0-85;
} bottom: 0;
content: '';
left: 0;
margin: 0 auto;
position: absolute;
right: 0;
top: 50%;
width: 100%;
z-index: -1;
}
span { span {
background-color: $color-210-25-95; background-color: $color-210-25-95;
padding: 0 60px; padding: 0 60px;
} }
}
&>div:nth-of-type(2) {
display: grid;
grid-gap: 30px;
grid-template-columns: 1fr;
grid-template-rows: auto;
@media only screen and (min-width: 850px) {
grid-template-columns: repeat(2, 1fr);
}
@media only screen and (min-width: 1180px) {
grid-template-columns: repeat(3, 1.5fr);
} }
> sib-display { &>sib-display {
background-color: white; background-color: white;
box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.14); box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.14);
color: $color-210-4-50; color: $color-210-4-50;
cursor: pointer; cursor: pointer;
display: flex; min-height: auto;
flex-flow: column wrap; position: relative;
margin-bottom: 2.5rem; text-decoration: none;
padding-bottom: 2rem; top: 0;
@media(min-width: 56rem) { transition: all .1s ease-in;
width: 32%;
&>div {
display: flex;
flex-direction: column;
}
&:hover {
box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.24);
top: -2px;
} }
label { label {
...@@ -141,62 +160,59 @@ member-info-groups { ...@@ -141,62 +160,59 @@ member-info-groups {
padding-right: 2.6rem; padding-right: 2.6rem;
padding-top: 1.3rem; padding-top: 1.3rem;
> * { >* {
margin: 0.3rem; margin: 0.3rem;
} }
} }
sib-set-default[name='header'] { member-picture {
border-bottom: 1px solid $color-210-25-95; align-items: center;
background-color: $color-213-20-91;
border-radius: 50%;
display: flex; display: flex;
flex-direction: column; height: 28vh;
padding: 0.85rem 0 3.4rem; justify-content: center;
margin: 1.7rem auto;
overflow: hidden;
width: 28vh;
img {
height: 100%;
object-fit: cover;
object-position: center;
width: 100%;
}
>*:not(member-picture) { object {
display: flex; height: 45%;
flex-basis: content; width: 45%;
justify-content: center;
} }
}
member-picture { sib-set-default[name='bio'] {
align-items: center; align-items: center;
background-color: $color-213-20-91; border-bottom: 1px solid $color-210-25-95;
border-radius: 50%; display: flex;
display: flex; flex-direction: column;
height: 28vh; padding-bottom: 3rem;
justify-content: center;
margin: 1.7rem auto;
overflow: hidden;
width: 28vh;
img {
height: 100%;
object-fit: cover;
object-position: center;
width: 100%;
}
object { >* {
height: 45%; text-align: center;
width: 45%;
}
} }
[name='name'] { [name='pseudonym'] {
margin: 0.67em 0; margin-top: 0.6rem;
} }
sib-display-value[name$='bio'] { sib-display-value[name$='bio'] {
display: flex; flex: 1;
flex-basis: 3.5em;
line-height: 1.6;
margin: 2.5rem 0; margin: 2.5rem 0;
padding: 0 6.8rem; padding: 0 10px;
text-align: center; width: 70%;
flex-basis: 4.5em;
} }
[next=messages] { [name='send'] {
align-self: center;
border: 1px solid $color-244-73-62; border: 1px solid $color-244-73-62;
border-radius: 3.4rem; border-radius: 3.4rem;
color: $color-244-73-62; color: $color-244-73-62;
...@@ -204,8 +220,8 @@ member-info-groups { ...@@ -204,8 +220,8 @@ member-info-groups {
font-weight: bold; font-weight: bold;
padding: 1rem 2.55rem 0.7rem; padding: 1rem 2.55rem 0.7rem;
@include icon('speech'); @include icon('speech');
&::before { [next=messages]:before {
font-size: 2.5rem; font-size: 2.5rem;
padding-right: 0.85rem; padding-right: 0.85rem;
} }
...@@ -213,10 +229,12 @@ member-info-groups { ...@@ -213,10 +229,12 @@ member-info-groups {
} }
sib-set-default[name='infos'] { sib-set-default[name='infos'] {
display: block; padding: 0.4rem 2rem 3.7rem;
padding: 0 1.7rem;
@extend %member-info; @extend %member-info;
sib-multiple[name='skills'] {
margin: 1.6rem 0;
}
} }
} }
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment