Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove text capital style from mew-button #306

Merged
merged 14 commits into from
Sep 22, 2022
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: use token cotainer for notification swap tokens
hsurf22 committed Sep 16, 2022
commit d4b7f1c63d54a8a8db0cccda2841fb582faffee1
Binary file added src/assets/btc.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/cad.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/eth.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 14 additions & 16 deletions src/components/MewNotification/MewNotification.vue
Original file line number Diff line number Diff line change
@@ -61,23 +61,19 @@
<!-- ===================================================================================== -->
<div
v-else
class="d-flex flex-column currency-symbol"
class="d-flex flex-column currency-symbol ml-2"
>
<img
:src="
notification.fromObj.icon
? notification.fromObj.icon
: ethTokenPlaceholder
"
width="24px"
height="24px"
>
<img
:src="notification.toObj.icon"
width="24px"
height="24px"
<MewTokenContainer
:img=" notification.fromObj.icon
? notification.fromObj.icon
: ethTokenPlaceholder"
token-border
/>
<MewTokenContainer
:img="notification.toObj.icon"
class="overlap"
>
token-border
/>
</div>

<!-- ===================================================================================== -->
@@ -204,6 +200,7 @@
</template>

<script>
import MewTokenContainer from '@/components/MewTokenContainer/MewTokenContainer.vue';
import MewBadge from '@/components/MewBadge/MewBadge.vue';
import MewBlockie from '@/components/MewBlockie/MewBlockie.vue';
import MewTransformHash from '@/components/MewTransformHash/MewTransformHash.vue';
@@ -212,6 +209,7 @@ import ethTokenPlaceholder from '@/assets/images/icons/eth.svg';
export default {
name: 'MewNotification',
components: {
MewTokenContainer,
MewBadge,
MewBlockie,
MewTransformHash
@@ -472,7 +470,7 @@ export default {
}
.overlap {
position: absolute;
left: 14px;
left: 15px;
}
}
</style>
12 changes: 12 additions & 0 deletions src/components/MewTokenContainer/MewTokenContainer.vue
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
<!-- ===================================================================================== -->
<div
class="mew-token-container d-flex align-center justify-center"
:class="tokenBorder ? 'token-border' : ''"
:style="{ height: `${getSize}`, width: `${getSize}` }"
>
<!-- ===================================================================================== -->
@@ -81,6 +82,13 @@ export default {
type: [String, Array],
default: '',
},
/**
* Add border
*/
tokenBorder: {
type: Boolean,
default: false,
},
},
data() {
return {
@@ -148,6 +156,10 @@ export default {
border-radius: 50%;
box-shadow: inset 0px 0px 2px rgba(0, 0, 0, 0.3);

&.token-border {
box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.6);
}

.token-skeleton {
.v-skeleton-loader__avatar {
background-color: var(--v-greyLight-base);