-
Notifications
You must be signed in to change notification settings - Fork 56
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
♻️ mon-pix: improve focus and time page
- Loading branch information
1 parent
5bf04db
commit 9a0e47b
Showing
4 changed files
with
50 additions
and
92 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,22 @@ | ||
| <div class="rounded-panel rounded-panel--no-margin-bottom timed-challenge-instructions"> | ||
| <div class="timed-challenge-instructions__primary"> | ||
| <h1 class="timed-challenge-instructions__primary"> | ||
| {{t "pages.timed-challenge-instructions.primary" time=this.allocatedTime htmlSafe=true}} | ||
| </div> | ||
| </h1> | ||
|
|
||
| <div class="timed-challenge-instructions__secondary"> | ||
| <p class="timed-challenge-instructions__secondary"> | ||
| {{t "pages.timed-challenge-instructions.secondary"}} | ||
| </div> | ||
| </p> | ||
|
|
||
| <div class="timed-challenge-instructions__allocated-time"> | ||
| <div class="timed-challenge-instructions-allocated-time__gauge"> | ||
| <img class="timed-challenge-instructions-gauge__icon" src="/images/icons/icon-timed-challenge.svg" alt="" /> | ||
| <span class="timed-challenge-instructions-gauge__value">{{this.allocatedTime}}</span> | ||
| </div> | ||
| <PixIcon @name="clock" @ariaHidden={{true}} class="timed-challenge-instructions-allocated-time__icon" /> | ||
| <span>{{this.allocatedTime}}</span> | ||
| </div> | ||
|
|
||
| <div class="timed-challenge-instructions__action"> | ||
| <PixButton | ||
| @triggerAction={{@hasUserConfirmedWarning}} | ||
| class="timed-challenge-instructions-action__confirmation-button" | ||
| @variant="success" | ||
| > | ||
| {{t "pages.timed-challenge-instructions.action"}} | ||
| </PixButton> | ||
| </div> | ||
| <PixButton | ||
| @triggerAction={{@hasUserConfirmedWarning}} | ||
| class="timed-challenge-instructions-action__confirmation-button" | ||
| @variant="success" | ||
| > | ||
| {{t "pages.timed-challenge-instructions.action"}} | ||
| </PixButton> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 15 additions & 33 deletions
48
mon-pix/app/styles/components/_timed-challenge-instructions.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,72 +1,54 @@ | ||
| .timed-challenge-instructions { | ||
| display: flex; | ||
| flex-direction: column; | ||
| align-items: center; | ||
| justify-content: center; | ||
| padding: 20px; | ||
| padding: var(--pix-spacing-10x) var(--pix-spacing-6x); | ||
| overflow: hidden; | ||
| text-align: center; | ||
|
|
||
| &__primary { | ||
| margin-top: 22px; | ||
| @extend %pix-title-s; | ||
|
|
||
| color: var(--pix-neutral-800); | ||
| font-weight: var(--pix-font-bold); | ||
| font-size: 1.5rem; | ||
| font-style: normal; | ||
| font-stretch: normal; | ||
| } | ||
|
|
||
| &__secondary { | ||
| margin-top: 9px; | ||
| @extend %pix-body-l; | ||
|
|
||
| margin-top: var(--pix-spacing-3x); | ||
| margin-bottom: 50px; | ||
| color: var(--pix-neutral-800); | ||
| font-size: 1.125rem; | ||
| font-style: normal; | ||
| font-stretch: normal; | ||
| } | ||
|
|
||
| &__time { | ||
| color: var(--pix-primary-500); | ||
| } | ||
|
|
||
| &__allocated-time { | ||
| color: var(--pix-neutral-800); | ||
| font-size: 1.7375rem; | ||
| } | ||
|
|
||
| &__action { | ||
| display: flex; | ||
| justify-content: center; | ||
| } | ||
| } | ||
|
|
||
| .timed-challenge-instructions-allocated-time { | ||
| &__gauge { | ||
| display: flex; | ||
| flex-direction: row; | ||
| gap: var(--pix-spacing-2x); | ||
| align-items: center; | ||
| justify-content: center; | ||
| width: fit-content; | ||
| height: 50px; | ||
| margin: 0 auto; | ||
| padding: 4px 12px; | ||
| line-height: 3.125rem; | ||
| padding: var(--pix-spacing-1x) var(--pix-spacing-3x); | ||
| color: var(--pix-neutral-800); | ||
| font-size: 1.5rem; | ||
| background-color: var(--pix-neutral-20); | ||
| border-radius: 7px; | ||
| } | ||
| } | ||
|
|
||
| .timed-challenge-instructions-gauge { | ||
| .timed-challenge-instructions-allocated-time { | ||
| &__icon { | ||
| width: 42px; | ||
| padding-right: 6px; | ||
| padding-bottom: 6px; | ||
| width: 2.5rem; | ||
| fill: var(--pix-neutral-800); | ||
| } | ||
| } | ||
|
|
||
| .timed-challenge-instructions-action { | ||
| &__confirmation-button { | ||
| margin-top: 22px; | ||
| font-size: 0.875rem; | ||
| text-transform: uppercase; | ||
| margin-top: var(--pix-spacing-6x); | ||
| } | ||
| } |
29 changes: 13 additions & 16 deletions
29
mon-pix/app/templates/components/focused-certification-challenge-instructions.hbs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,19 @@ | ||
| <div class="focused-certification-challenge-instructions"> | ||
| <div class="focused-certification-challenge-instructions__image"> | ||
| <img src="/images/icone-pix-focus-rounded.svg" alt="" /> | ||
| </div> | ||
| <div class="focused-certification-challenge-instructions__title"> | ||
| <img src="/images/icone-pix-focus-rounded.svg" alt="" class="focused-certification-challenge-instructions__image" /> | ||
|
|
||
| <h1 class="focused-certification-challenge-instructions__title"> | ||
| {{t "pages.focused-certification-challenge-instructions.title"}} | ||
| </div> | ||
| </h1> | ||
|
|
||
| <div class="focused-certification-challenge-instructions__description"> | ||
| <p class="focused-certification-challenge-instructions__description"> | ||
| {{t "pages.focused-certification-challenge-instructions.description"}} | ||
| </div> | ||
| </p> | ||
|
|
||
| <div class="focused-certification-challenge-instructions__action"> | ||
| <PixButton | ||
| @triggerAction={{@hasUserConfirmedWarning}} | ||
| class="focused-certification-challenge-instructions-action__confirmation-button" | ||
| @variant="success" | ||
| > | ||
| {{t "pages.focused-certification-challenge-instructions.action"}} | ||
| </PixButton> | ||
| </div> | ||
| <PixButton | ||
| @triggerAction={{@hasUserConfirmedWarning}} | ||
| class="focused-certification-challenge-instructions__confirmation-button" | ||
| @variant="success" | ||
| > | ||
| {{t "pages.focused-certification-challenge-instructions.action"}} | ||
| </PixButton> | ||
| </div> |