Merge pull request #4634 from MetaMask/i4503-touch-up-shpshft-button-style

Fix style of shapeshift screen in deposit modal.
feature/default_network_editable
Thomas Huang 7 years ago committed by GitHub
commit 218f2e84db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      ui/app/components/shapeshift-form.js
  2. 31
      ui/app/css/itcss/components/modal.scss

@ -181,7 +181,7 @@ ShapeshiftForm.prototype.render = function () {
return h('div.shapeshift-form-wrapper', [ return h('div.shapeshift-form-wrapper', [
showQrCode showQrCode
? this.renderQrCode() ? this.renderQrCode()
: h('div.shapeshift-form', [ : h('div.modal-shapeshift-form', [
h('div.shapeshift-form__selectors', [ h('div.shapeshift-form__selectors', [
h('div.shapeshift-form__selector', [ h('div.shapeshift-form__selector', [

@ -642,10 +642,31 @@
display: flex; display: flex;
flex-flow: column nowrap; flex-flow: column nowrap;
flex: 1; flex: 1;
align-items: center;
@media screen and (max-width: 575px) { @media screen and (max-width: 575px) {
height: 0; height: 0;
} }
.shapeshift-form-wrapper {
display: flex;
flex-flow: column;
justify-content: center;
align-items: center;
flex: 1 0 auto;
.shapeshift-form, .modal-shapeshift-form {
border-radius: 8px;
background-color: rgba(0, 0, 0, .05);
padding: 17px 15px;
margin-bottom: 10px;
&__caret {
width: auto;
flex: 1;
}
}
}
} }
&__logo { &__logo {
@ -773,17 +794,15 @@
margin-top: 28px; margin-top: 28px;
flex: 1 0 auto; flex: 1 0 auto;
.shapeshift-form { .shapeshift-form, .modal-shapeshift-form {
width: auto; border-radius: 8px;
background-color: rgba(0, 0, 0, .05);
padding: 17px 15px;
&__caret { &__caret {
width: auto; width: auto;
flex: 1; flex: 1;
} }
@media screen and (max-width: 575px) {
width: auto;
}
} }
} }

Loading…
Cancel
Save