-
Notifications
You must be signed in to change notification settings - Fork 38
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #150 from aeternity/feature/design-changes
Design changes (modals, buttons, favicons)
- Loading branch information
Showing
16 changed files
with
239 additions
and
99 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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
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
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
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
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 |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| <template> | ||
| <Modal @close="resolve"> | ||
| <h4 class="confirmtip-modal-header" slot="header"> | ||
| {{ $t('pages.tipPage.sendTipConfirmationHeader') }} | ||
| </h4> | ||
| <div class="confirmtip-modal--body" slot="body"> | ||
| {{ $t('pages.tipPage.sendTipConfirmationBody') }} | ||
| <p class="confirmation--question">{{ $t('pages.tipPage.sendTipConfirmationQstn') }}</p> | ||
| </div> | ||
| <div class="confirmtip-modal--footer" slot="footer"> | ||
| <Button data-cy="cancel-tip" dark @click="cancelTip"> | ||
| {{ $t('pages.tipPage.cancel') }} | ||
| </Button> | ||
| <Button data-cy="to-confirm" @click="toConfirm"> | ||
| {{ $t('pages.tipPage.sendTipBtn') }} | ||
| </Button> | ||
| </div> | ||
| </Modal> | ||
| </template> | ||
|
|
||
| <script> | ||
| import Modal from '../Modal'; | ||
| import Button from '../Button'; | ||
| export default { | ||
| props: { | ||
| resolve: { type: Function, required: true }, | ||
| reject: { type: Function, required: true }, | ||
| }, | ||
| components: { Modal, Button }, | ||
| methods: { | ||
| toConfirm() { | ||
| this.resolve(true); | ||
| }, | ||
| cancelTip() { | ||
| this.reject(new Error('reject')); | ||
| }, | ||
| }, | ||
| }; | ||
| </script> | ||
|
|
||
| <style lang="scss" scoped> | ||
| .confirmtip-modal-header { | ||
| margin: 0 !important; | ||
| font-weight: 500 !important; | ||
| } | ||
| .confirmtip-modal--body { | ||
| padding-bottom: 20px; | ||
| .confirmation--question { | ||
| font-weight: 500 !important; | ||
| color: #fff !important; | ||
| } | ||
| } | ||
| .confirmtip-modal--footer { | ||
| display: flex; | ||
| justify-content: space-between; | ||
| button { | ||
| margin: 0 !important; | ||
| width: 120px !important; | ||
| font-weight: 700 !important; | ||
| font-size: 15px !important; | ||
| } | ||
| } | ||
| </style> |
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
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 |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| <template> | ||
| <Modal @close="resolve"> | ||
| <div class="badge-modal-header" slot="header"> | ||
| <UrlBadge :type="verifiedStatus" /> | ||
| <h4> | ||
| {{ | ||
| verifiedStatus == 'verified' | ||
| ? $t('pages.tipPage.whatIsVerifieddUrl') | ||
| : $t('pages.tipPage.whatIsUntrustedUrl') | ||
| }} | ||
| </h4> | ||
| </div> | ||
| <div slot="body"> | ||
| {{ | ||
| verifiedStatus == 'verified' | ||
| ? $t('pages.tipPage.verifiedUrlInfo') | ||
| : $t('pages.tipPage.untrustedUrlInfo') | ||
| }} | ||
| </div> | ||
| <div slot="footer"> | ||
| <Button class="ok-button" @click="resolve">{{ $t('pages.tipPage.OkButton') }}</Button> | ||
| </div> | ||
| </Modal> | ||
| </template> | ||
|
|
||
| <script> | ||
| import Modal from '../Modal'; | ||
| import Button from '../Button'; | ||
| import UrlBadge from '../UrlBadge'; | ||
| export default { | ||
| props: { | ||
| resolve: { type: Function, required: true }, | ||
| verifiedStatus: { type: String, required: true }, | ||
| }, | ||
| components: { Modal, Button, UrlBadge }, | ||
| }; | ||
| </script> | ||
|
|
||
| <style lang="scss" scoped> | ||
| .badge-modal-header { | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: center; | ||
| .badge { | ||
| font-weight: 400 !important; | ||
| margin: 0 !important; | ||
| } | ||
| h4 { | ||
| margin: 0 5px; | ||
| } | ||
| } | ||
| .ok-button { | ||
| width: 120px !important; | ||
| font-weight: 700 !important; | ||
| font-size: 15px !important; | ||
| } | ||
| </style> |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.