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 footer content wrapping issue #1892

Merged
merged 2 commits into from
Jan 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
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
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,19 @@
### Feature

- Add vkontakte icon to social home page and add first time russian popup [#1872](https://github.com/MyEtherWallet/MyEtherWallet/pull/1872)
- Add unstoppable domains [#1857] (https://github.com/MyEtherWallet/MyEtherWallet/pull/1857)
- Add unstoppable domains [#1857](https://github.com/MyEtherWallet/MyEtherWallet/pull/1857)

### Devop

- Update ledger packages [#1884](https://github.com/MyEtherWallet/MyEtherWallet/pull/1884)
- Run update:swap with other update script [#1859](https://github.com/MyEtherWallet/MyEtherWallet/pull/1859)
- Update translations [#1870] (https://github.com/MyEtherWallet/MyEtherWallet/pull/1870)
- Update translations [#1870](https://github.com/MyEtherWallet/MyEtherWallet/pull/1870)
- Update Packages from greenkeeper [#1863](https://github.com/MyEtherWallet/MyEtherWallet/pull/1863)
- Remove Price bar [#1876](https://github.com/MyEtherWallet/MyEtherWallet/pull/1876)

### Bug

- Fix footer text wrapping issue [#1892](https://github.com/MyEtherWallet/MyEtherWallet/pull/1892)
- Fix tx hash link, switch address, and make cx connection with popup more stable [#1853](https://github.com/MyEtherWallet/MyEtherWallet/pull/1853)
- Disable web3 detection [#1840](https://github.com/MyEtherWallet/MyEtherWallet/pull/1840)
- Improve error messages for outdated dependencies [#1848](https://github.com/MyEtherWallet/MyEtherWallet/pull/1848)
Expand Down
2 changes: 1 addition & 1 deletion fetchLists/lists/contracts.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion fetchLists/lists/tokens.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@import '~@/scss/GlobalVariables';
@media all and (min-width: calc(#{$tablet-width} - 200px)) {
//@media all and (min-width: $tablet-width) {
@media all and (min-width: calc(#{$tablet-width} + 1px)) {
a,
a:link,
a:visited,
Expand Down
232 changes: 0 additions & 232 deletions src/containers/FooterContainer/FooterContainer-mobile.scss

This file was deleted.

52 changes: 23 additions & 29 deletions src/containers/FooterContainer/FooterContainer-tablet.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@import '~@/scss/GlobalVariables';
@media all and (min-width: calc(#{$mobile-width} + 1px)) and (max-width: $tablet-width - 200px) {
@media all and (max-width: $tablet-width) {
//@media all and (max-width: calc(#{$tablet-width} - 1px)) {
a,
a:link,
a:visited,
Expand Down Expand Up @@ -44,6 +45,11 @@
font-size: 19px;
}

.open,
.close {
display: block;
}

p {
color: $white;
cursor: pointer;
Expand Down Expand Up @@ -143,42 +149,27 @@

.foot-note {
align-items: center;
border-top: 1px solid $dark-blue-1;
margin-top: 40px;
padding-top: 40px;

@media all and (max-width: $tablet-width) {
border-top: 0;
flex-direction: column;
margin-top: 0;

.links {
order: 1;
text-align: center;

a:last-child {
span {
margin-right: 0;
padding-right: 0;
}
}
}

.social {
order: 2;
}

.copyright {
order: 3;
}
}
border-top: 0;
flex-direction: column;
margin-top: 0;

> div {
//margin: 0 auto;
margin-bottom: 20px;
}

.links {
order: 1;
text-align: center;

a:last-child {
span {
margin-right: 0;
padding-right: 0;
}
}

display: flex;
align-items: center;

Expand All @@ -197,6 +188,7 @@
}

.copyright {
order: 3;
text-align: center;

p {
Expand All @@ -209,6 +201,8 @@
}

.social {
order: 2;

@media all and (max-width: $tablet-width) {
text-align: center;
}
Expand Down
1 change: 0 additions & 1 deletion src/containers/FooterContainer/FooterContainer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -358,5 +358,4 @@ export default {
<style lang="scss" scoped>
@import 'FooterContainer-desktop.scss';
@import 'FooterContainer-tablet.scss';
@import 'FooterContainer-mobile.scss';
</style>
2 changes: 1 addition & 1 deletion src/partners/kyber/config/currenciesETH.json

Large diffs are not rendered by default.

Loading