Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed bootstrap cdn to 4.0.0, changed views to use updated classes.… #51

Merged
merged 2 commits into from
Oct 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion TodoList.Web/Views/Account/ExternalLogin.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<input asp-for="Email" class="form-control" />
<span asp-validation-for="Email" class="text-danger"></span>
</div>
<button type="submit" class="btn btn-default">Register</button>
<button type="submit" class="btn btn-secondary">Register</button>
</form>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion TodoList.Web/Views/Account/ForgotPassword.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<input asp-for="Email" class="form-control" />
<span asp-validation-for="Email" class="text-danger"></span>
</div>
<button type="submit" class="btn btn-default">Submit</button>
<button type="submit" class="btn btn-btn-secondary">Submit</button>
</form>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion TodoList.Web/Views/Account/Login.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<p>
@foreach (var provider in loginProviders)
{
<button type="submit" class="btn btn-default" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@provider.Name</button>
<button type="submit" class="btn btn-secondary" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@provider.Name</button>
}
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion TodoList.Web/Views/Account/LoginWith2fa.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</div>
</div>
<div class="form-group">
<button type="submit" class="btn btn-default">Log in</button>
<button type="submit" class="btn btn-secondary">Log in</button>
</div>
</form>
</div>
Expand Down
2 changes: 1 addition & 1 deletion TodoList.Web/Views/Account/LoginWithRecoveryCode.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<input asp-for="RecoveryCode" class="form-control" autocomplete="off" />
<span asp-validation-for="RecoveryCode" class="text-danger"></span>
</div>
<button type="submit" class="btn btn-default">Log in</button>
<button type="submit" class="btn btn-secondary">Log in</button>
</form>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion TodoList.Web/Views/Account/ResetPassword.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<input asp-for="ConfirmPassword" class="form-control" />
<span asp-validation-for="ConfirmPassword" class="text-danger"></span>
</div>
<button type="submit" class="btn btn-default">Reset</button>
<button type="submit" class="btn btn-secondary">Reset</button>
</form>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion TodoList.Web/Views/Home/Index.cshtml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<h2>TodoList</h2>
<h2 >TodoList</h2>

<h3>A simple but powerful web application to manage to-dos.</h3>
<ul>
Expand Down
2 changes: 1 addition & 1 deletion TodoList.Web/Views/Manage/ChangePassword.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<input asp-for="ConfirmPassword" class="form-control" />
<span asp-validation-for="ConfirmPassword" class="text-danger"></span>
</div>
<button type="submit" class="btn btn-default">Update password</button>
<button type="submit" class="btn btn-secondary">Update password</button>
</form>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion TodoList.Web/Views/Manage/EnableAuthenticator.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<input asp-for="Code" class="form-control" autocomplete="off" />
<span asp-validation-for="Code" class="text-danger"></span>
</div>
<button type="submit" class="btn btn-default">Verify</button>
<button type="submit" class="btn btn-secondary">Verify</button>
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
</form>
</div>
Expand Down
4 changes: 2 additions & 2 deletions TodoList.Web/Views/Manage/ExternalLogins.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<div>
<input asp-for="@login.LoginProvider" name="LoginProvider" type="hidden" />
<input asp-for="@login.ProviderKey" name="ProviderKey" type="hidden" />
<button type="submit" class="btn btn-default" title="Remove this @login.LoginProvider login from your account">Remove</button>
<button type="submit" class="btn btn-secondary" title="Remove this @login.LoginProvider login from your account">Remove</button>
</div>
</form>
}
Expand All @@ -45,7 +45,7 @@
<p>
@foreach (var provider in Model.OtherLogins)
{
<button type="submit" class="btn btn-default" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@provider.DisplayName</button>
<button type="submit" class="btn btn-secondary" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@provider.DisplayName</button>
}
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion TodoList.Web/Views/Manage/Index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<input asp-for="PhoneNumber" class="form-control" />
<span asp-validation-for="PhoneNumber" class="text-danger"></span>
</div>
<button type="submit" class="btn btn-default">Save</button>
<button type="submit" class="btn btn-secondary">Save</button>
</form>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion TodoList.Web/Views/Manage/SetPassword.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<input asp-for="ConfirmPassword" class="form-control" />
<span asp-validation-for="ConfirmPassword" class="text-danger"></span>
</div>
<button type="submit" class="btn btn-default">Set password</button>
<button type="submit" class="btn btn-secondary">Set password</button>
</form>
</div>
</div>
Expand Down
10 changes: 5 additions & 5 deletions TodoList.Web/Views/Manage/TwoFactorAuthentication.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@
</div>
}

