Merge remote-tracking branch 'origin/master' into nick

Merchant Token Vault Management/backstage/Resources/Views/TokenVault/ListMasks.zh.resx

@@ -141,6 +141,9 @@
   <data name="Are you sure you want to delete the mask?" xml:space="preserve">
     <value>是否確定要刪除遮罩?</value>
   </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>取消</value>
+  </data>
   <data name="Choose department" xml:space="preserve">
     <value>選擇部門</value>
   </data>

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

@@ -262,14 +262,12 @@
 							</div>
 
 							<div class="form-group">
-								<label class="control-label" for=""></label>
-								<div class="form-check form-check-inline">
-									<label class="form-check-label" for="uniqueY">
-										@Localizer["啟用"]
-									</label>
+								@*<label class="control-label" for=""></label>*@
+								@*<div class="form-check form-check-inline">*@
+							<label class="form-check-label label-space" for="uniqueY">@Localizer["啟用"]</label>
 									<input class="form-check-input" type="checkbox" id="is_enable" name="active" value="1">
 
-								</div>
+								@*</div>*@
 
 							</div>
 

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

@@ -4042,8 +4042,13 @@ TBL_keysList tbody td {
 	display: block !important;
 }
 
-
-
+#recoverKeyForm.show {
+	display: block !important;
+}
+.label-space {
+	margin-right: 30px;
+	line-height: 1.5 !important;
+}