Dapp fix

MyEtherWallet · Aug 13, 2018 · f4cca5a · f4cca5a · mew-bot · Aug 13, 2018
1 parent b53010c
commit f4cca5a
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 9 deletions.
diff --git a/src/layouts/CreateWalletLayout/CreateWalletLayout.scss b/src/layouts/CreateWalletLayout/CreateWalletLayout.scss
@@ -1,10 +1,23 @@
 @import '~@/scss/GlobalVariables';
 
+
+
 .wrap {
   background-color: $background-color-1;
   padding: 0;
 }
 
+.title-block {
+  margin-bottom: 40px;
+  display: flex;
+  .title-popover {
+    margin: 0 auto;
+    display: flex;
+    align-items: center;
+  }
+}
+
+
 .nav-tab-user-input-box {
   background-color: $background-color-white;
   margin: 0 auto;
@@ -24,9 +37,5 @@
     min-height: 500px;
     padding: 50px;
 
-    h3 {
-      margin-bottom: 40px;
-      text-align: center;
-    }
   }
 }
diff --git a/src/layouts/CreateWalletLayout/CreateWalletLayout.vue b/src/layouts/CreateWalletLayout/CreateWalletLayout.vue
@@ -8,11 +8,26 @@
           <b-tabs class="x100">
             <div class="progress-bar"></div>
             <b-tab title="By JSON File" active>
-              <h3>{{ $t("createWallet.yourPw") }}</h3>
+
+              <div class="title-block">
+                <div class="title-popover">
+                  <h3>{{ $t("createWallet.yourPw") }}</h3>
+                  <popover :popcontent="$t('popover.whatIsMessageContent')"/>
+                </div>
+              </div>
+
               <create-wallet-input v-model='password' :switcher="switcher" :param="'Json'"></create-wallet-input>
               <create-wallet-input-footer></create-wallet-input-footer>
             </b-tab>
             <b-tab title="By Mnemonic Phrase" >
+
+              <div class="title-block">
+                <div class="title-popover">
+                  <h3>{{ $t("createWallet.yourPw") }}</h3>
+                  <popover :popcontent="$t('popover.whatIsMessageContent')"/>
+                </div>
+              </div>
+
               <h3>{{ $t("createWallet.yourPw") }}</h3>
               <create-wallet-input v-model='password' :switcher="switcher" :param="'Mnemonic'"></create-wallet-input>
               <create-wallet-input-footer></create-wallet-input-footer>

diff --git a/src/layouts/CreateWalletLayout/components/CreateWalletInput/CreateWalletInput.scss b/src/layouts/CreateWalletLayout/components/CreateWalletInput/CreateWalletInput.scss
@@ -7,11 +7,12 @@
     background-color: $background-color-1;
     border: 0;
     font-size: 14px;
-    margin-bottom: 40px;
+    margin-bottom: 10px;
     padding: 20px;
     width: 100%;
   }
 
+
   .next-button {
     cursor: pointer;
     display: block;
@@ -20,14 +21,18 @@
     padding: 20px 0;
     text-align: center;
     width: 100%;
+    position: relative;
+    margin-top: 40px;
 
     &:disabled {
       background-color: $disabled;
     }
 
     img {
-      margin-left: 5px;
-      width: 20px;
+      position: absolute;
+      right: 20px;
+      top: 24px;
+      width: 25px;
     }
   }
 }

diff --git a/src/layouts/CreateWalletLayout/components/CreateWalletInput/CreateWalletInput.vue b/src/layouts/CreateWalletLayout/components/CreateWalletInput/CreateWalletInput.vue
@@ -1,7 +1,9 @@
 <template>
   <form class="user-input">
     <input type="password" name="password" placeholder="Please Enter At Least 9 Characters" v-bind:value="value" v-on:input="updateValue($event.target.value)" autocomplete="off" />
-    <p v-show="value.length > 0">Password strength: <span :class="strengthClass">{{ strength }}</span></p>
+    <p class="passwd-strength" v-show="value.length > 0">
+      Password strength: <span :class="strengthClass">{{ strength }}</span>
+    </p>
     <button class="next-button large-round-button-green-filled" type="submit" @click.prevent="switcher(param)" :disabled="value.length === 0 && value.length < 9 && strength === ''">
       {{ $t("common.next") }}<img src="~@/assets/images/icons/right-arrow.png">
     </button>

diff --git a/src/layouts/InterfaceLayout/containers/DomainSaleContainer/DomainSaleContainer.vue b/src/layouts/InterfaceLayout/containers/DomainSaleContainer/DomainSaleContainer.vue
@@ -22,6 +22,7 @@
       <div class="flex-container">
         <div class="title-container">
           <h4 class="modal-title">{{ $t('interface.domSaleBal') }}</h4>
+          <popover :popcontent="$t('popover.whatIsSpeedOfTX')"/>
           <div class="margin-left-auto add-custom-network">
             <div class="sliding-switch-white">
               <label class="switch">

diff --git a/src/layouts/InterfaceLayout/containers/SwapContainer/SwapContainer.scss b/src/layouts/InterfaceLayout/containers/SwapContainer/SwapContainer.scss
@@ -202,6 +202,14 @@
       margin: 0 auto;
       text-align: center;
       width: 300px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 20px;
+        top: 16px;
+        font-size: 30px;
+      }
     }
 
     p {

diff --git a/src/layouts/InterfaceLayout/containers/SwapContainer/SwapContainer.vue b/src/layouts/InterfaceLayout/containers/SwapContainer/SwapContainer.vue
@@ -80,6 +80,7 @@
       <h4>1 ETH = 0.000231 BTC</h4>
       <div class="submit-button large-round-button-green-filled clickable">
         {{ $t('common.continue') }}
+        <i class="fa fa-long-arrow-right" aria-hidden="true"></i>
       </div>
       <div class="buy-eth">
         <span>Buy ETH with</span>