Merge pull request #286 from MyDataTaiwan/fix-buttomUI

fix btn i18n 跑版
MyDataTaiwan · Sep 2, 2020 · 2b3d605 · 2b3d605
2 parents edf2d01 + be4f874
commit 2b3d605
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 6 deletions.
diff --git a/android/.idea/jarRepositories.xml b/android/.idea/jarRepositories.xml
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -7,7 +7,7 @@ android {
         applicationId "tw.mydata.mylog14"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 29
+        versionCode 30
         versionName "0.13.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }

diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
@@ -361,7 +361,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 30;
+				CURRENT_PROJECT_VERSION = 31;
 				DEVELOPMENT_TEAM = 42JPXVRNT4;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
@@ -382,7 +382,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 30;
+				CURRENT_PROJECT_VERSION = 31;
 				DEVELOPMENT_TEAM = 42JPXVRNT4;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;

diff --git a/src/app/shared/components/popover/popover.component.scss b/src/app/shared/components/popover/popover.component.scss
@@ -3,7 +3,16 @@ ion-content {
     margin-top: 50vh;
     padding: 10px;
 }
-
+ion-button{
+    width: 100%;
+    --padding-end	: 0;
+--padding-start	: 0;
+height: 95px;
+margin: 0;
+white-space: normal;
+word-break: break-all !important;
+word-wrap: break-word !important;
+}
 ion-grid {
     width: 100%;
     height: 100%;

diff --git a/src/app/shared/components/reward/reward.component.html b/src/app/shared/components/reward/reward.component.html
@@ -40,12 +40,12 @@
           <ion-label class="world" color="secondary" *ngIf="daysRecorded$ | async as daysRecorded">
             {{ 'description.logMoreDaysForReward' | translate: { days: 7 - daysRecorded } }}</ion-label>
         </ion-item>
-        <app-ion-center-item *ngIf="initReward === 'available'" button (click)="getInitialReward()">
+        <app-ion-center-item  class="world"  *ngIf="initReward === 'available'" button (click)="getInitialReward()">
           <ion-button fill="outline">{{ 'description.clickToGetInitialBalance' | translate: { point: 20 } }}
           </ion-button>
         </app-ion-center-item>
         <ion-item *ngIf="initReward === 'done'" class="ion-text-center">
-          <ion-icon name="checkmark-outline" color="success" slot="start"></ion-icon>
+          <ion-icon class="world"  name="checkmark-outline" color="success" slot="start"></ion-icon>
           <ion-label color="success">{{ 'description.alreadyGotInitialBalance' | translate: { point: 20 } }}
           </ion-label>
         </ion-item>

diff --git a/src/app/shared/components/reward/reward.component.scss b/src/app/shared/components/reward/reward.component.scss
@@ -6,4 +6,14 @@
     white-space: normal;
     word-break: break-all !important;
     word-wrap: break-word !important;
+}
+ion-button{
+    width: 100%;
+    --padding-end	: 0;
+--padding-start	: 0;
+height: 95px;
+margin: 0;
+white-space: normal;
+word-break: break-all !important;
+word-wrap: break-word !important;
 }