Merge sprint 19.

# Conflicts: # src/js/controllers/tab-home.js
2018-07-13 21:19:28 +12:00 · 2018-07-13 21:19:28 +12:00 · 0bb4de9bd1
commit 0bb4de9bd1
parent aed9657714 f4b4aaae27
49 changed files with 4115 additions and 3815 deletions
--- a/src/sass/views/includes/txp-details.scss
+++ b/src/sass/views/includes/txp-details.scss
@ -36,6 +36,11 @@
    .amount-label{
      line-height: 30px;
      .amount{
+        font-size: 16px;
+        color: #9B9B9B;
+        font-family: "Roboto-Light";
+      }
+      .alternative {
        font-size: 38px;
        margin-bottom: .5rem;

@ -43,11 +48,6 @@
          font-family: "Roboto-Light";
        }
      }
-      .alternative {
-        font-size: 16px;
-        font-family: "Roboto-Light";
-        color: #9B9B9B;
-      }
    }
  }
  .item {
--- a/src/sass/views/tab-home.scss
+++ b/src/sass/views/tab-home.scss
@ -59,6 +59,9 @@
      }
    }
    &-banner {
+      svg {
+        margin: 40px auto 40px;
+      }
      padding: 0;
      &__img {
        width: 100%;