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: dapp btn capitalization format #313

Merged
merged 9 commits into from
Oct 6, 2022
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
### Release 1.3.7
### devop
- remove dapp btn capitalization [#313](https://github.com/MyEtherWallet/mew-components/pull/313)
- swap notification arrow alignment [#312](https://github.com/MyEtherWallet/mew-components/pull/312)
- address selector showing invalid identicon [#311](https://github.com/MyEtherWallet/mew-components/pull/311)
- tooltip alignment [#304](https://github.com/MyEtherWallet/mew-components/pull/304)


### Release 1.3.5
### devop
- Remove text capital style from mew button [#306](https://github.com/MyEtherWallet/mew-components/pull/306)
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@myetherwallet/mew-components",
"version": "1.3.6",
"version": "1.3.7",
"description": "MEW Components",
"main": "dist/mew-components.umd.js",
"module": "dist/mew-components.esm.js",
27 changes: 17 additions & 10 deletions src/components/MewAddressSelect/MewAddressSelect.vue
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@
<!-- ===================================================================================== -->
<template #prepend-inner>
<div
v-if="!isValidAddress"
v-if="!isValidAddress || !blockieHash"
class="blockie-placeholder mr-1 selectHover"
/>
<mew-blockie
@@ -87,9 +87,7 @@
class="dropdown-icon-container d-flex align-center justify-center cursor-pointer full-height"
@click="toggle"
>
<v-icon class="mew-heading-1 mx-5">
mdi-chevron-down
</v-icon>
<v-icon class="mew-heading-1 mx-5"> mdi-chevron-down </v-icon>
</div>
</template>

@@ -115,10 +113,7 @@
v-if="!item.resolvedAddr || item.resolvedAddr === ''"
:hash="item.address"
/>
<span
v-else
class="mew-address"
>{{ item.address }}</span>
<span v-else class="mew-address">{{ item.address }}</span>
</div>
<div class="overline primary--text font-weight-medium ml-3">
{{ item.nickname }}
@@ -255,6 +250,13 @@ export default {
errorMessages: {
type: [String, Array],
default: ''
},
/**
* Clear address
*/
clearAddress: {
type: Boolean,
default: false
}
},
data() {
@@ -287,10 +289,15 @@ export default {
: this.addressValue.address || this.addressValue;
}
},
watch: {
clearAddress() {
this.clear();
}
},
methods: {
/**
* Clears the v-model value.
*/
* Clears the v-model value.
*/
clear() {
this.addressValue = '';
},
15 changes: 4 additions & 11 deletions src/components/MewBlockie/MewBlockie.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<template>
<div>
<div
v-show="address"
style="position: relative"
:style="`width: ${width}; height: ${height}`"
>
@@ -9,24 +10,16 @@
:src="blockieImg"
alt="Blockie Image"
style="display: block; border-radius: 50%"
>
/>

<!--
=====================================================================
Inset shadow on edge of blockie image
=====================================================================
-->
<div
v-if="!flat"
class="inset-shadow"
/>
<div v-if="!flat" class="inset-shadow" />
</div>
<img
v-if="currency"
alt="icon"
class="currency-icon"
:src="currency"
>
<img v-if="currency" alt="icon" class="currency-icon" :src="currency" />
</div>
</template>

2 changes: 2 additions & 0 deletions src/components/MewButton/MewButton.vue
Original file line number Diff line number Diff line change
@@ -314,6 +314,8 @@ export default {
.v-btn.mew-button {
letter-spacing: 0.5px;

text-transform: none;

border-radius: 10px !important;
// BUTTON SIZES
&.small-btn {
12 changes: 8 additions & 4 deletions src/components/MewNotification/MewNotification.vue
Original file line number Diff line number Diff line change
@@ -104,17 +104,17 @@
class="ml-1 detail-hash"
/>
</div>
<div class="caption mew-heading-2">
<div class="d-inline-block mr-1">
<div class="caption mew-heading-2 d-flex align-center">
<div class="mr-1 line-height-initial">
{{ notification.fromObj.amount }}
<span class="textPrimary--text">{{
notification.fromObj.currency
}}</span>
</div>
<v-icon class="subtitle-1 d-inline-block">
<v-icon class="subtitle-1 mr-1">
mdi-arrow-right
</v-icon>
<div class="d-inline-block mr-3">
<div class="mr-3 line-height-initial">
{{ notification.toObj.amount }}
<span class="textPrimary--text">{{
notification.toObj.currency
@@ -473,4 +473,8 @@ export default {
left: 15px;
}
}

.line-height-initial {
line-height: initial;
}
</style>
14 changes: 3 additions & 11 deletions src/components/MewTooltip/MewTooltip.vue
Original file line number Diff line number Diff line change
@@ -1,26 +1,18 @@
<template>
<tippy-component
class="mew-tooltip"
style="line-height: 1px"
style="line-height: initial"
arrow
theme="light"
:max-width="maxWidth"
:content="text"
>
<!-- Popover trigger -->
<template #trigger>
<v-icon
v-if="!hideIcon"
class="cursor-pointer"
color="searchText"
small
>
<v-icon v-if="!hideIcon" class="cursor-pointer" color="searchText" small>
mdi-information
</v-icon>
<slot
name="activatorSlot"
class="d-flex"
/>
<slot name="activatorSlot" class="d-flex" />
</template>
<!-- Popover content -->
<slot name="contentSlot" />