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

Merge branch 'master' of https://git.startinblox.com/applications/hubl into feature/resource-component

Browse Source
This commit is contained in:
Marjolaine Le Bon
2020-07-02 18:04:11 +02:00
parent 6b390c975a 6d131f5f8b
commit bfbd9f3605
63 changed files with 735 additions and 668 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/styles/layout/dashboard/dashboard.scss
View File

@ -2,6 +2,6 @@
margin: 0 2px;
}
sib-dashboard .icon::before {
solid-dashboard .icon::before {
width: 41px;
}

12
src/styles/layout/events/events.scss
View File

@ -17,12 +17,12 @@
font-weight: 700;
}
#listevents [name="name"],
sib-display-link-event .mdi::before {
solid-display-link-event .mdi::before {
color: $color-357-67-45;
}
.event-place-name,
.nextevent-startdate,
sib-display-link-event {
solid-display-link-event {
color: $color-0-0-22;
}
.sib-event {
@ -43,7 +43,7 @@
padding: 5px 20px;
color: $color-203-87-19;
}
sib-form sib-form-dropdown{
solid-form solid-form-dropdown{
label div {
height: 2.5rem;
}
@ -72,7 +72,7 @@
width: max-content;
height: max-content;
}
sib-display-location-events {
solid-display-location-events {
padding: 5px;
}
}
@ -83,7 +83,7 @@
line-height: 3.8rem;
color: $color-203-87-19;
}
sib-display div .event-type {
solid-display div .event-type {
width: max-content;
padding: 5px 20px;
}
@ -91,7 +91,7 @@
font-size: 1.6rem;
line-height: 2.6rem;
}
sib-display-link-event a {
solid-display-link-event a {
font-size: 1.6rem;
}
}

18
src/styles/layout/job-offers/job-offers.scss
View File

@ -2,7 +2,7 @@
@extend %grid-layer;
}
sib-job-board {
solid-job-board {
@extend %grid-layer-main;
@extend %containerV;
}
@ -37,7 +37,7 @@ sib-job-board {
.job-board__list {
@extend %grid-layer;
>sib-form {
>solid-form {
grid-column-start: start;
grid-column-end: middle;
grid-row-start: start;
@ -54,7 +54,7 @@ sib-job-board {
margin-top: 5rem;
}
>sib-display {
>solid-display {
@include window-style-modal();
display: block;
font-size: 1.5rem;
@ -71,7 +71,7 @@ sib-job-board {
display: flex;
margin: -0.25em;
>*:not(sib-action) {
>*:not(solid-action) {
margin: 0.25em;
}
@ -80,7 +80,7 @@ sib-job-board {
font-weight: 600;
}
sib-multiple[name$='groups'] {
solid-multiple[name$='groups'] {
display: flex;
label {
@ -147,7 +147,7 @@ sib-job-board {
font-size: 1.3rem;
float: right;
>sib-link {
>solid-link {
cursor: pointer;
@include icon('speech');
@ -180,7 +180,7 @@ sib-job-board {
}
}
.sib-conversation,
.solid-conversation,
.conversation > div {
display: flex;
flex-direction: column-reverse;
@ -194,11 +194,11 @@ sib-job-board {
}
}
sib-action[name='edit'] {
solid-action[name='edit'] {
margin-left: auto;
color: $color-215-6-63;
&>sib-link {
&>solid-link {
@include icon('pencil');
font-size: 2rem;
}

14
src/styles/layout/members/member-profile.scss
View File

@ -11,7 +11,7 @@
.member-bio {
sib-set-default[name='member-profile__bio'] {
solid-set-default[name='member-profile__bio'] {
display: grid;
grid-gap: 1rem;
grid-template-areas: "avatar name status"
@ -20,7 +20,7 @@
"avatar list button";
grid-template-columns: 1fr 2fr 1fr;
sib-set-default[name='member-img'] {
solid-set-default[name='member-img'] {
grid-area: avatar;
member-picture {
@ -56,23 +56,23 @@
}
}
sib-set-default[name='member-profile'] {
solid-set-default[name='member-profile'] {
align-items: baseline;
align-self: end;
display: flex;
grid-area: name;
>sib-multiple[name$='groups'] {
>solid-multiple[name$='groups'] {
display: flex;
padding-left: 1.4rem;
}
}
sib-display-value[name='profile.bio'] {
solid-display-value[name='profile.bio'] {
grid-area: bio;
}
sib-set-default[name='infos'] {
solid-set-default[name='infos'] {
display: block;
grid-area: list;
@ -115,7 +115,7 @@
}
}
sib-action[name='send'] {
solid-action[name='send'] {
align-self: flex-end;
grid-area: button;
justify-self: flex-end;

18
src/styles/layout/members/members.scss
View File

@ -1,8 +1,8 @@
/*%member-info {
sib-multiple[name^='user.'],
solid-multiple[name^='user.'],
>member-info>div,
>sib-display-value {
>solid-display-value {
display: flex;
flex-wrap: wrap;
margin-bottom: 0;
@ -70,7 +70,7 @@ member-info-groups {
}
}
&>sib-form {
&>solid-form {
grid-column-start: start;
grid-column-end: middle;
grid-row-start: start;
@ -126,7 +126,7 @@ member-info-groups {
grid-template-columns: repeat(3, 1.5fr);
}
&>sib-display {
&>solid-display {
background-color: white;
box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.14);
color: $color-210-4-50;
@ -151,7 +151,7 @@ member-info-groups {
display: none;
}
sib-multiple[name$='groups'] {
solid-multiple[name$='groups'] {
align-items: flex-start;
display: flex;
justify-content: flex-end;
@ -189,7 +189,7 @@ member-info-groups {
}
}
sib-set-default[name='bio'] {
solid-set-default[name='bio'] {
align-items: center;
border-bottom: 1px solid $color-210-25-95;
display: flex;
@ -204,7 +204,7 @@ member-info-groups {
margin-top: 0.6rem;
}
sib-display-value[name$='bio'] {
solid-display-value[name$='bio'] {
flex: 1;
margin: 2.5rem 0;
padding: 0 10px;
@ -228,11 +228,11 @@ member-info-groups {
}
}
sib-set-default[name='infos'] {
solid-set-default[name='infos'] {
padding: 0.4rem 2rem 3.7rem;
@extend %member-info;
sib-multiple[name='skills'] {
solid-multiple[name='skills'] {
margin: 1.6rem 0;
}
}

2
src/styles/layout/user/user-profile.scss
View File

@ -30,7 +30,7 @@
align-self: end;
display: flex;
sib-multiple {
solid-multiple {
display: flex;
padding-left: 1.4rem;