fixing indent, fix checkout page opacity

This commit is contained in:
nicolas.dorier
2017-10-27 17:37:15 +09:00
parent e7a931e9ba
commit 27a2e614a5
3 changed files with 73 additions and 73 deletions

View File

@@ -18,7 +18,7 @@ namespace BTCPayServer
{ {
public static string WithTrailingSlash(this string str) public static string WithTrailingSlash(this string str)
{ {
if (str.EndsWith("/")) if(str.EndsWith("/"))
return str; return str;
return str + "/"; return str + "/";
} }
@@ -44,7 +44,7 @@ namespace BTCPayServer
public static BitIdentity GetBitIdentity(this Controller controller, bool throws = true) public static BitIdentity GetBitIdentity(this Controller controller, bool throws = true)
{ {
if (!(controller.User.Identity is BitIdentity)) if(!(controller.User.Identity is BitIdentity))
return throws ? throw new UnauthorizedAccessException("no-bitid") : (BitIdentity)null; return throws ? throw new UnauthorizedAccessException("no-bitid") : (BitIdentity)null;
return (BitIdentity)controller.User.Identity; return (BitIdentity)controller.User.Identity;
} }

View File

@@ -161,7 +161,7 @@
</div> </div>
</div> </div>
<div adjust-height="" class="payment-box"> <div adjust-height="" class="payment-box">
<div class="bp-view payment scan" id="scan" style="opacity: 1;"> <div class="bp-view payment scan" id="scan">
<div class="payment__scan"> <div class="payment__scan">
<qrcode :val="srvModel.btcAddress" :size="256" bg-color="#f5f5f7" fg-color="#000" /> <qrcode :val="srvModel.btcAddress" :size="256" bg-color="#f5f5f7" fg-color="#000" />
</div> </div>

View File

@@ -37,7 +37,7 @@
<body id="page-top"> <body id="page-top">
@{ @{
if (ViewBag.AlwaysShrinkNavBar == null) if(ViewBag.AlwaysShrinkNavBar == null)
{ {
ViewBag.AlwaysShrinkNavBar = true; ViewBag.AlwaysShrinkNavBar = true;
} }
@@ -53,12 +53,12 @@
</button> </button>
<div class="collapse navbar-collapse" id="navbarResponsive"> <div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav ml-auto"> <ul class="navbar-nav ml-auto">
@if (SignInManager.IsSignedIn(User)) @if(SignInManager.IsSignedIn(User))
{ {
@if (User.IsInRole(Roles.ServerAdmin)) @if(User.IsInRole(Roles.ServerAdmin))
{ {
<li class="nav-item"><a asp-area="" asp-controller="Server" asp-action="ListUsers" class="nav-link js-scroll-trigger">Server settings</a></li> <li class="nav-item"><a asp-area="" asp-controller="Server" asp-action="ListUsers" class="nav-link js-scroll-trigger">Server settings</a></li>
} }
<li class="nav-item"><a asp-area="" asp-controller="Stores" asp-action="ListStores" class="nav-link js-scroll-trigger">Stores</a></li> <li class="nav-item"><a asp-area="" asp-controller="Stores" asp-action="ListStores" class="nav-link js-scroll-trigger">Stores</a></li>
<li class="nav-item"><a asp-area="" asp-controller="Invoice" asp-action="ListInvoices" class="nav-link js-scroll-trigger">Invoices</a></li> <li class="nav-item"><a asp-area="" asp-controller="Invoice" asp-action="ListInvoices" class="nav-link js-scroll-trigger">Invoices</a></li>
<li class="nav-item"> <li class="nav-item">