Skip to content

Commit

Permalink
Text fix, style fix
Browse files Browse the repository at this point in the history
  • Loading branch information
hsurf22 committed Aug 7, 2018
1 parent db3f6bb commit b005078
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 19 deletions.
3 changes: 2 additions & 1 deletion src/assets/images/icons/reddit.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion src/containers/FooterContainer/FooterContainer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ a:active {
height: 30px;
margin-top: -7px;
vertical-align: top;
margin-left: -9px;
}
}
}
Expand Down Expand Up @@ -167,9 +168,12 @@ a:active {
}

.copyright {
color: $text--footer-link-color;

text-align: center;

p {
color: $text--footer-link-color;
}
span {
color: $white;
}
Expand Down
17 changes: 9 additions & 8 deletions src/containers/FooterContainer/FooterContainer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,28 @@
<div class="donate-us">
<div class="content-title">
<h3 class="lite">
{{ $t("footer.welcome") }}
{{ $t("footer.love") }}
<img src="~@/assets/images/icons/heart.svg">
{{ $t("footer.donate") }}
</h3>
</div>
<div class="content-links">
<p>{{ $t("footer.welcomeDes") }}</p>

<a href="https://blockchain.info/address/1DECAF2uSpFTP4L1fAHR8GCLrPqdwdLse9" target="_blank">
<p class="crypto-link" data-btc="1DECAF2uSpFTP4L1fAHR8GCLrPqdwdLse9">
<img src="~@/assets/images/icons/btc.svg">
&nbsp;Bitcoin Donation
</p>
</a>

<a href="https://etherscan.io/address/0xDECAF9CD2367cdbb726E904cD6397eDFcAe6068D" target="_blank">
<p class="crypto-link" data-eth="0xDECAF9CD2367cdbb726E904cD6397eDFcAe6068D">
<img src="~@/assets/images/icons/eth.svg">
&nbsp;Ethereum Donation
</p>
</a>

<a href="https://blockchain.info/address/1DECAF2uSpFTP4L1fAHR8GCLrPqdwdLse9" target="_blank">
<p class="crypto-link" data-btc="1DECAF2uSpFTP4L1fAHR8GCLrPqdwdLse9">
<img src="~@/assets/images/icons/btc.svg">
&nbsp;Bitcoin Donation
</p>
</a>

</div>
</div>
</div>
Expand Down
4 changes: 4 additions & 0 deletions src/layouts/HomeLayout/components/Promo/Promo.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
.title {
color: $text-color-1;

h2 {
margin: 0;
}

@media all and (max-width: $tablet-width){
margin-bottom: 30px;
}
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/HomeLayout/components/Promo/Promo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="page-container">
<div class="flex-col-vertical-center content">
<div class="title">
<h2>{{ $t("home.promoTitle1") }}<br>{{ $t("home.promoTitle2") }}</h2>
<h2>{{ $t("home.promoTitle") }}</h2>
</div>
<div class="buttons">
<div class="button-block">
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/HomeLayout/components/Social/Social.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<script>
import github from '@/assets/images/icons/github.png'
import reddit from '@/assets/images/icons/reddit.png'
import reddit from '@/assets/images/icons/reddit.svg'
import slack from '@/assets/images/icons/slack.png'
export default {
Expand Down
2 changes: 1 addition & 1 deletion src/scss/Globals.scss
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ h6 {

.grid-col-1-1-1-2 {
display: grid;
grid-template-columns: 1fr 1fr 1fr 2fr;
grid-template-columns: 1fr 1fr 1fr 1.5fr;
}


Expand Down
6 changes: 4 additions & 2 deletions src/translations/footer/gb.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ const footer = {
about: 'About us',
team: 'Team',
welcome: 'Welcome to Donate to Us',
welcomeDes: 'Your donation will help us a lot to build our MEW Community.',
welcomeDes: 'MyEtherWallet is open-source and free to the community. Your donations go a long way towards making that possible.',
feedback: 'Feedback',
privacy: 'Privacy',
copyright: '© 2018 MyEtherWallet. All Rights reserved.'
copyright: '© 2018 MyEtherWallet. All Rights reserved.',
love: 'Love',
donate: 'MEW? Donate!'
}
export default footer
7 changes: 3 additions & 4 deletions src/translations/home/gb.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@ const home = {
faqsSecurityAndPhishing: 'Security And Phishing',
faqsTransactions: 'Transactions',
faqsPrivKeyandPass: 'Private Keys And Passwords',
socialTitle: 'Get Involved',
socialSubheading: 'Your Cryptocurrency Masters Are Getting Hilariously Rich.',
promoTitle1: 'Your Security',
promoTitle2: 'Ethereum Wallet.'
socialTitle: 'Join MEW Conversation',
socialSubheading: 'Get in now and see your balance grow (we hope)!',
promoTitle: 'Ethereum\'s Original Wallet'
}
export default home

1 comment on commit b005078

@mew-bot
Copy link
Collaborator

@mew-bot mew-bot commented on b005078 Aug 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.