Merge branch 'master' of https://gitlab.taipay.com.tw/jasonwai/tokenvaultmanagement

Merchant Token Vault Management/backstage/Views/Home/Index.cshtml

@@ -5,6 +5,7 @@
 }
 
 <div class="page-header">
+	<h3 class="page-title">@Localizer["Statistic"]</h3>
 	<input id="msg" hidden value="@TempData["msg"]" />
 	@if (TempData["isSuccess"] != null)
 	{
@@ -12,9 +13,9 @@
 	}
 	<div class="floating-msg" id="msgDiv"></div>
 </div>
-<div class="page-header">
+@*<div class="page-header">
 	<h3 class="page-title">@Localizer["Statistic"]</h3>
-</div>
+</div>*@
 
 <div class="row">
 	<div class="col-lg-4 col-md-6 grid-margin stretch-card dashboard-card">

Merchant Token Vault Management/backstage/Views/Key/ListKeys.cshtml

@@ -56,7 +56,7 @@
 					</div>
 				</div>
 				<div class="newBlock">
-					<button type="button" class="btn btn-mainblue-solid float-right disabledClass" data-toggle="modal" data-target="#newApp"><img src="~/images/memberGo/apiKey/newapp-w-300ppi.png">@Localizer["Create key"]</button>
+					<button type="button" class="btn btn-info btn-mainblue-solid0 float-right disabledClass mb-3" data-toggle="modal" data-target="#newApp">@*<img src="~/images/memberGo/apiKey/newapp-w-300ppi.png">*@@Localizer["Create key"]</button>
 
 					<div class="table-responsive">
 						<!--交易紀錄列表 table-->

Merchant Token Vault Management/backstage/Views/Shared/_Layout.cshtml

@@ -213,7 +213,7 @@
 				<li class="nav-item">
 					<a class="nav-link" href="@Url.Action("ListKeys", "Key")">
 						<span class="menu-title">@Localizer["Keys"]</span>
-						<i class="mdi mdi-bank menu-icon"></i>
+						<i class="mdi mdi-key menu-icon"></i>
 					</a>
 				</li>
 

Merchant Token Vault Management/backstage/Views/TokenVault/List.cshtml

@@ -34,16 +34,16 @@
 				</div>
 
 				<div class="row justify-content-center">
-					<div class="col-12 col-md-10 no-padding rank-space">
+					<div class="col-12 col-md-12 no-padding0 rank-space">
 
 						<div class="row justify-content-between">
 							<div class="col-md-auto">
-								<select id="selectDepartmentList" class="form-control margin-right margin-top" asp-items="ViewBag.DepartmentsList">
+								<select id="selectDepartmentList" class="form-control margin-right0 margin-top0 mb-1" asp-items="ViewBag.DepartmentsList">
 									<option value=""> @Localizer["Choose department"]</option>
 								</select>
 							</div>
 							<div class="col-md-auto">
-								<a type="button" class="btn btn-info float-right mb-2 @disabledClass" asp-action="CreateTokenVault"> @Localizer["Create Token Vault"]</a>
+								<a type="button" class="btn btn-info float-right mb-200 @disabledClass" asp-action="CreateTokenVault"> @Localizer["Create Token Vault"]</a>
 							</div>
 						</div>
 						<div class="row">

Merchant Token Vault Management/backstage/Views/TokenVault/ListFields.cshtml

@@ -41,7 +41,7 @@
 			margin-right: 30px; /* 根据需要调整间距大小 */
 		}
 	</style>
-}}
+}
 <div class="page-header">
 	<h3 class="page-title">@Localizer["Field List Management"]</h3>
 	<input id="msg" hidden value="@TempData["msg"]" />
@@ -90,7 +90,7 @@
 						</div>
 					</div>
 					<div style="float: right;">
-						<a type="button" class="btn btn-info float-right mb-2 @disabledClass" data-toggle="modal" data-target="#myModal">@Localizer["Create"]</a>
+						<a type="button" class="btn btn-info btn-textW float-right mb-2 @disabledClass" data-toggle="modal" data-target="#myModal">@Localizer["Create"]</a>
 					</div>
 				</div>
 

Merchant Token Vault Management/backstage/Views/TokenVault/ListMasks.cshtml

@@ -71,7 +71,7 @@
 				</table>
 				<div class="newBlock">
 					@*<button type="button" class="btn btn-mainblue-hollow" onclick="window.location.href='tokenVault_fields.html'"><img src="images/memberGo/apiKey/back_o_icons8-undo-90.png">返回</button>*@
-					<button id="NewMaskBtn" type="button" class="btn btn-mainblue-solid @disabledClass" data-toggle="modal" data-target="#new-field-mask"><img src="~/images/memberGo/add.png">@Localizer["Add mask"]</button>
+					<button id="NewMaskBtn" type="button" class="btn btn-info btn-mainblue-solid0 btn-sm0 @disabledClass" data-toggle="modal" data-target="#new-field-mask">@*<img src="~/images/memberGo/add.png">*@@Localizer["Add mask"]</button>
 				</div>
 
 				<div class="table-responsive">

Merchant Token Vault Management/backstage/Views/TokenVault/ListUsers.cshtml

@@ -47,7 +47,7 @@
 
 				<div>
 
-					<a type="button" id="open_modal" class="btn btn-info float-right mb-2 @disabledClass" data-toggle="modal" data-target="#new-field-user">@Localizer["Add User"]</a>
+					<a type="button" id="open_modal" class="btn btn-info float-right mb-3 btn-textW @disabledClass" data-toggle="modal" data-target="#new-field-user">@Localizer["Add User"]</a>
 					<div class="rank-table">
 						<div class="table-responsive">
 							<table class="table table-striped ">
