ydeng/props
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated styling.

Browse Source
This commit is contained in:
Harrison Deng
2021-07-24 14:47:40 -05:00
parent f31293d886
commit 5d8a4a3803
5 changed files with 120 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
Props/Areas/Identity/Pages/Account/Login.cshtml
View File

@@ -5,68 +5,69 @@
ViewData["Title"] = "Log in"; ViewData["Title"] = "Log in";
} }
<div class="flex-grow-1 d-flex flex-column justify-content-center py-3"> <div class="jumbotron text-center">
<div class="jumbotron d-flex flex-column align-content-center"> <img alt="Props logo" src="~/images/logo-simplified.svg" class="img-fluid" style="max-height: 150px;" asp-append-version="true" />
<img alt="Props logo" src="~/images/logo-simplified.svg" class="img-fluid" style="max-height: 180px;" asp-append-version="true" /> <h1 class="mt-3 mb-4 display-1">@ViewData["Title"]</h1>
<h1 class="mt-3 mb-4 text-center">@ViewData["Title"]</h1> <p>Welcome back!</p>
<div class="my-3 row justify-content-md-center"> </div>
<div class="col-md-4"> <div class="jumbotron sub flex-grow-1">
<form id="account" method="post"> <div class="py-4 row justify-content-md-center">
<h4>Use a local account to log in.</h4> <div class="col-md-4">
<hr /> <form id="account" method="post">
<div asp-validation-summary="All" class="text-danger"></div> <h4>Use a local account to log in.</h4>
<div class="mb-3"> <hr />
<label asp-for="Input.Email" class="form-label"></label> <div asp-validation-summary="All" class="text-danger"></div>
<input asp-for="Input.Email" class="form-control" /> <div class="mb-3">
<span asp-validation-for="Input.Email" class="text-danger"></span> <label asp-for="Input.Email" class="form-label"></label>
<input asp-for="Input.Email" class="form-control" />
<span asp-validation-for="Input.Email" class="text-danger"></span>
</div>
<div class="mb-3">
<label asp-for="Input.Password" class="form-label"></label>
<input asp-for="Input.Password" class="form-control" />
<span asp-validation-for="Input.Password" class="text-danger"></span>
</div>
<div class="mb-3">
<div class="form-check">
<input asp-for="Input.RememberMe" class="form-check-input" />
<label asp-for="Input.RememberMe" class="form-check-label">
@Html.DisplayNameFor(m => m.Input.RememberMe)
</label>
</div> </div>
<div class="mb-3"> </div>
<label asp-for="Input.Password" class="form-label"></label> <div class="mb-3">
<input asp-for="Input.Password" class="form-control" /> <button type="submit" class="btn btn-primary">Log in</button>
<span asp-validation-for="Input.Password" class="text-danger"></span> </div>
<div class="row">
<div class="col-lg">
<a class="link-secondary" id="forgot-password" asp-page="./ForgotPassword">Forgot your password?</a>
</div> </div>
<div class="mb-3"> <div class="col-lg">
<div class="form-check"> <a class="link-secondary" asp-page="./Register" asp-route-returnUrl="@Model.ReturnUrl">Register as a new user</a>
<input asp-for="Input.RememberMe" class="form-check-input" />
<label asp-for="Input.RememberMe" class="form-check-label">
@Html.DisplayNameFor(m => m.Input.RememberMe)
</label>
</div>
</div> </div>
<div class="mb-3"> <div class="col-lg">
<button type="submit" class="btn btn-primary">Log in</button> <a class="link-secondary" id="resend-confirmation" asp-page="./ResendEmailConfirmation">Resend email confirmation</a>
</div> </div>
</div>
</form>
</div>
@if ((Model.ExternalLogins?.Count ?? 0) != 0)
{
<div class="col-md-6 md-offset-2">
<h4>Use another service to log in.</h4>
<hr />
<form id="external-account" asp-page="./ExternalLogin" asp-route-returnUrl="@Model.ReturnUrl" method="post" class="form-horizontal">
<div> <div>
<div class="my-1"> <p>
<a class="link-secondary" id="forgot-password" asp-page="./ForgotPassword">Forgot your password?</a> @foreach (var provider in Model.ExternalLogins)
</div> {
<div class="my-1"> <button type="submit" class="btn btn-primary" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@provider.DisplayName</button>
<a class="link-secondary" asp-page="./Register" asp-route-returnUrl="@Model.ReturnUrl">Register as a new user</a> }
</div> </p>
<div class="my-1">
<a class="link-secondary" id="resend-confirmation" asp-page="./ResendEmailConfirmation">Resend email confirmation</a>
</div>
</div> </div>
</form> </form>
</div> </div>
@if ((Model.ExternalLogins?.Count ?? 0) != 0) }
{
<div class="col-md-6 md-offset-2">
<h4>Use another service to log in.</h4>
<hr />
<form id="external-account" asp-page="./ExternalLogin" asp-route-returnUrl="@Model.ReturnUrl" method="post" class="form-horizontal">
<div>
<p>
@foreach (var provider in Model.ExternalLogins)
{
<button type="submit" class="btn btn-primary" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@provider.DisplayName</button>
}
</p>
</div>
</form>
</div>
}
</div>
</div> </div>
</div> </div>

