diff --git a/src/common/variables.scss b/src/common/variables.scss index f2f6ddfb0..ddd022ba0 100644 --- a/src/common/variables.scss +++ b/src/common/variables.scss @@ -20,15 +20,16 @@ $bg-color: #16161D; $white-color: #F1F1F1; $border-color: #34343B; $input-bg-color: #121217; -$button-color: #3F4048; -$button-text-color: #CFCFCF; +$button-color: #2A9CFF; +$button-text-color: #FFFFFF; +$modal-background: #1B1B23; $placeholder-color: #67676D; $text-color: #BCBCC4; $accent-color: #67f7b8; $secondary-color: #2a9cff; $nav-bg-color: #21212A; -$input-focus-color: #67f7b8; -$input-error-color: #2a9cff; +$input-focus-color: #2a9cff; +$input-error-color: #FF5857; $transactions-bg: #12121b; $nav-border-color: #3A3A47; $tx-border-color: #33343e; diff --git a/src/icons/icon_128.png b/src/icons/icon_128.png index d7c8ceba8..99e4fdf51 100644 Binary files a/src/icons/icon_128.png and b/src/icons/icon_128.png differ diff --git a/src/icons/icon_48.png b/src/icons/icon_48.png index b06341c4d..7bf23cd69 100644 Binary files a/src/icons/icon_48.png and b/src/icons/icon_48.png differ diff --git a/src/popup/locales/en.json b/src/popup/locales/en.json index 6b59c9a81..3bf3b3a76 100644 --- a/src/popup/locales/en.json +++ b/src/popup/locales/en.json @@ -155,7 +155,7 @@ "wholeTransaction": "Whole transaction history", "latestTransactions": "Latest transactions", "noTransactionsFound": "No transactions found!", - "tipSomeone": "Send Tips", + "tipSomeone": "Send Tip", "howToClaim": "How to claim AE", "balance": "Balance", "copied": "Copied!", @@ -594,6 +594,7 @@ }, "tipPage": { "back": "Back", + "OkButton": "OK", "noImage": "No Image", "domainVerified": "Verified", "domainNotVerified": "Not verified", @@ -607,6 +608,9 @@ "tipDetails": "Details", "tipWebsite": "Website", "heading": "Send", + "sendTipConfirmationHeader": "Send Tip Confirmation", + "sendTipConfirmationBody": "You are going to send tip to untrusted URL. Third party issues prevent us to ensure that tips will be directly delivered to the URL owner.", + "sendTipConfirmationQstn":"Are you sure you would like to send the tip anyway?", "headingSending": "Sending", "selectTip": "Select amount to tip", "tipDomain": "Tip domain", @@ -618,15 +622,19 @@ "title": "Title", "titlePlaceholder": "Send a message of #support along with your donation...", "account": "Account", - "next": "Send Tips", - "url": "Send a tip to", + "next": "Send Tip", + "url": "Send Tip to", "to": "to", "amountPlaceholder": "Enter amount", "amountLabel": "Amount", "availableLabel": "Available", "confirm": "Confirm", "cancel": "Cancel", - "edit": "Edit AE Details" + "edit": "Edit AE Details", + "whatIsVerifieddUrl": "What is \"Verified\" URL?", + "whatIsUntrustedUrl": "What is \"Untrusted\" URL?", + "untrustedUrlInfo": "Third party issues prevent us to ensure that tips will be directly delivered to the URL owner. You are sending the tip at your own risk.", + "verifiedUrlInfo": "If a URL is marked as verified, it means the owner of this URL is already a fellow Superhero — and that is awesome! An AE address has been included in the URL and tips can be claimed." }, "successTip": { "sendMore": "Send More AE", diff --git a/src/popup/router/components/Button.vue b/src/popup/router/components/Button.vue index 4f7bd1cb0..29096e89c 100644 --- a/src/popup/router/components/Button.vue +++ b/src/popup/router/components/Button.vue @@ -13,6 +13,7 @@ export default { small: Boolean, third: Boolean, onboarding: Boolean, + dark: Boolean, }, computed: { getClasses() { @@ -23,6 +24,7 @@ export default { if (this.small) c.push('small'); if (this.third) c.push('third'); if (this.onboarding) c.push('onboarding'); + if (this.dark) c.push('dark'); return c.join(' '); }, }, @@ -61,6 +63,9 @@ export default { width: 48% !important; margin: 0 !important; } +.primary-button.dark { + background: $box-button-color !important; +} .primary-button.small { width: auto !important; line-height: 1px !important; diff --git a/src/popup/router/components/Modal.vue b/src/popup/router/components/Modal.vue index cdfe4fd0b..4a4b6dc7a 100644 --- a/src/popup/router/components/Modal.vue +++ b/src/popup/router/components/Modal.vue @@ -2,9 +2,9 @@