@@ -271,8 +271,8 @@
 					</div>
 
 					<div class="SubmitBlock">
-						<button id="createUserBtn" class="btn btn-mainblue-solid btnSubmit">@Localizer["Send out"]</button>
-						<button type="button" class="btn btn-mainblue-hollow btnReset" data-dismiss="modal">@Localizer["Cancel"]</button>
+						<button id="createUserBtn" class="btn btn-mainblue-solid btnSubmit0">@Localizer["Send out"]</button>
+						<button type="button" class="btn btn-mainblue-hollow btnReset0" data-dismiss="modal">@Localizer["Cancel"]</button>
 					</div>
 				</form>
 			</div> <!--END of div "modal-body"-->

Merchant Token Vault Management/backstage/Views/TokenVault/Permission.cshtml

@@ -17,7 +17,7 @@
 		}
 	</style>
 
-}}
+}
 <div class="page-header">
 	<h3 class="page-title">@Localizer["Permission Management"]</h3>
 	<input id="msg" hidden value="@TempData["msg"]" />
@@ -66,7 +66,7 @@
 							</div>
 						</div>
 						<div class="newBlock newPerm" style="float: right;">
-							<button type="button" class="btn btn-mainblue-solid" data-toggle="collapse" data-target="#newPermission"><img src="~/images/memberGo/permission/userRights-4-white-100.png">@Localizer["Create user permission"]</button>
+							<button type="button" class="btn btn-info btn-mainblue-solid0  btn-sm0" data-toggle="collapse" data-target="#newPermission">@*<img src="~/images/memberGo/permission/userRights-4-white-100.png">*@@Localizer["Create user permission"]</button>
 						</div> <!--end fo newBlock-->
 
 					</div>

Merchant Token Vault Management/backstage/Views/User/ListDepartments.cshtml

@@ -19,7 +19,7 @@
 	<div class="col-lg-12 grid-margin stretch-card">
 		<div class="card">
 			<div class="card-body">
-				<a type="button" class="btn btn-info float-right mb-2 @disabledClass" asp-action="CreateDepartment">@Localizer["Create"]</a>
+				<a type="button" class="btn btn-info float-right mb-3 @disabledClass" asp-action="CreateDepartment">@Localizer["Create"]</a>
 
 				@*列表*@
 				<div class="">

Merchant Token Vault Management/backstage/Views/User/ListUsers.cshtml

@@ -30,7 +30,7 @@
 		<div class="card">
 			<div class="card-body">
 				<div id="adminStatus" style="float: left;">@Localizer["User count"]:@ViewBag.userCount / @Localizer["Admin count"]:@ViewBag.adminCount </div>
-				<a type="button" class="btn btn-info float-right mb-2 @disabledClass" asp-action="CreateUser">@Localizer["Create"]</a>
+				<a type="button" class="btn btn-info float-right mb-3 @disabledClass" asp-action="CreateUser">@Localizer["Create"]</a>
 
 				@*列表*@
 				<div class="table-responsive">

Merchant Token Vault Management/backstage/wwwroot/css/settings.css

@@ -52,12 +52,17 @@
     color: #007bff;
 }
 
+.btn-textW{
+    color: #fff !important;
+}
+
+
 
 /* uX CSS */
 .modal-full {
     height: 100vh;
     margin: 0;
-    top: 0!important;
+    top: 0 !important;
 }
 
 

Merchant Token Vault Management/backstage/wwwroot/css/tokenizationPlatform.css

@@ -1316,8 +1316,8 @@ footer .conta {
 *---------------------*/
 .breadcrumb_memberGo{
 	background-color: #fff !important;
-	margin-top: 20px !important; /*edit at 11.22*/
-	/* margin-bottom: 50px !important; */
+	/*margin-top: 20px !important;*/ 
+	 margin-bottom: 40px !important; 
 	padding-left: 0px !important;
 	padding-right: 0px !important;
 	padding-top: 0px !important;
@@ -1349,9 +1349,11 @@ footer .conta {
 
 /* select
 *---------------------*/
-.selectpicker-tokenization + .dropdown-toggle{
+.selectpicker-tokenization + .dropdown-toggle {
 	border: 1px solid #ccc;
-    background-color: #eaf0f2;
+	background-color: #eaf0f2;
+	padding: 8px;
+	font-weight: normal;
 }
 
 
@@ -2088,7 +2090,7 @@ input:checked + .slider:before {
 }
 
 #newPermission{
-	margin: 0px 10px 0px 10px;
+	/*margin: 0px 10px 0px 10px;*/
 }
 
 #newPermission .dropdown-menu{
@@ -2799,7 +2801,7 @@ TBL_keysList tbody td {
 *------------------------------------------------*/
 
 .newBlock{
-	padding: 0px 10px 20px 0px;
+	padding: 0px 0px 20px 0px;
 	text-align: right;
 }
 
@@ -4009,6 +4011,18 @@ TBL_keysList tbody td {
 }
 
 
+#new-field-user .form-check-inline {
+	display: inline-flex !important;
+	margin-top: 0px;
+}
+#new-field-user .form-check-inline .form-check-label {
+	margin-bottom: 0px !important;
+	margin-left: 0px !important;
+	margin-right: 10px !important;
+}
+#new-field-user .control-labe {
+	margin-right: 20px !important;
+}