88
Props/Areas/Identity/Pages/Account/Register.cshtml
View File

@@ -3,53 +3,53 @@
@{ @{
ViewData["Title"] = "Register"; ViewData["Title"] = "Register";
} }
<div class="jumbotron text-center">
<div class="flex-grow-1 d-flex flex-column justify-content-center py-3"> <img alt="Props logo" src="~/images/logo-simplified.svg" class="img-fluid" style="max-height: 150px;" asp-append-version="true" />
<div class="jumbotron d-flex flex-column align-content-center"> <h1 class="mt-3 mb-4 display-1">@ViewData["Title"]</h1>
<img alt="Props logo" src="~/images/logo-simplified.svg" class="img-fluid" style="max-height: 180px;" asp-append-version="true" /> <p>Create more projects and access them across your devices! Join the community and show off your projects to the world!</p>
<h1 class="mt-3 mb-4 text-center display-2">@ViewData["Title"]</h1> </div>
<div class="my-3 row justify-content-md-center"> <div class="jumbotron sub flex-grow-1">
<div class="col-md-4"> <div class="py-3 row justify-content-md-center">
<form asp-route-returnUrl="@Model.ReturnUrl" method="post"> <div class="col-md-4">
<h4>Create a new account.</h4> <form asp-route-returnUrl="@Model.ReturnUrl" method="post">
<hr /> <h4>Create a new account.</h4>
<div asp-validation-summary="All" class="text-danger"></div> <hr />
<div class="mb-3"> <div asp-validation-summary="All" class="text-danger"></div>
<label asp-for="Input.Email" class="form-label"></label> <div class="mb-3">
<input asp-for="Input.Email" class="form-control" /> <label asp-for="Input.Email" class="form-label"></label>
<span asp-validation-for="Input.Email" class="text-danger"></span> <input asp-for="Input.Email" class="form-control" />
<span asp-validation-for="Input.Email" class="text-danger"></span>
</div>
<div class="mb-3">
<label asp-for="Input.Password" class="form-label"></label>
<input asp-for="Input.Password" class="form-control" />
<span asp-validation-for="Input.Password" class="text-danger"></span>
</div>
<div class="mb-3">
<label asp-for="Input.ConfirmPassword" class="form-label"></label>
<input asp-for="Input.ConfirmPassword" class="form-control" />
<span asp-validation-for="Input.ConfirmPassword" class="text-danger"></span>
</div>
<button type="submit" class="btn btn-primary">Register</button>
</form>
</div>
@if ((Model.ExternalLogins?.Count ?? 0) != 0)
{
<div class="col-md-6 md-offset-2">
<h4>Use another service to register.</h4>
<hr />
<form id="external-account" asp-page="./ExternalLogin" asp-route-returnUrl="@Model.ReturnUrl" method="post" class="form-horizontal">
<div>
<p>
@foreach (var provider in Model.ExternalLogins)
{
<button type="submit" class="btn btn-primary" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@provider.DisplayName</button>
}
</p>
</div> </div>
<div class="mb-3">
<label asp-for="Input.Password" class="form-label"></label>
<input asp-for="Input.Password" class="form-control" />
<span asp-validation-for="Input.Password" class="text-danger"></span>
</div>
<div class="mb-3">
<label asp-for="Input.ConfirmPassword" class="form-label"></label>
<input asp-for="Input.ConfirmPassword" class="form-control" />
<span asp-validation-for="Input.ConfirmPassword" class="text-danger"></span>
</div>
<button type="submit" class="btn btn-primary">Register</button>
</form> </form>
</div> </div>
@if ((Model.ExternalLogins?.Count ?? 0) != 0) }
{
<div class="col-md-6 md-offset-2">
<h4>Use another service to register.</h4>
<hr />
<form id="external-account" asp-page="./ExternalLogin" asp-route-returnUrl="@Model.ReturnUrl" method="post" class="form-horizontal">
<div>
<p>
@foreach (var provider in Model.ExternalLogins)
{
<button type="submit" class="btn btn-primary" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@provider.DisplayName</button>
}
</p>
</div>
</form>
</div>
}
</div>
</div> </div>
</div> </div>

14
Props/Pages/Search.cshtml
View File