<a asp-action="Disable2faWarning" class="btn btn-default">Disable 2FA</a>
<a asp-action="GenerateRecoveryCodesWarning" class="btn btn-default">Reset recovery codes</a>
<a asp-action="Disable2faWarning" class="btn btn-secondary">Disable 2FA</a>
<a asp-action="GenerateRecoveryCodesWarning" class="btn btn-secondary">Reset recovery codes</a>
}

<h5>Authenticator app</h5>
@if (!Model.HasAuthenticator)
{
<a asp-action="EnableAuthenticator" class="btn btn-default">Add authenticator app</a>
<a asp-action="EnableAuthenticator" class="btn btn-secondary">Add authenticator app</a>
}
else
{
<a asp-action="EnableAuthenticator" class="btn btn-default">Configure authenticator app</a>
<a asp-action="ResetAuthenticatorWarning" class="btn btn-default">Reset authenticator key</a>
<a asp-action="EnableAuthenticator" class="btn btn-secondary">Configure authenticator app</a>
<a asp-action="ResetAuthenticatorWarning" class="btn btn-secondary">Reset authenticator key</a>
}

@section Scripts {
Expand Down
11 changes: 6 additions & 5 deletions TodoList.Web/Views/Shared/_CookieConsentPartial.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,25 @@

@if (showBanner)
{
<nav id="cookieConsent" class="navbar navbar-default navbar-fixed-bottom" role="alert">
<nav id="cookieConsent" class="navbar navbar-expand-lg navbar-light bg-light fixed-bottom" role="alert">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#cookieConsent .navbar-collapse">
<button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#cookieConsent .navbar-collapse">
<span class="sr-only">Toggle cookie consent banner</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<span class="navbar-brand"><span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span></span>
<!--glyphicon not supported in bootstrap 4-->
<!--<span class="navbar-brand"><span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span></span>-->
</div>
<div class="collapse navbar-collapse">
<p class="navbar-text">
Use this space to summarize your privacy and cookie use policy.
</p>
<div class="navbar-right">
<div class="ml-auto">
<a asp-page="/Privacy" class="btn btn-info navbar-btn">Learn More</a>
<button type="button" class="btn btn-default navbar-btn" data-cookie-string="@cookieString">Accept</button>
<button type="button" class="btn btn-secondary navbar-btn" data-cookie-string="@cookieString">Accept</button>
</div>
</div>
</div>
Expand Down
12 changes: 6 additions & 6 deletions TodoList.Web/Views/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
<link rel="stylesheet" href="~/css/site.css" />
</environment>*@
<environment include="Development">
<link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/css/bootstrap.min.css"
<link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/4.0.0/css/bootstrap.min.css"
asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
<link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
</environment>
</head>
<body>
<nav class="navbar navbar-inverse navbar-fixed-top">
<nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<button type="button" class="navbar-toggler" data-toggle="collapse" data-target=".navbar-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
Expand All @@ -30,9 +30,9 @@
</div>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li><a asp-area="" asp-controller="Home" asp-action="Index">Home</a></li>
<li><a asp-area="" asp-controller="Home" asp-action="About">About</a></li>
<li><a asp-area="" asp-controller="Home" asp-action="Contact">Contact</a></li>
<li class="nav-item"><a asp-area="" asp-controller="Home" asp-action="Index" class="nav-link">Home</a></li>
<li class="nav-item"><a asp-area="" asp-controller="Home" asp-action="About" class="nav-link">About</a></li>
<li class="nav-item"><a asp-area="" asp-controller="Home" asp-action="Contact" class="nav-link">Contact</a></li>
</ul>
@await Html.PartialAsync("_LoginPartial")
@await Html.PartialAsync("_AdminActionsPartial")
Expand Down
18 changes: 9 additions & 9 deletions TodoList.Web/Views/Shared/_LoginPartial.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@
@if (SignInManager.IsSignedIn(User))
{
<form asp-area="" asp-controller="Account" asp-action="Logout" method="post" id="logoutForm" class="navbar-right">
<ul class="nav navbar-nav navbar-right">
<li>
<a asp-area="" asp-controller="Todos" asp-action="Index">My todos</a>
<ul class="nav navbar-nav ml-auto">
<li class="nav-item">
<a asp-area="" asp-controller="Todos" asp-action="Index" class="nav-link">My todos</a>
</li>
<li>
<a asp-area="" asp-controller="Manage" asp-action="Index" title="Manage">
<li class="nav-item">
<a asp-area="" asp-controller="Manage" asp-action="Index" title="Manage" class="nav-link">
<img gravatar-email="@UserManager.GetUserName(User)" gravatar-size="20" title="Hello @UserManager.GetUserName(User)" />

</a>
</li>
<li>
<li class="nav-item">
<button type="submit" class="btn btn-link navbar-btn navbar-link">Log out</button>
</li>
</ul>
</form>
}
else
{
<ul class="nav navbar-nav navbar-right">
<li><a asp-area="" asp-controller="Account" asp-action="Register">Register</a></li>
<li><a asp-area="" asp-controller="Account" asp-action="Login">Log in</a></li>
<ul class="nav navbar-nav ml-auto">
<li class="nav-item"><a asp-area="" asp-controller="Account" asp-action="Register" class="nav-link">Register</a></li>
<li class="nav-item"><a asp-area="" asp-controller="Account" asp-action="Login" class="nav-link">Log in</a></li>
</ul>
}
2 changes: 1 addition & 1 deletion TodoList.Web/Views/Todos/Create.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<!--TODO: Updated UI needed for this.-->
</div>
<div class="form-group">
<input type="submit" value="Create" class="btn btn-default" />
<input type="submit" value="Create" class="btn btn-secondary" />
</div>
</form>
</div>
Expand Down
2 changes: 1 addition & 1 deletion TodoList.Web/Views/Todos/Edit.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<span asp-validation-for="Tags" class="text-danger"></span>
</div>
<div class="form-group">
<input type="submit" value="Save" class="btn btn-default" />
<input type="submit" value="Save" class="btn btn-secondary" />
</div>
</form>
<div class="row">
Expand Down
4 changes: 2 additions & 2 deletions TodoList.Web/Views/Todos/Home.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
}
</td>
<td>
<a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-default">Edit</a>
<a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
<a asp-action="Details" asp-route-id="@item.Id" class="btn btn-info">Details</a>
<a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
</td>
Expand Down Expand Up @@ -128,7 +128,7 @@
}
</td>
<td>
<a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-default">Edit</a>
<a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
<a asp-action="Details" asp-route-id="@item.Id" class="btn btn-info">Details</a>
<a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
</td>
Expand Down
2 changes: 1 addition & 1 deletion TodoList.Web/Views/Todos/Index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
}
</td>
<td>
<a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-default">Edit</a>
<a asp-action="Edit" asp-route-id="@item.Id" class="btn btn-secondary">Edit</a>
<a asp-action="Details" asp-route-id="@item.Id" class="btn btn-info">Details</a>
<a asp-action="Delete" asp-route-id="@item.Id" class="btn btn-danger">Delete</a>
</td>
Expand Down
1 change: 1 addition & 0 deletions TodoList.Web/wwwroot/css/site.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
.body-content {
padding-left: 15px;
padding-right: 15px;
padding-bottom: 20px;
}

/* Carousel */
Expand Down
2 changes: 1 addition & 1 deletion TodoList.Web/wwwroot/css/site.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.