Merge branch 'develop' into bug/top-nav-issue

MyEtherWallet · Jan 4, 2019 · f4a7189 · f4a7189 · mew-bot · Jan 4, 2019
2 parents e2c34ed + b14d8a0
commit f4a7189
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### Bug
 
 - Hide header on getting start [#341](https://github.com/MyEtherWallet/MyEtherWallet/pull/341)
+- Only show security button on specific pages [#334](https://github.com/MyEtherWallet/MyEtherWallet/pull/334)
 - Fix/replace apple qr code [#323](https://github.com/MyEtherWallet/MyEtherWallet/pull/323)
 - Fix ENS resolver/error placement [#324](https://github.com/MyEtherWallet/MyEtherWallet/pull/324)
 - Fix header settings modal styles [#287](https://github.com/MyEtherWallet/MyEtherWallet/pull/287)
@@ -33,6 +34,8 @@
 
 ### Devop
 
+- Left align pricebar contents [#336](https://github.com/MyEtherWallet/MyEtherWallet/pull/336)
+- Adjust header size [#335](https://github.com/MyEtherWallet/MyEtherWallet/pull/335)
 - Fix #316, #317, #318, #319, #320, #321 [#322](https://github.com/MyEtherWallet/MyEtherWallet/pull/322)
 - Add RSK network [#291](https://github.com/MyEtherWallet/MyEtherWallet/pull/291)
 - Replace temporary notice to check if hardware wallet is attached to a final version [#309](https://github.com/MyEtherWallet/MyEtherWallet/pull/309)

diff --git a/src/containers/HeaderContainer/HeaderContainer.scss b/src/containers/HeaderContainer/HeaderContainer.scss
@@ -37,7 +37,7 @@
     box-shadow: 0 2px 13px $tiny-header-shadow-color;
 
     .header-container {
-      padding: 5px 0;
+      padding: 2.5px 0;
     }
   }
 

diff --git a/src/containers/HeaderContainer/HeaderContainer.vue b/src/containers/HeaderContainer/HeaderContainer.vue
@@ -14,7 +14,15 @@
       :class="isPageOnTop == false ? 'active' : ''"
       class="scrollup-container"
     >
-      <router-link to="/getting-started"><user-reminder-button /></router-link>
+      <router-link
+        v-show="
+          $route.fullPath === '/create-wallet' ||
+            $route.fullPath === '/access-my-wallet'
+        "
+        to="/getting-started"
+      >
+        <user-reminder-button />
+      </router-link>
       <scroll-up-button />
     </div>
     <div

diff --git a/src/layouts/AccessWalletLayout/components/PriceBar/PriceBar.scss b/src/layouts/AccessWalletLayout/components/PriceBar/PriceBar.scss
@@ -24,13 +24,12 @@
   }
 
   .percent-container {
-    align-items: center;
-    justify-content: space-around;
-    display: flex;
-    flex-direction: row;
-
     span {
       font-size: 10px;
     }
+
+    i {
+      margin-left: 5px;
+    }
   }
 }