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

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

@@ -177,13 +177,11 @@
 					<div class="form-group">
 						<label class="control-labe" for="userName">種類：</label>
 						<div class="form-group">
-							<div class="dropdown bootstrap-select selecter form-control -tokenization">
-								<select title="請選遮罩種類(單選)" name="type" id="maskType" class="selectpicker selecter form-control selectpicker-tokenization" onchange="showMaskSettingsAdv()">
-									<option class="bs-title-option" value=""></option>
-									<option value="0">0</option>
-									<option value="1">1</option>
-								</select><button type="button" tabindex="-1" class="btn dropdown-toggle bs-placeholder btn-light" data-toggle="dropdown" role="combobox" aria-owns="bs-select-1" aria-haspopup="listbox" aria-expanded="false" title="請選遮罩種類(單選)" data-id="maskType"><div class="filter-option"><div class="filter-option-inner"><div class="filter-option-inner-inner">請選遮罩種類(單選)</div></div> </div></button><div class="dropdown-menu "><div class="inner show" role="listbox" id="bs-select-1" tabindex="-1"><ul class="dropdown-menu inner show" role="presentation"></ul></div></div>
-							</div>
+							<select title="請選遮罩種類(單選)" name="type" id="maskType" class="selectpicker selecter form-control selectpicker-tokenization" onchange="showMaskSettingsAdv()">
+								<option class="bs-title-option" value=""></option>
+								<option value="0">0</option>
+								<option value="1">1</option>
+							</select>
 						</div>
 					</div>
 
@@ -195,15 +193,13 @@
 							<div class="form-group">
 								<label class="control-labe" for="userName">mask：</label>
 								<div class="form-group">
-									<div class="dropdown bootstrap-select selecter form-control -tokenization">
-										<select id="mask" title="請選擇mask(單選)" name="mask" class="selectpicker selecter form-control selectpicker-tokenization">
-											<option class="bs-title-option" value=""></option>
-											<option>0</option>
-											<option>1</option>
-											<option>2</option>
-											<option>3</option>
-										</select><button type="button" tabindex="-1" class="btn dropdown-toggle bs-placeholder btn-light" data-toggle="dropdown" role="combobox" aria-owns="bs-select-2" aria-haspopup="listbox" aria-expanded="false" title="請選擇mask(單選)"><div class="filter-option"><div class="filter-option-inner"><div class="filter-option-inner-inner">請選擇mask(單選)</div></div> </div></button><div class="dropdown-menu "><div class="inner show" role="listbox" id="bs-select-2" tabindex="-1"><ul class="dropdown-menu inner show" role="presentation"></ul></div></div>
-									</div>
+									<select id="mask" title="請選擇mask(單選)" name="mask" class="selectpicker selecter form-control selectpicker-tokenization">
+										<option class="bs-title-option" value=""></option>
+										<option>0</option>
+										<option>1</option>
+										<option>2</option>
+										<option>3</option>
+									</select>
 								</div>
 							</div>
 							<div class="form-group">

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

@@ -44,7 +44,10 @@
                             <div class="brand-logo">
                                 <img src="~/images/LOGO_nsecured.svg">
                             </div>
-                            <h4 class="text-center">Tokenization Manager</h4>
+                            <div class="product-logo">
+                                <img src="~/images/logo-100.jpg">
+                            </div>
+                            @*<h4 class="text-center">Tokenization Manager</h4>*@
                             <input id="msg" hidden value="@TempData["msg"]" />
                             @if (TempData["isSuccess"] != null)
     {

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

@@ -17968,14 +17968,28 @@ dl {
     }
 
 .auth .brand-logo {
-    margin-bottom: 2rem;
-    text-align: center;
+    /*margin-bottom: 2rem;*/
+    /*text-align: center;*/
+    position: absolute;
+    top: 7px;
+    left: 37px;
 }
 
     .auth .brand-logo img {
-        width: 150px;
+        /*width: 150px;*/
+        width: 90px;
     }
 
+.auth .product-logo {
+    margin-top: 2.5rem;
+    margin-bottom: 1.5rem;
+    text-align: center;
+}
+
+.auth .product-logo img {
+    width: 200px;
+}
+
 .auth form .form-group {
     margin-bottom: 1.5rem;
 }