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

This commit is contained in:
Marjolaine Le Bon
2020-07-02 18:04:11 +02:00
63 changed files with 735 additions and 668 deletions

View File

@ -118,6 +118,15 @@
--color-backlink: var(--color-secondary);
--color-content-header: var(--color-grey-9);
/* job board */
--color-job-board-primary: var(--color-primary) !important;
--color-job-board-secondary: var(--color-secondary)!important;
--color-job-board-complementary: var(--color-complementary)!important;
--color-job-board-complementary-darken: var(--color-complementary-darken)!important;
--color-job-board-white: var(--color-white)!important;
--color-job-board-black-1: var(--color-black)!important;
--color-job-board-grey-10: #E4E8ED !important; // for some reason with the var it doesh't work var(--color-grey-12) !important;
/* directory */
--color-directory-primary: var(--color-primary)!important;
--color-directory-secondary: var(--color-secondary)!important;
@ -131,4 +140,4 @@
$color-212-4-50: hsl(212.7,4.3%,50%);
$color-0-0-22: hsl(0,0%,22.7%);
$color-203-87-19: hsl(203, 87.8%, 19.2%);
$color-357-67-45: hsl(357,67.5%,45.9%);
$color-357-67-45: hsl(357,67.5%,45.9%);

View File

@ -18,8 +18,23 @@
.reversed,
.button-secondary,
.bordered;
margin-left: auto;
margin-top: 3.2rem;
height: auto;
position: fixed;
bottom: 1em;
left: 10%;
white-space: normal;
width: 80%;
z-index: 1;
@include breakpoint(lg) {
height: 3rem;
left: 0;
margin: 0;
margin-left: auto;
margin-top: 109px;
position: relative;
width: auto;
}
}
.form-label {
@ -78,19 +93,20 @@
textarea {
height: 100px;
resize: vertical;
}
.content-box {
&.with-form {
/*sib-set-default:not([name='user-thumb']) {
/*solid-set-default:not([name='user-thumb']) {
clear: both;
display: flex!important;
flex-wrap: wrap;
max-width: 100%;
sib-form-label-text {
solid-form-label-text {
float: left;
width: 50%;
}
@ -98,7 +114,7 @@ textarea {
}
}
/*sib-form[set-user-id-select] {
/*solid-form[set-user-id-select] {
input[type="submit"] {
margin-left: 0;
@ -113,7 +129,7 @@ textarea {
/* WIDGETS SIB (let in .content-box to override default styles) */
sib-form-auto-completion,
solid-form-auto-completion,
hubl-status {
.ss-main {
@ -189,7 +205,7 @@ hubl-status {
}
/* End */
sib-form-date {
solid-form-date {
input[type="date"] {
background-image: url("/images/calendar.svg");
background-position: right 12px top 50%;
@ -223,42 +239,61 @@ sib-form-date {
}
}
sib-form-file {
label {
align-items: baseline;
clear: both;
solid-form-file {
div {
display: flex;
flex-direction: row;
flex-wrap: wrap;
max-width: 100%;
div {
width: 100%;
flex-direction: column-reverse;
align-items: center;
margin-top: 1.8rem;
@include breakpoint(lg) {
flex-direction: row-reverse;
justify-content: flex-end;
}
input[type='text'] {
box-sizing: border-box;
flex: 0 0 50%;
}
input[type='file'] {
box-sizing: border-box;
flex: 0 0 20%;
color: var(--color-input-text);
cursor: pointer;
padding-left: 3rem;
height: 0.1px;
opacity: 0;
overflow: hidden;
position: absolute;
width: 0.1px;
z-index: -1;
}
input[type='text'] {
margin-bottom: 0.8rem;
width: 100%;
@include breakpoint(lg) {
width: auto;
}
}
label {
@extend .button,
.text-bold,
.text-uppercase,
.button-primary,
.bordered;
text-align: center;
width: 100%;
@include breakpoint(lg) {
margin: auto 2.2rem;
width: auto;
}
}
}
}
/*sib-multiple-select {
/*solid-multiple-select {
&.select-skills .ss-values .ss-disabled::before {
content: "Select skills";
}
sib-form-auto-completion > label {
solid-form-auto-completion > label {
display: flex;
flex-direction: column;
@ -342,7 +377,7 @@ hubl-member-form {
margin-bottom: 1rem;
}
sib-form-auto-completion {
solid-form-auto-completion {
float: left;
}

View File

@ -40,7 +40,7 @@
}
/* To remove the place taken by this element */
sib-widget[name='hubl-user-avatar'] {
solid-widget[name='hubl-user-avatar'] {
display: contents;
}
}
@ -176,7 +176,7 @@ sib-notifications {
}
}
sib-display-value[name='first_name'] {
solid-display-value[name='first_name'] {
@include icon('arrow-down');
align-items: center;
display: none;
@ -224,7 +224,7 @@ sib-notifications {
li {
sib-link {
solid-link {
color: var(--color-grey-4);
display: block;
border-bottom: 1px solid var(--color-user-panel-list-border);
@ -259,7 +259,7 @@ sib-notifications {
div {
sib-display-value[name='first_name'] {
solid-display-value[name='first_name'] {
@include icon('close');
&::before {

View File

@ -22,8 +22,8 @@
}
}
/* Fix for sib-dashboard fixture */
sib-dashboard section {
/* Fix for solid-dashboard fixture */
solid-dashboard section {
padding: 1rem !important;
@include breakpoint(lg) {
@ -322,14 +322,14 @@ h5 {
}
}
sib-display {
solid-display {
@include breakpoint(sm) {
float: left;
}
}
/* For sib-display on project, circle, or private message view */
sib-display {
/* For solid-display on project, circle, or private message view */
solid-display {
width: calc(100% - 94px); /* 94px = width of .mobile-sidebar-button */
div {
@ -394,7 +394,7 @@ h5 {
max-width: 75%;
}
sib-link {
solid-link {
font-size: 2.7rem;
position: absolute;
right: 32px;
@ -430,8 +430,8 @@ h5 {
}
}
sib-ac-checker,
sib-link {
solid-ac-checker,
solid-link {
width: 100%;
@include breakpoint(lg) {
@ -516,9 +516,9 @@ h5 {
@import 'user-thumb';
// Button global CSS
sib-delete,
sib-route,
sib-link,
solid-delete,
solid-route,
solid-link,
button,
input[type='submit'],
a,

View File

@ -11,7 +11,7 @@
font-weight: bolder;
}
sib-router {
solid-router {
.menu-wrapper {
&.is-closed {
.sub-menu {
@ -24,7 +24,7 @@
}
}
sib-link {
solid-link {
width: 100%;
}
@ -42,7 +42,7 @@
background-color: var(--color-menu-icon-background-active);
}
.menu-notification>sib-display>div:first-child {
.menu-notification>solid-display>div:first-child {
background-color: var(--color-menu-badge-background);
}
}
@ -85,7 +85,7 @@
width: 2em;
}
>sib-display {
>solid-display {
display: block;
}
}
@ -94,9 +94,9 @@
/* Ellipsis for project tab */
.project-tab>div>sib-display>div:nth-child(1) {
.project-tab>div>solid-display>div:nth-child(1) {
sib-set-default[name='project'] {
solid-set-default[name='project'] {
flex: 3;
.project-customer,
@ -125,9 +125,9 @@
/* Ellipsis for circle tab */
.circle-tab>div>sib-display>div {
.circle-tab>div>solid-display>div {
sib-display-div[name='name'] {
solid-display-div[name='name'] {
flex: 3;
>div[name='name'] {
@ -147,7 +147,7 @@
/* Ellipsis for message tab */
.message-tab>div>sib-display>div>sib-display-div>div {
.message-tab>div>solid-display>div>solid-display-div>div {
box-sizing: border-box;
width: calc(80vw - 96px); /*96px = padding of the element + width and margin of counter */
@ -156,7 +156,7 @@
}
}
sib-display.nosub>sib-form[fields="name"]>hubl-search-users>input {
solid-display.nosub>solid-form[fields="name"]>hubl-search-users>input {
margin-left: 30px;
margin-bottom: 10px;
width: calc(80vw - 71px);
@ -169,11 +169,12 @@
@include breakpoint(lg) {
margin: auto;
margin-bottom: 10px;
width: auto;
}
}
sib-display.nosub>nav {
solid-display.nosub>nav {
text-align: center;
overflow: hidden;
display: grid;
@ -209,18 +210,18 @@
}
}
>sib-display.nosub>div>sib-display>div {
>solid-display.nosub>div>solid-display>div {
padding: 1rem 1rem 1rem 3rem;
}
sib-display>div {
solid-display>div {
.create {
color: var(--color-white);
margin: 1rem 1rem 2.2rem 3.2rem;
}
&>sib-display {
&>solid-display {
&:last-child>div {
margin-bottom: 2.2rem;
}
@ -229,8 +230,8 @@
color: var(--color-grey-6);
cursor: pointer;
>hubl-menu-fix-url-circle>sib-display>div,
>hubl-menu-fix-url-project>sib-display>div {
>hubl-menu-fix-url-circle>solid-display>div,
>hubl-menu-fix-url-project>solid-display>div {
padding: 1rem 1rem 1rem 3rem;
}
}
@ -240,9 +241,9 @@
}
}
&>sib-display[active]>div,
&>sib-display>div>hubl-menu-fix-url-circle>sib-display[active]>div,
&>sib-display>div>hubl-menu-fix-url-project>sib-display[active]>div {
&>solid-display[active]>div,
&>solid-display>div>hubl-menu-fix-url-circle>solid-display[active]>div,
&>solid-display>div>hubl-menu-fix-url-project>solid-display[active]>div {
background-color: var(--color-menu-highlight-primary);
color: var(--color-menu-text-active);
font-weight: bold;
@ -251,14 +252,14 @@
&.menu-notification {
>sib-display>div>sib-display>div>hubl-menu-fix-url-circle,
>sib-display>div>sib-display>div>hubl-menu-fix-url-project {
>solid-display>div>solid-display>div>hubl-menu-fix-url-circle,
>solid-display>div>solid-display>div>hubl-menu-fix-url-project {
flex: 1;
}
>sib-display>div>sib-display>div,
>sib-display>div>sib-display>div>hubl-menu-fix-url-circle>sib-display>div,
>sib-display>div>sib-display>div>hubl-menu-fix-url-project>sib-display>div {
>solid-display>div>solid-display>div,
>solid-display>div>solid-display>div>hubl-menu-fix-url-circle>solid-display>div,
>solid-display>div>solid-display>div>hubl-menu-fix-url-project>solid-display>div {
display: flex;
justify-content: space-between;
}
@ -293,7 +294,7 @@
}
// Temporary fix for badges
sib-fix-badge {
solid-fix-badge {
display: none;
box-sizing: border-box;
font-family: sans-serif;

View File

@ -4,6 +4,11 @@
overflow: auto;
position: relative;
width: 100%;
margin-bottom: 6rem;
@include breakpoint(lg) {
margin-bottom: 0;
}
.table {
border-collapse: collapse;
@ -32,7 +37,7 @@
&>div {
display: contents;
&>sib-display {
&>solid-display {
display: table-row;
&>div {
@ -46,7 +51,7 @@
}
}
&>sib-multiple {
&>solid-multiple {
display: contents;
&>div {
@ -71,7 +76,6 @@
/* Styles of the table and its elements */
.table {
border-bottom: 1px solid var(--color-table-border);
border-left: 1px solid var(--color-table-border);
border-right: 1px solid var(--color-table-border);
}
@ -113,20 +117,16 @@
width: 280px;
}
.w230 {
width: 230px;
}
.w70 {
width: 70px;
}
.w262 {
width: 262px;
}
.W152 {
width: 152px;
}
.w355 {
width: 355px;
.w162 {
width: 162px;
}
.hashtag::before {
@ -183,7 +183,7 @@
}
}
.table sib-ac-checker {
.table solid-ac-checker {
text-align: center;
}
@ -209,8 +209,9 @@
.circle-leave {
position: relative;
width: 40%;
min-width: 40%;
width: 164px;
margin: 0 auto;
min-width: 164px;
&>button {
height: 29px;

View File

@ -8,7 +8,7 @@
height: calc(100vh - 84px - 83px); /* Header's and subheader's height on mobile */
}
> sib-chat {
> solid-xmpp-chat {
position: absolute;
top: 0;
left: 0;

View File

@ -37,9 +37,9 @@
}
}
sib-conversation.conversation {
solid-conversation.conversation {
.sib-conversation {
.solid-conversation {
font-family: Open Sans;
[name='conversation-wrapper'] {
@ -67,14 +67,14 @@
}
}
>sib-display.conversation>div>sib-display:first-child {
>solid-display.conversation>div>solid-display:first-child {
margin-bottom: 4.5rem;
}
sib-ac-checker {
solid-ac-checker {
border-top: 1px solid $color-210-17-91;
sib-form-textarea {
solid-form-textarea {
>label div {
color: $color-210-5-56;
@ -111,7 +111,7 @@
}
}
.conversation>div>sib-display,
.conversation>div>solid-display,
.conversation-form {
border: none;
margin: 1rem 2.1rem;

View File

@ -41,19 +41,19 @@
}
}
sib-form-label-text {
solid-form-label-text {
display: flex;
flex-direction: column;
}
sib-form-placeholder-dropdown[name="skills"] {
solid-form-placeholder-dropdown[name="skills"] {
grid-column-end: 3;
grid-column-start: 1;
}
}
.job-board, #members-list {
sib-form[naked] {
solid-form[naked] {
@extend %filters;
}
}*/

View File

@ -45,7 +45,7 @@
transition: all 0.5s;
width: 25rem;
>sib-router {
>solid-router {
color: var(--color-right-menu-text);
flex: 0 0 auto;
font-weight: 600;
@ -79,7 +79,7 @@
@include icon('arrow-right-circle');
}
>sib-route {
>solid-route {
&[name*='circle'],
&[name*='project'] {

View File

@ -1,4 +1,4 @@
sib-multiple[name*='skills'] {
solid-multiple[name*='skills'] {
display: flex;
flex-wrap: wrap;
}

View File

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

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;
}
}

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;
}

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;

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;
}
}

View File

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