Merge

getcanoe · May 21, 2018 · 9753b2c · 9753b2c
2 parents 8c62e3a + 5418a21
commit 9753b2c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/config.xml b/config.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <widget android-versionCode="391009" id="io.getcanoe.canoe" ios-CFBundleVersion="0.9.10" version="0.9.10">
+>>>>>>> 5418a2161530b70ddee38a786c4faa6c5198ab5f
     <name>Canoe</name>
     <description>
       Canoe Nano Wallet

diff --git a/installapk.sh b/installapk.sh
@@ -1 +1 @@
-adb install -r platforms/android/app/build/outputs/apk/release/android-release-signed.apk
+adb install -r platforms/android/app/build/outputs/apk/release/app-release-signed.apk
diff --git a/src/sass/views/amount.scss b/src/sass/views/amount.scss
@@ -54,6 +54,9 @@
     .amount-bar {
       padding: 24px 0;
       font-size: 18px;
+      @media(max-height: 620px) {
+        padding: 6px 0;
+      }
       @media(max-height: 480px) {
         padding: 0px;
       }
@@ -195,6 +198,9 @@
       &--standard {
         font-size: 18px;
         padding: 10px 0;
+        @media(max-height: 620px){
+          display: none;
+        }
       }
       &--placeholder {
         color: $v-light-gray;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		adb install -r platforms/android/app/build/outputs/apk/release/android-release-signed.apk
		adb install -r platforms/android/app/build/outputs/apk/release/app-release-signed.apk