diff --git a/src/app/profile/profile.component.scss b/src/app/profile/profile.component.scss index 50f831bd0b480351d3ba1edd610a51b51604c058..f2547348eb9a58390bbf3fbe56eff4323e321668 100644 --- a/src/app/profile/profile.component.scss +++ b/src/app/profile/profile.component.scss @@ -48,33 +48,8 @@ } .structureSection { margin-bottom: 108px; - .structureCard { - border: 1px solid $grey-4; - border-radius: 6px; - .structureInfo { - border-radius: 6px; - background: $white; - min-height: 100px; - padding: 33px 55px; - @media #{$large-phone} { - padding: 33px 25px; - } - a { - margin: 0; - &.structureName { - @include cn-bold-26; - color: $secondary-color; - text-decoration: underline; - } - } - .ownerName { - @include cn-regular-18; - color: $grey-2; - } - } - @include background-hash($grey-2); - } } + .addSection { button { background: $red-default; diff --git a/src/app/user-verification/user-verification.component.html b/src/app/user-verification/user-verification.component.html index ed99a6f365f0e88c421723db92f9aa4975336027..628bb8efe98b0575616bac18c89923a28424e1f0 100644 --- a/src/app/user-verification/user-verification.component.html +++ b/src/app/user-verification/user-verification.component.html @@ -11,25 +11,31 @@ Votre compte a bien été créé. </h3> </div> - <div *ngIf="structure" class="structureInfoBlock" fxLayout="row" fxLayoutAlign=" center"> - <div class="structureInfoContent" fxLayout="column"> - {{ structure.structureName }} - <span>{{ structure.getLabelTypeStructure() }}</span> - </div> - <div class="validateSvg"> - <svg class="validate" aria-hidden="true"> - <use [attr.xlink:href]="'assets/form/sprite.svg#checkVector'"></use> - </svg> + <div *ngIf="structure" class="structureCard"> + <div class="structureInfo" fxLayout="column" fxLayoutGap="14px"> + <div fxLayout="row" fxLayoutAlign="space-between start" fxLayoutGap="20px"> + <a class="structureName" routerLink="/home" [state]="{ data: structure }">{{ structure.structureName }}</a> + </div> </div> </div> </div> <p *ngIf="verificationIssue"> Une erreur est survenue lors de la validation de votre email... Veuillez envoyer un mail au support. </p> - <div - class="typeform-widget test" - data-url="https://form.typeform.com/to/m7DV3CdW?typeform-medium=embed-snippet" - ></div> + <!-- TypeForm --> + <div *ngIf="!verificationIssue"> + <iframe + *ngIf="structure" + class="typeform-widget custom-form" + title="typeform" + src="https://form.typeform.com/to/m7DV3CdW?typeform-medium=embed-snippet" + ></iframe> + <div + *ngIf="!structure" + class="typeform-widget custom-form" + data-url="https://form.typeform.com/to/ASJH3B7Z?typeform-medium=embed-snippet" + ></div> + </div> <div class="btnSection" fxLayout="row" fxLayoutAlign="space-around center"> <button *ngIf="structure && verificationSuccess" class="btn" routerLink="/home" [state]="{ data: structure }"> Voir ma structure diff --git a/src/app/user-verification/user-verification.component.scss b/src/app/user-verification/user-verification.component.scss index b6e4827124e5daf451db3bdc085464fe50b09430..8fb73ba431f51da2407dd97c5b93067df7e95554 100644 --- a/src/app/user-verification/user-verification.component.scss +++ b/src/app/user-verification/user-verification.component.scss @@ -7,28 +7,7 @@ padding: 18px; margin: auto; } -.structureInfoBlock { - background: $green-1; - color: $white; - padding: 16px; - border-radius: 6px; - @include cn-bold-18; - .structureInfoContent { - width: 100%; - } - span { - font-style: italic; - @include cn-regular-14; - } - .validateSvg { - stroke: $white; - text-align: right; - svg { - height: 14px; - width: 14px; - } - } -} + .btn { background: $secondary-color; border-radius: 4px; @@ -58,8 +37,18 @@ } } -.test { +.custom-form { width: 100%; - height: 300px; - transform: scale(0.75); + height: 480px; + border: none; +} + +// Override button style to be the same as typeform button +button { + margin: 0px; + max-width: 100%; + font-size: 24px !important; + line-height: 32px !important; + min-height: 48px; + width: 245px !important; } diff --git a/src/styles.scss b/src/styles.scss index 966c57e678d6dba6efa711125c2345e7b9c6a4d1..24a7585c8aa811ce9c856b8210201b33fcc12604 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -239,3 +239,30 @@ button { transform: translate(-50%, -50%); } } + +.structureCard { + border: 1px solid $grey-4; + border-radius: 6px; + .structureInfo { + border-radius: 6px; + background: $white; + min-height: 100px; + padding: 33px 55px; + @media #{$large-phone} { + padding: 33px 25px; + } + a { + margin: 0; + &.structureName { + @include cn-bold-26; + color: $secondary-color; + text-decoration: underline; + } + } + .ownerName { + @include cn-regular-18; + color: $grey-2; + } + } + @include background-hash($grey-2); +}