Merge branch 'master' of git.startinblox.com:applications/sib-app into release/dashboard

This commit is contained in:
Jean-Baptiste Pasquier
2020-04-20 17:34:03 +02:00
47 changed files with 744 additions and 689 deletions

View File

@ -1,3 +1,20 @@
#admin-circle-create,
#admin-project-create,
#admin-users-create,
#admin-users-edit {
input[type='submit'] {
@extend .button,
.text-bold,
.text-uppercase,
.reversed,
.button-dark,
.bordered;
margin-left: auto;
margin-top: 3.2rem;
}
}
.content-box {
&.with-form {
@ -23,26 +40,21 @@
padding-bottom: 0.8rem;
}
p.center {
margin: 0;
text-align: center;
}
[name$='-text'] {
font-size: 1.5rem;
margin-bottom: 2rem;
}
[name^='block-'] {
margin-bottom: 2.75rem;
}
[name$='border-top'] {
border-top: 1px solid $color-221-51-90;
margin-top: 3rem;
}
form {
display: flex;
flex-direction: column;
}
sib-set-default {
sib-set-default:not([name='user-thumb']) {
clear: both;
display: flex!important;
flex-wrap: wrap;
@ -153,20 +165,17 @@
margin-top: 2.7rem;
}
.form-edit {
.form-edit>form {
>form {
input[type='submit'] {
@extend .button,
.text-bold,
.text-uppercase,
.reversed,
.button-dark,
.bordered;
margin-left: auto;
margin-top: 3.2rem;
}
input[type='submit'] {
@extend .button,
.text-bold,
.text-uppercase,
.reversed,
.button-dark,
.bordered;
margin-left: auto;
margin-top: 3.2rem;
}
}
@ -312,6 +321,14 @@
sib-multiple-select {
&.select-groups .ss-values .ss-disabled::before {
content: "Select groups";
}
&.select-skills .ss-values .ss-disabled::before {
content: "Select skills";
}
sib-form-auto-completion > label {
display: flex;
flex-direction: column;
@ -361,7 +378,6 @@
&::before {
color: $color-213-4-50;
content: "Select skills";
font-weight: normal;
}
}

View File

@ -65,6 +65,7 @@
details {
margin-right: 2.5rem;
position: relative;
@include breakpoint(sm) {
margin-right: 0;
@ -82,7 +83,7 @@
}
}
details {
.sib-notifications__container {
position: relative;
.sib-notifications__button {
@ -169,7 +170,7 @@
width: 45%;
}
sib-display-value[name='firstName'] {
sib-display-value[name='first_name'] {
@include icon('arrow-down');
align-items: center;
display: flex;
@ -241,7 +242,7 @@
div {
sib-display-value[name='firstName'] {
sib-display-value[name='first_name'] {
@include icon('close');
&::before {

View File

@ -1,12 +1,3 @@
$breakpoints: (phone: 480px,
tablet: 768px,
desktop: 1024px) !default;
[hidden],
.hidden {
display: none !important;
}
* {
outline: none;
}
@ -91,10 +82,15 @@ nav {
/* Quick fix. Will be removed later */
#admin-circles,
#admin-projects {
#admin-projects,
#admin-users {
display: contents;
}
[hidden],
.hidden {
display: none !important;
}
img {
max-height: 100%;
@ -121,12 +117,6 @@ h6 {
}*/
}
.h2-like {
display: block;
margin: 14.94px 0;
width: 100%;
}
h1, .h1-like {
color: $color-233-18-29;
font-size: 2rem;
@ -143,6 +133,12 @@ h2, .h2-like {
text-transform: uppercase;
}
.h2-like {
display: block;
margin: 14.94px 0;
width: 100%;
}
h3 {
color: $color-216-4-22;
font-size: 1.7rem;
@ -164,21 +160,6 @@ h5 {
padding: 3.2rem;
}
#admin-circle-create,
#admin-project-create {
input[type='submit'] {
@extend .button,
.text-bold,
.text-uppercase,
.reversed,
.button-dark,
.bordered;
margin-left: auto;
margin-top: 3.2rem;
}
}
.content-box {
@include window-style-modal();
display: flex;
@ -199,6 +180,7 @@ h5 {
}
}
/* Header inside circle, project view */
.content-box__header {
border-bottom: 1px solid $color-221-51-90;
padding: 3rem;
@ -257,6 +239,12 @@ h5 {
}
}
.content-box__info {
@extend %padding-block;
display: flex;
flex-direction: column;
}
.modal {
color: white;
margin: 75px;
@ -280,11 +268,6 @@ h5 {
}
}
.drive {
width: 100%;
border: 0;
}
.backlink {
@include icon('arrow-left-circle');
color: $color-233-18-29;
@ -297,6 +280,11 @@ h5 {
margin-right: 1rem;
text-decoration: none;
}
&.right {
display: block;
text-align: right;
}
}
.name {
@ -342,6 +330,7 @@ h5 {
@import 'table';
@import 'header';
@import 'menu-left';
@import 'user-thumb';
// Button global CSS
sib-delete,
@ -396,7 +385,8 @@ a,
&.rounded {
border-radius: 50%;
padding: 0.5rem 1rem;
font-size: 1.8rem;
padding: 1rem;
}
&.button-link {

View File

@ -4,18 +4,8 @@
#admin-circle-create,
#project-edit,
#admin-project-list,
#admin-project-create {
.content-box__info {
@extend %padding-block;
display: flex;
flex-direction: column;
.backlink {
text-align: right;
display: block;
}
}
#admin-project-create,
#admin-users-list {
.table {
@ -79,93 +69,6 @@
}
}
.cell-with-name {
color: $color-233-18-29;
font-weight: 600;
padding-top: 2.5rem;
}
.cell-with-id-card>div,
/* for the table in circle-edit */
.cell-with-id-card>sib-display>div,
project-captain[name='user']>sib-display>div {
/* for the captain's cell in project-admin */
display: grid;
grid-column-gap: 1.6rem;
grid-template-columns: 7vh auto;
grid-template-rows: repeat(2, 5.2vh);
padding: 0 2.2rem;
>[name$='account.picture'] {
align-items: center;
align-self: center;
background-color: $color-213-20-91;
border-radius: 50%;
display: flex;
grid-column: 1 / span 1;
grid-row: 1 / span 2;
height: 7vh;
justify-content: center;
overflow: hidden;
position: relative;
width: 7vh;
img {
background-color: white;
height: 100%;
left: 0;
object-fit: cover;
position: absolute;
top: 0;
width: 100%;
}
object {
height: 45%;
width: 45%;
}
}
>[name='sup'] {
align-self: end;
display: flex;
grid-column: 2 / span 1;
grid-row: 1 / span 1;
margin-bottom: 0.50rem;
[name$='name'] {
color: #7A7F85;
font-weight: 600;
margin-right: 1rem;
}
sib-multiple>div {
display: flex;
[name='groups'] {
@extend %tag-role;
}
}
}
>[name='sub'] {
align-self: start;
grid-column: 2 / span 1;
grid-row: 2 / span 1;
margin-top: 0.50rem;
>[name$='username']:not(:empty) {
align-items: center;
display: flex;
&::before {
content: '@';
}
}
}
}
.cell-with-buttons {
align-items: center;
display: flex;
@ -185,6 +88,52 @@
}
}
.cell-with-name {
color: $color-233-18-29;
font-weight: 600;
padding-top: 2.5rem;
}
sib-multiple {
display: flex;
align-items: center;
justify-content: center;
}
.user-thumb>div /* for the table in circle-edit and captain's cell in project-admin */,
[name='user-thumb'] {
@extend %user-thumb__grid;
padding: 0 2.2rem;
>.user-thumb__picture {
@extend %user-thumb__picture;
}
>[name='sup'] {
@extend %user-thumb__grid-sup;
.user-thumb__name {
@extend %user-thumb__name;
}
.user-thumb__groups {
@extend %user-thumb__groups;
}
}
>[name='sub'] {
@extend %user-thumb__grid-inf;
>.user-thumb__username:not(:empty) {
@extend %user-thumb__username;
}
>.user-thumb__city:not(:empty) {
@extend %user-thumb__city;
}
}
}
sib-ac-checker {
align-items: center;
display: flex;

View File

@ -0,0 +1,108 @@
%user-thumb__grid {
display: grid;
grid-column-gap: 1.6rem;
grid-template-columns: 7vh auto;
grid-template-rows: repeat(2, 5.2vh);
}
%user-thumb__grid-sup {
align-items: center;
align-self: end;
display: flex;
grid-column: 2 / span 1;
grid-row: 1 / span 1;
margin-bottom: 0.50rem;
}
%user-thumb__grid-inf {
align-self: start;
grid-column: 2 / span 1;
grid-row: 2 / span 1;
margin-top: 0.50rem;
}
%user-thumb__picture {
align-items: center;
align-self: center;
background-color: $color-213-20-91;
border-radius: 50%;
display: flex;
grid-column: 1 / span 1;
grid-row: 1 / span 2;
height: 7vh;
justify-content: center;
overflow: hidden;
position: relative;
width: 7vh;
img {
background-color: white;
height: 100%;
left: 0;
object-fit: cover;
position: absolute;
top: 0;
width: 100%;
}
object {
height: 45%;
width: 45%;
}
}
%user-thumb__name {
color: #7A7F85;
font-weight: 600;
margin-right: 1rem;
}
%user-thumb__groups {
display: flex;
margin-bottom: 1px;
margin-left: 0.6rem;
[name='groups'],
[name='user.groups'] {
@extend %tag-role;
}
}
%user-thumb__admin {
@extend %tag-admin;
}
%user-thumb__username {
align-items: center;
display: flex;
&::before {
content: '@';
}
}
%user-thumb__city {
@include mdi('atom');
align-items: center;
display: flex;
margin-right: 1.6rem;
&::before {
color: $color-43-100-50;
margin-right: 0.50rem;
}
}
%user-thumb__lead {
@include icon('eyeglass');
align-items: center;
display: flex;
&::before {
color: $color-43-100-50;
font-size: 1.9rem;
font-weight: bold;
margin-left: 0;
margin-right: 0.50rem;
}
}

View File

@ -1,5 +1,5 @@
@import 'chat';
@import 'comment.scss';
@import 'comment';
@import 'filters';
@import 'howto';
@import 'sidebar';

View File

@ -12,6 +12,3 @@
flex-shrink: 0;
}
}

View File

@ -51,7 +51,7 @@ $ci-icons: (
hat: '\e91c',
beer1: '\e91d',
alien: '\e91e',
drawing: '\e91f',
add-user: '\e91f',
feedback: '\e920',
globe: '\e921',
bubble-add: '\e922'

View File

@ -53,7 +53,7 @@
padding: 2.15rem 2.55rem;
position: relative;
/*width: 12em;*/
&::before {
float: left;
font-size: 4rem;
@ -68,12 +68,6 @@
>sib-route {
&[active] {
background-color: $color-233-18-29;
color: $color-46-100-67;
display: inline-block;
}
&[name*='circle'],
&[name*='project'] {
@ -82,6 +76,13 @@
}
}
&[name*='users'] {
>li::before {
font-size: 5rem;
}
}
&[name$='chat']>li {
@include ci('chat');
}
@ -102,6 +103,18 @@
@include ci('file');
}
&[name='admin-users']>li::before {
background-color: $color-233-18-29;
content: '';
display: inline-block;
height: 40px;
mask: url('/images/add-user.svg') 1% 1% / 1px 1px no-repeat;
mask-size: cover;
-webkit-mask: url('/images/add-user.svg') 1% 1% / 1px 1px no-repeat;
-webkit-mask-size: cover;
width: 40px;
}
&[name='admin-circles']>li {
@include ci('bubble-add');
}
@ -109,6 +122,18 @@
&[name='admin-projects']>li {
@include ci('add');
}
&[active] {
background-color: $color-233-18-29;
color: $color-46-100-67;
display: inline-block;
}
&.active-color[active] {
>li::before {
background-color: #ffd857;
}
}
}
}
}

View File

@ -15,6 +15,5 @@
font-size: 1.4rem;
font-weight: 400;
margin-left: 0.6rem;
margin-top: -2px;
padding: 0.3rem 0.98rem;
padding: 0.35rem 0.98rem;
}

View File

@ -18,7 +18,7 @@ div#viewport {
@import 'components/index';
@import 'layout/members/index';
@import 'layout/job-offers/index';
@import 'layout/project-profile/index';
@import 'layout/project/index';
@import 'layout/circle/index';
@import 'layout/user/index';
@import 'layout/events/index';

View File

@ -1,3 +1,2 @@
@import 'circle';
@import 'circle-profile';
@import 'circle-admin';

View File

@ -8,62 +8,22 @@
.block {
/* peut-être à mettre dans main.scss */
circle-team-template>sib-display>div {
display: grid;
grid-column-gap: 1.6rem;
grid-template-columns: 7vh auto;
grid-template-rows: repeat(2, 5.2vh);
.user-thumb>div {
@extend %user-thumb__grid;
>[name='account.picture'] {
align-items: center;
align-self: center;
background-color: $color-213-20-91;
border-radius: 50%;
display: flex;
grid-column: 1 / span 1;
grid-row: 1 / span 2;
height: 7vh;
justify-content: center;
overflow: hidden;
position: relative;
width: 7vh;
img {
background-color: white;
height: 100%;
left: 0;
object-fit: cover;
position: absolute;
top: 0;
width: 100%;
}
object {
height: 45%;
width: 45%;
}
>.user-thumb__picture {
@extend %user-thumb__picture;
}
>[name='sup'] {
align-items: center;
align-self: end;
display: flex;
grid-column: 2 / span 1;
grid-row: 1 / span 1;
margin-bottom: 0.50rem;
@extend %user-thumb__grid-sup;
.user-name {
font-weight: 600;
.user-thumb__name {
@extend %user-thumb__name;
}
.tag-group {
display: flex;
margin-bottom: 1px;
margin-left: 0.6rem;
[name='groups'] {
@extend %tag-role;
}
@extend %user-thumb__groups;
}
.tag-admin:not(:empty) {
@ -72,20 +32,10 @@
}
>[name='sub'] {
align-self: start;
grid-column: 2 / span 1;
grid-row: 2 / span 1;
margin-top: 0.50rem;
@extend %user-thumb__grid-inf;
>.city:not(:empty) {
@include mdi('atom');
align-items: center;
display: flex;
&::before {
color: $color-43-100-50;
margin-right: 0.50rem;
}
>.user-thumb__city:not(:empty) {
@extend %user-thumb__city;
}
}
}

View File

@ -1,191 +0,0 @@
#circle-information,
#circle-edit,
#admin-circle-list,
#admin-circle-create,
#admin-project-list,
#admin-project-create {
.content-box__info {
@extend %padding-block;
display: flex;
flex-direction: column;
.backlink {
text-align: right;
display: block;
}
}
.table {
.table-header {
display: flex;
flex: 1;
font-size: 1.6rem;
font-weight: 600;
justify-content: space-around;
text-align: center;
&.grey-color {
background: $color-228-25-79;
color: white;
}
>* {
border-right: 1px solid white;
flex: 1;
padding: 2.1rem 0;
text-align: center;
}
>*:last-of-type {
border-right: 1px solid $color-228-25-79;
}
}
.table-body {
>div:first-of-type>sib-display>div,
team-template-edit[name='members'] {
display: flex;
border-left: 1px solid $color-228-25-79;
}
.border {
border-bottom: 1px solid $color-228-25-79;
border-right: 1px solid $color-228-25-79;
}
.cell {
text-align: center;
word-wrap: break-word;
}
.w25 {
width: 25%;
}
.w33 {
width: 33.3333%;
}
.w50 {
width: 50%;
}
.hashtag::before {
content: '#';
}
}
.cell-with-name {
color: $color-233-18-29;
font-weight: 600;
padding-top: 2.5rem;
}
.cell-with-id-card>div, /* for the table in circle-edit */
.cell-with-id-card>sib-display>div,
project-captain[name='user']>sib-display>div { /* for the captain's cell in project-admin */
display: grid;
grid-column-gap: 1.6rem;
grid-template-columns: 7vh auto;
grid-template-rows: repeat(2, 5.2vh);
padding: 0 2.2rem;
>[name$='account.picture'] {
align-items: center;
align-self: center;
background-color: $color-213-20-91;
border-radius: 50%;
display: flex;
grid-column: 1 / span 1;
grid-row: 1 / span 2;
height: 7vh;
justify-content: center;
overflow: hidden;
position: relative;
width: 7vh;
img {
background-color: white;
height: 100%;
left: 0;
object-fit: cover;
position: absolute;
top: 0;
width: 100%;
}
object {
height: 45%;
width: 45%;
}
}
>[name='sup'] {
align-self: end;
display: flex;
grid-column: 2 / span 1;
grid-row: 1 / span 1;
margin-bottom: 0.50rem;
[name$='name'] {
color: #7A7F85;
font-weight: 600;
margin-right: 1rem;
}
sib-multiple>div {
display: flex;
[name='groups'] {
@extend %tag-role;
}
}
}
>[name='sub'] {
align-self: start;
grid-column: 2 / span 1;
grid-row: 2 / span 1;
margin-top: 0.50rem;
>[name$='username']:not(:empty) {
align-items: center;
display: flex;
&::before {
content: '@';
}
}
}
}
.cell-with-buttons {
align-items: center;
display: flex;
justify-content: center;
[name='button'] {
input[type='submit'] {
@extend .button,
.text-bold,
.text-uppercase,
.reversed,
.button-blue,
.bordered,
.btn-margin-left;
}
}
}
sib-ac-checker {
align-items: center;
display: flex;
justify-content: center;
}
}
}

View File

@ -75,7 +75,7 @@ sib-job-board {
margin: 0.25em;
}
[name='author.firstName'] {
[name='author.first_name'] {
color: $color-0-0-29;
font-weight: 600;
}

View File

@ -1,177 +0,0 @@
#project-profile {
.button-question__position {
position: relative;
bottom: 5px;
}
.button-question__color {
color: $color-216-4-22;
}
.customer-box {
display: flex;
margin: 1.6rem 0;
>* {
border: 1px solid $color-221-51-90;
flex: 0 1 50%;
padding: 1.7rem 2rem;
&:first-child {
li:last-child {
margin-top: 3rem;
p {
margin-top: 0.8rem;
}
}
}
&:last-child {
border-left: none;
li {
margin-bottom: 1.5rem;
}
}
}
}
.customer-logo {
box-sizing: border-box;
display: flex;
height: 8.5vh;
justify-content: flex-end;
margin-top: 20px;
text-align: end;
width: 15vw;
}
hd-captain>sib-display>div,
hd-project-team>sib-display>div { /* Maybe move it in main.scss. /!\ some fields are different */
display: grid;
grid-column-gap: 1.6rem;
grid-template-columns: 7vh auto;
grid-template-rows: repeat(2, 5.2vh);
>[name='user.account.picture'],
>[name='account.picture'] {
align-items: center;
align-self: center;
background-color: $color-213-20-91;
border-radius: 50%;
display: flex;
grid-column: 1 / span 1;
grid-row: 1 / span 2;
height: 7vh;
justify-content: center;
overflow: hidden;
position: relative;
width: 7vh;
img {
background-color: white;
height: 100%;
left: 0;
object-fit: cover;
position: absolute;
top: 0;
width: 100%;
}
object {
height: 45%;
width: 45%;
}
}
>[name='sup'] {
align-self: end;
display: flex;
grid-column: 2 / span 1;
grid-row: 1 / span 1;
margin-bottom: 0.50rem;
.user-name {
font-weight: 600;
}
sib-multiple {
display: flex;
margin-left: 1rem;
[name='groups'],
[name='user.groups'] {
@extend %tag-role;
}
}
.tag-admin:not(:empty) {
@extend %tag-admin;
}
}
>[name='sub'] {
align-self: start;
grid-column: 2 / span 1;
grid-row: 2 / span 1;
margin-top: 0.50rem;
>[name$='profile.city']:not(:empty) {
@include mdi('atom');
align-items: center;
display: flex;
margin-right: 1.6rem;
&::before {
color: $color-43-100-50;
margin-right: 0.50rem;
}
}
>[name$='name']:not(:empty),
>[name='is_lead'] {
@include icon('eyeglass');
align-items: center;
display: flex;
&::before {
color: $color-43-100-50;
font-size: 1.9rem;
font-weight: bold;
margin-left: 0;
margin-right: 0.50rem;
}
}
}
}
ul {
list-style: none;
padding-left: 0;
li {
margin-bottom: 0.5em;
span::before {
color: $color-43-100-50;
font-size: 2.2rem;
margin: 0 1rem 0 0;
}
span {
font-weight: bold;
&.link-color {
color: $color-244-73-62;
}
&.norm-weight {
font-weight: normal;
}
}
}
}
}

View File

@ -1,8 +0,0 @@
#project-profile {
.content-box__info {
@extend %padding-block;
display: flex;
flex-direction: column;
}
}

View File

@ -1,2 +1 @@
@import 'project';
@import 'project-profile';

View File

@ -0,0 +1,115 @@
#project-profile {
.button-question__position {
position: relative;
bottom: 5px;
}
.button-question__color {
color: $color-216-4-22;
}
.customer-box {
display: flex;
margin: 1.6rem 0;
>* {
border: 1px solid $color-221-51-90;
flex: 0 1 50%;
padding: 1.7rem 2rem;
&:first-child {
li:last-child {
margin-top: 3rem;
p {
margin-top: 0.8rem;
}
}
}
&:last-child {
border-left: none;
li {
margin-bottom: 1.5rem;
}
}
}
}
.customer-logo {
box-sizing: border-box;
display: flex;
height: 8.5vh;
justify-content: flex-end;
margin-top: 20px;
text-align: end;
width: 15vw;
}
.user-thumb>div {
/* Maybe move it in main.scss. /!\ some fields are different */
@extend %user-thumb__grid;
>.user-thumb__picture {
@extend %user-thumb__picture;
}
>[name='sup'] {
@extend %user-thumb__grid-sup;
.user-thumb__name {
@extend %user-thumb__name;
}
sib-multiple {
@extend %user-thumb__groups;
}
.tag-admin:not(:empty) {
@extend %tag-admin;
}
}
>[name='sub'] {
@extend %user-thumb__grid-inf;
>.user-thumb__city:not(:empty) {
@extend %user-thumb__city;
}
>.user-thumb__lead:not(:empty) {
@extend %user-thumb__lead;
}
}
}
ul {
list-style: none;
padding-left: 0;
li {
margin-bottom: 0.5em;
span::before {
color: $color-43-100-50;
font-size: 2.2rem;
margin: 0 1rem 0 0;
}
span {
font-weight: bold;
&.link-color {
color: $color-244-73-62;
}
&.norm-weight {
font-weight: normal;
}
}
}
}
}

View File

@ -1 +1,2 @@
@import 'user-profile';
@import 'user-profile';
@import 'admin-users';

View File

@ -0,0 +1,6 @@
/* Fix. Could disappear when we can add .class on set fields */
sib-set-default[name='cell-1'] {
@extend .w33;
@extend .cell;
@extend .border;
}