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

Merge branch 'staging' of git.happy-dev.fr:startinblox/applications/sib-app into jbpasquier/admin

Browse Source
This commit is contained in:
Jean-Baptiste Pasquier 2019-10-25 19:08:54 +02:00
commit 1c2789812e
No known key found for this signature in database
GPG Key ID: F2702E6D22ED4D62
4 changed files with 59 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/styles/_index.scss
View File

@ -17,6 +17,6 @@ div#viewport {
@import 'layout/members/index'; @import 'layout/members/index';
@import 'layout/job-offers/index'; @import 'layout/job-offers/index';
@import 'layout/project-profile/index'; @import 'layout/project-profile/index';
@import 'layout/circle-profile/index'; @import 'layout/circle/index';
@import 'layout/user/index'; @import 'layout/user/index';
} }

0
src/styles/layout/circle-profile/_index.scss → src/styles/layout/circle/_index.scss
View File

71
src/styles/layout/circle-profile/circle-edit.scss → src/styles/layout/circle/circle-edit.scss
View File

@ -1,23 +1,55 @@
#circle-edit { #circle-edit {
.table-header { .table-header {
background: $color-228-25-79; background: $color-228-25-79;
color: white; color: white;
display: flex; display: flex;
font-size: 1.6rem; font-size: 1.6rem;
font-weight: 600; font-weight: 600;
justify-content: space-around; justify-content: space-around;
text-align: center; text-align: center;
>*{ >*{
border-right: 1px solid $color-228-25-79; border-right: 1px solid $color-228-25-79;
flex: 1; flex: 1;
padding: 1rem; padding: 1rem;
width: 50%; width: 50%;
}
>*:last-of-type {
border-left: 1px solid white;
@media (max-width: 1220px) {
display: none;
} }
}
}
>*:first-of-type { .table-body div team-template-edit {
border-right: 1px solid white; display: flex;
justify-content: space-between;
>* {
border-bottom: 1px solid $color-228-25-79;
flex: 1;
width: 50%;
}
sib-display {
border-left: 1px solid $color-228-25-79;
border-right: 1px solid $color-228-25-79;
padding: 0 2.2rem;
}
sib-ac-checker {
align-items: center;
border-right: 1px solid $color-228-25-79;
display: flex;
justify-content: flex-end;
padding: 2.7rem 2.2rem;
@media (max-width: 1220px) {
display: none;
} }
} }
@ -88,18 +120,27 @@
width: 100%; width: 100%;
} }
<<<<<<< HEAD:src/styles/layout/circle-profile/circle-edit.scss
object { object {
height: 45%; height: 45%;
width: 45%; width: 45%;
} }
=======
[name='name'] {
font-weight: 600;
margin-right: 1rem;
>>>>>>> 81d885730dd7673ee424a72b6f0c663c7c1cc5b7:src/styles/layout/circle/circle-edit.scss
} }
>[name='sup'] { >[name='sup'] {
align-self: end; align-self: end;
display: flex; display: flex;
<<<<<<< HEAD:src/styles/layout/circle-profile/circle-edit.scss
grid-column: 2 / span 1; grid-column: 2 / span 1;
grid-row: 1 / span 1; grid-row: 1 / span 1;
margin-bottom: 0.50rem; margin-bottom: 0.50rem;
=======
>>>>>>> 81d885730dd7673ee424a72b6f0c663c7c1cc5b7:src/styles/layout/circle/circle-edit.scss
[name='name'] { [name='name'] {
font-weight: 600; font-weight: 600;

0
src/styles/layout/circle-profile/circle-profile.scss → src/styles/layout/circle/circle-profile.scss
View File