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

This commit is contained in:
Marjolaine Le Bon
2020-09-08 11:43:30 +02:00
13 changed files with 248 additions and 104 deletions

View File

@ -7,6 +7,7 @@
@include breakpoint(lg) {
display: flex;
flex-direction: column;
margin-bottom: 0;
transition: all .3s ease;
}
}
@ -31,7 +32,7 @@
left: 0;
margin: 0;
margin-left: auto;
margin-top: 109px;
margin-top: 32px;
position: relative;
width: auto;
}

View File

@ -266,6 +266,111 @@ h5 {
width: 15vw;
}
.project-edit-logo {
display: flex;
height: 8.5vh;
margin-top: 20px;
margin-bottom: 30px;
form {
display: flex;
}
hubl-user-avatar {
width: 104px;
}
input[type='submit'] {
@extend .button,
.text-bold,
.text-uppercase,
.button-primary,
.bordered;
align-self: center;
}
}
.form-picture {
form {
display: block;
text-align: center;
margin-bottom: 2.6rem;
padding-top: 1.8rem;
@include breakpoint(lg) {
display: flex;
width: 100%;
}
hubl-user-avatar {
display: inline-block;
max-width: 100%;
max-height: 16.5vh;
@include breakpoint(lg) {
margin-left: 20px;
max-height: 8.5vh;
max-width: none;
width: calc(35vw - 20px);
}
>object,
>img {
display: block;
max-height: 16.5vh !important;
@include breakpoint(lg) {
max-height: 8.5vh !important;
}
}
}
input {
@extend .button,
.text-bold,
.text-uppercase,
.button-primary,
.bordered;
margin: 10px 0;
width: 100%;
@include breakpoint(lg) {
margin: auto 0 auto 2.2rem;
width: auto;
}
}
}
}
.p_relative {
position: relative;
}
.flex_column {
flex-direction: column;
}
.flex_vertical-center {
align-items: center;
}
.w90 {
@include breakpoint(sm) {
width: 90%;
}
}
.w100 {
@include breakpoint(sm) {
width: 100%;
}
}
.content-box {
@include window-style-modal();
flex-direction: column;

View File

@ -38,6 +38,7 @@
}
.user-thumb__admin:not(:empty) {
display: block !important;
@extend %tag-admin;
}

View File

@ -3,4 +3,5 @@
@import 'filters';
@import 'sidebar';
@import 'skills';
@import 'tags';
@import 'tags';
@import 'project-edit-picture';

View File

@ -0,0 +1,39 @@
.project-edit-picture {
>div>*:not(:last-child) {
margin-bottom: 2rem;
}
hubl-user-avatar {
background: transparent;
border-radius: 0;
display: inline-block;
text-align: center;
object, img {
position: relative;
}
}
solid-ac-checker:first-of-type {
display: block;
@include breakpoint(lg) {
display: flex;
}
#solid-picture-remove {
margin-left: 0;
margin-top: 2rem;
@include breakpoint(lg) {
margin-left: 2rem;
margin-top: 0;
}
}
}
solid-ac-checker:last-of-type {
align-self: flex-end;
}
}