Merge remote-tracking branch 'origin/alice'

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

@@ -46,7 +46,7 @@
 				<a type="button" class="btn btn-info float-right mb-2 @disabledClass" id="CreateKey">@Localizer["Create key"]</a>
 				<div class="table-responsive">
 					<!--交易紀錄列表 table-->
-					<table class="table table-striped">
+					<table class="table table-striped TBL_keysList">
 						<thead>
 							<tr>
 								<th style=" border-left: solid 0.1px #d9d9d9;">@Localizer["Serial number"]</th>

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

@@ -219,8 +219,8 @@
 						</div>
 					</div>
 					<div class="SubmitBlock">
-						<button id="createMaskBtn" type="button" 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="createMaskBtn" type="button" 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"-->
@@ -240,7 +240,7 @@
 <!-- Modal -->
 
 <div class="modal fade " id="delete-field-mask" tabindex="-1" style=" padding-right: 17px;" aria-modal="true" role="dialog">
-	<div class="modal-dialog modal-sm modalforMemberGo">
+	<div class="modal-dialog modal-md modalforMemberGo">
 
 		<!-- Modal content-->
 		<div class="modal-content">
@@ -259,8 +259,8 @@
 					</p>
 
 					<div class="SubmitBlock SubmitBlock_sm">
-						<button type="button" id="delMaskConfirmBtn" class="btn btn-mainblue-solid" style="margin-right: 10px; width: 80px">	@Localizer["Confirm"]</button>
-						<button type="button" class="btn btn-mainblue-hollow" data-dismiss="modal" style="margin-right: 10px; width: 80px">	@Localizer["Cancel"]</button>
+						<button type="button" id="delMaskConfirmBtn" class="btn btn-mainblue-solid" style="">	@Localizer["Confirm"]</button>
+						<button type="button" class="btn btn-mainblue-hollow" data-dismiss="modal" style="">	@Localizer["Cancel"]</button>
 					</div>
 
 				</form>

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

@@ -23,7 +23,7 @@
 				<a type="button" class="btn btn-info float-right mb-2 @disabledClass" asp-action="CreateUser">@Localizer["Create"]</a>
 
 				@*列表*@
-				<div class="">
+				<div class="table-responsive">
 					<table class="table table-striped" style="display: none;">
 						<thead>
 							<tr>
@@ -126,7 +126,7 @@
 			offText: 'OFF',
 			onColor: 'success',
 			offColor: 'danger',
-			size: 'small',
+			size: 'mini',
 			onInit: function () {
 				// 初始化完成時的操作
 				// 例如顯示表格等
@@ -159,7 +159,7 @@
 			offText: 'OFF',
 			onColor: 'success',
 			offColor: 'danger',
-			size: 'small',
+			size: 'mini',
 			onInit: function () {
 				// 初始化完成時的操作
 				// 例如顯示表格等

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

@@ -58,4 +58,22 @@
     height: 100vh;
     margin: 0;
     top: 0!important;
-}
+}
\ No newline at end of file
+
+
+
+.bootstrap-switch.bootstrap-switch-mini .bootstrap-switch-handle-off,
+.bootstrap-switch.bootstrap-switch-mini .bootstrap-switch-handle-on,
+.bootstrap-switch.bootstrap-switch-mini .bootstrap-switch-label {
+    padding: 1px 5px !important;
+    font-size: 8px !important;
+    line-height: 1.5 !important;
+}
+
+.bootstrap-switch.bootstrap-switch-small .bootstrap-switch-handle-off,
+.bootstrap-switch.bootstrap-switch-small .bootstrap-switch-handle-on,
+.bootstrap-switch.bootstrap-switch-small .bootstrap-switch-label {
+    padding: 5px 10px !important;
+    font-size: 12px !important;
+    line-height: 1.5 !important;
+}

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

@@ -2289,7 +2289,7 @@ input:checked + .slider:before {
 }
 
 #memberGoTbl_masksList tbody td:nth-last-child(3) {
-	text-align: center;
+	text-align: left;
 	padding: 10px 10px 10px 10px;
 	border:solid 1px #d9d9d9;
 }
@@ -2300,11 +2300,11 @@ input:checked + .slider:before {
 	border:solid 1px #d9d9d9;
 }
 
-#memberGoTbl_masksList tbody td:nth-last-child(1) {
-	text-align: left;
-	padding: 10px 10px 10px 10px;
-	border:solid 1px #d9d9d9;
-}
+	#memberGoTbl_masksList tbody td:nth-last-child(1) {
+		text-align: center;
+		padding: 10px 10px 10px 10px;
+		border: solid 1px #d9d9d9;
+	}
 
 
 
@@ -2417,6 +2417,41 @@ input:checked + .slider:before {
 
 
 
+/*.TBL_keysList {
+	margin-bottom: 40px;
+	font-size: 0.96em;
+}
+.TBL_keysList a {
+	text-decoration: none;
+	color: #6e6e6e;
+}
+.TBL_keysList thead th {
+	text-align: center;
+}
+.TBL_keysList tbody th {
+	font-weight: bold;
+	text-align: center;
+}
+TBL_keysList tbody td {
+	padding: 10px 10px 10px 10px;
+	vertical-align: middle !important;
+	line-height: 130%;
+}
+.TBL_keysList tbody td:first-child {
+	text-align: center;
+}
+.TBL_keysList tbody td:nth-last-child(2) {
+	text-align: center !important;
+}
+.TBL_keysList tbody td:nth-last-child(1) {
+	text-align: center;
+}*/
+
+.TBL_keysList a {
+	color: #337ab7 !important;
+}
+
+