@@ -4,25 +4,25 @@
ViewData["Specific"] = "Search"; ViewData["Specific"] = "Search";
} }
<div class="container"> <div>
<div class="my-4 less-concise mx-auto"> <div class="my-4 less-concise mx-auto">
<div class="input-group"> <div class="input-group">
<input type="text" class="form-control" placeholder="What are you looking for?" aria-label="Search" aria-describedby="search-btn" id="search-bar"> <input type="text" class="form-control bg-transparent border-primary" placeholder="What are you looking for?" aria-label="Search" aria-describedby="search-btn" id="search-bar">
<button class="btn btn-outline-secondary" type="button" id="configuration-toggle" data-bs-toggle="collapse" data-bs-target="#configuration"><i class="bi bi-sliders"></i></button> <button class="btn btn-outline-secondary" type="button" id="configuration-toggle" data-bs-toggle="collapse" data-bs-target="#configuration"><i class="bi bi-sliders"></i></button>
<button class="btn btn-outline-primary" type="button" id="search-btn">Search</button> <button class="btn btn-outline-primary" type="button" id="search-btn">Search</button>
</div> </div>
</div> </div>
</div> </div>
<div class="collapse" id="configuration"> <div class="collapse tear" id="configuration">
<div class="tear"> <div class="p-3">
<div class="container invisible"> <div class="container invisible">
<div class="d-flex"> <div class="d-flex">
<h1 class="my-2 display-2 me-auto">Configuration</h1> <h1 class="my-2 display-2 me-auto">Configuration</h1>
<button class="btn align-self-start" type="button" id="configuration-close" data-bs-toggle="collapse" data-bs-target="#configuration"><i class="bi bi-x-lg"></i></button> <button class="btn align-self-start" type="button" id="configuration-close" data-bs-toggle="collapse" data-bs-target="#configuration"><i class="bi bi-x-lg"></i></button>
</div> </div>
<div class="row justify-content-md-center"> <div class="row justify-content-md-center">
<section class="col-lg"> <section class="col-lg px-4">
<h3>Price</h3> <h3>Price</h3>
<div class="mb-3"> <div class="mb-3">
<label for="max-price" class="form-label">Maximum Price</label> <label for="max-price" class="form-label">Maximum Price</label>
@@ -61,7 +61,7 @@
</div> </div>
</div> </div>
</section> </section>
<section class="col-lg"> <section class="col-lg px-4">
<h3>Metrics</h3> <h3>Metrics</h3>
<div class="mb-3"> <div class="mb-3">
<label for="min-purchases" class="form-label">Minimum Purchases</label> <label for="min-purchases" class="form-label">Minimum Purchases</label>
@@ -101,7 +101,7 @@
</div> </div>
</div> </div>
</section> </section>
<section class="col-md"> <section class="col-lg px-4">
<h3>Shops Enabled</h3> <h3>Shops Enabled</h3>
<div class="mb-3 px-3" id="shop-checkboxes"> <div class="mb-3 px-3" id="shop-checkboxes">
</div> </div>

14
Props/assets/styles/_variables.scss
View File

@@ -1,12 +1,14 @@
$themes: ( $themes: (
"light": ( "light": (
"background": #f4f4f4, "background": #ebf0ef,
"navbar": #FFF8F8, "navbar": #E6F4F1,
"main": #BDF2D5, "navbar-link": #005780,
"navbar-active": #001f2e,
"main": #B4EEFF,
"footer": #F2F2F2, "footer": #F2F2F2,
"sub": #F4FCFC, "sub": #EEFBFF,
"bold": #647b9b, "text": #1A1A1A,
"text": #1A1A1A, "special": #00A2EF,
"muted": #797a7e, "muted": #797a7e,
), ),
); );

10
Props/assets/styles/site-wide.scss
View File

@@ -12,12 +12,15 @@ header > nav {
.nav-link, .navbar-brand { .nav-link, .navbar-brand {
@include themer.themed { @include themer.themed {
color: themer.color-of("bold"); color: themer.color-of("navbar-link");
} }
&.active { &.active {
@include themer.themed { @include themer.themed {
color: themer.color-of("text"); color: themer.color-of("navbar-active");
border-color: themer.color-of("navbar-active");
} }
border-bottom-style: solid;
border-bottom-width: 1px;
} }
} }
@@ -34,7 +37,6 @@ main {
flex-direction: column; flex-direction: column;
.tear { .tear {
@extend .p-3;
border-top: 1px; border-top: 1px;
border-top-style: solid; border-top-style: solid;
border-bottom: 1px; border-bottom: 1px;
@@ -92,7 +94,7 @@ footer {
hr.concise { hr.concise {
@extend .my-3; @extend .my-3;
@include themer.themed { @include themer.themed {
color: themer.color-of("bold"); color: themer.color-of("special");
} }
width: 15%; width: 15%;
max-width: 160px; max-width: 160px;