Merge branch 'itou' into 'develop'

src/app/card-select/component/card-info/card-info.component.html → src/app/card-select/card-info/card-info.component.html

@@ -7,10 +7,10 @@
             <td style="width:75%;padding-top:10px;padding-left:10px;">
               <span>クレジットカード</span>
             </td>
-            <td style="padding-top:10px;">
+            <!-- td style="padding-top:10px;">
               <div class="common-link" (click)="onClickPass()">定期券</div>
-            </td>
-            <td style="padding-top:10px;">
+            </td -->
+            <td align="right" style="padding-top:10px;padding-right:10px;">
               <i class="bi bi-trash3" (click)="onClickTrash()"></i>
             </td>
           </tr>

src/app/card-select/card-select.module.ts

@@ -9,7 +9,7 @@ import { CardSelectPageRoutingModule } from './card-select-routing.module';
 import { CardSelectPage } from './card-select.page';
 
 import { HeaderComponent } from '../common/header/header.component';
-import { CardInfoComponent } from './component/card-info/card-info.component';
+import { CardInfoComponent } from './card-info/card-info.component';
 
 @NgModule({
   imports: [

src/app/menu/menu.page.html

@@ -6,7 +6,7 @@
   <ion-grid>
     <ion-row>
       <ion-col>
-        <input type="button" class="rounded menu-button" style="margin-top:20px;" value="クレジットカード選択"
+        <input type="button" class="rounded menu-button" style="margin-top:20px;" value="クレジットカード一覧"
           (click)="onClickCardSelect()" />
       </ion-col>
     </ion-row>