Skip to content

Commit

Permalink
Changed login page buttons colors and navbar fonts
Browse files Browse the repository at this point in the history
  • Loading branch information
nwrxi committed Nov 1, 2020
1 parent 2c277ec commit a69df57
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 17 deletions.
4 changes: 2 additions & 2 deletions SginalRChatTest/Areas/Identity/Pages/Account/Login.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<span asp-validation-for="Input.Password" class="text-danger"></span>
</div>

<div class="form-group custom-control custom-checkbox mb-3">
<div class="form-group custom-control custom-checkbox mb-3 font-roboto">
<input class="custom-control-input" asp-for="Input.RememberMe">
<label class="custom-control-label" asp-for="Input.RememberMe"> @Html.DisplayNameFor(m => m.Input.RememberMe)</label>
</div>
Expand All @@ -42,7 +42,7 @@
<a class="btn btn-lg btn-primary btn-block text-uppercase button-signup" asp-page="./Register" asp-route-returnUrl="@Model.ReturnUrl">Register</a>
</p>
<p>
<a id="forgot-password" asp-page="./ForgotPassword">Forgot your password?</a>
<a class="font-roboto" id="forgot-password" asp-page="./ForgotPassword">Forgot your password?</a>
</p>
</div>
@* <hr class="my-4">*@
Expand Down
4 changes: 3 additions & 1 deletion SginalRChatTest/Pages/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>@ViewData["Title"] - SginalRChatroom</title>
<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300&display=swap" rel="stylesheet">
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
<link rel="stylesheet" href="~/css/site.css" />
<link rel="stylesheet" href="~/css/navbar.css" />
Expand All @@ -17,7 +18,8 @@
</main>
</div>

<footer class="border-top footer text-muted" style="background: linear-gradient(270deg, lavenderblush, #FAF3E5, #F3FAE5)">
<footer class="border-top footer text-muted" style="background: linear-gradient(270deg, lavenderblush, #FAF3E5, #F3FAE5); font-family: 'Roboto', sans-serif;
)">
<div class="container" style="color: #9370db">
&copy; 2020 - SginalRChatroom @*- <a asp-area="" asp-page="/Privacy">Privacy</a>*@
</div>
Expand Down
4 changes: 2 additions & 2 deletions SginalRChatTest/Pages/Shared/_NavBar.cshtml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<nav class="navbar navbar-dark navbar-expand-md" id="app-navbar">
<nav class="navbar navbar-dark navbar-expand-md" id="app-navbar" style="font-family: 'Roboto', sans-serif;">
<div class="container-fluid">
<a class="navbar-brand" asp-area="" asp-page="/Index">
<i class="far fa-comments" id="brand-logo" style="color: #9370db"></i>
Expand All @@ -8,7 +8,7 @@
<span class="navbar-toggler-icon" style="color: #9370db"></span>
</button>
<div class="collapse navbar-collapse" id="navcol-1">
<ul class="nav navbar-nav ml-auto">
<ul class="nav navbar-nav ml-auto" >
<li class="nav-item" role="presentation"><a class="nav-link active" asp-area="" asp-page="/Index"><span style="color: #9370db; font-size: large;">Home</span></a></li>
<li class="nav-item" role="presentation"><a class="nav-link" asp-area="" asp-page="/Privacy"><span style="color: #9370db; font-size: large;">Privacy</span></a></li>
<li class="nav-item" role="presentation"><a class="nav-link" asp-area="" asp-page="/About"><span style="color: #9370db; font-size: large;">About</span></a></li>
Expand Down
1 change: 1 addition & 0 deletions SginalRChatTest/wwwroot/css/NavBar.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
}

#app-navbar {
font-family: 'Roboto', sans-serif;
background: linear-gradient(90deg, lavenderblush, #FAF3E5, #FAFAE6)
}

Expand Down
24 changes: 14 additions & 10 deletions SginalRChatTest/wwwroot/css/login.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@ body {
}

.button-signin, .button-signin:visited {
background: #9370db !important;
border-color: #9370db !important;
background: #bcbcf2 !important;
border-color: #bcbcf2 !important;
}

.button-signin:hover, .button-signin:active{
background: #7559af !important;
border-color: #7559af !important;
.button-signin:hover, .button-signin:active {
background: #a9a9d9 !important;
border-color: #a9a9d9 !important;
}

.button-signup, .button-signup:visited {
background: #b8db70 !important;
border-color: #b8db70 !important;
background: #91e9e9 !important;
border-color: #91e9e9 !important;
}

.button-signup:hover, .button-signup:active{
background: #93af59 !important;
border-color: #b8db70 !important;
.button-signup:hover, .button-signup:active {
background: #82d1d1 !important;
border-color: #82d1d1 !important;
}


Expand Down Expand Up @@ -117,6 +117,10 @@ body {
color: white;
}

.font-roboto {
font-family: 'Roboto', sans-serif;
}

/* Fallback for Edge
-------------------------------------------------- */

Expand Down
4 changes: 2 additions & 2 deletions SginalRChatTest/wwwroot/css/site.css
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ html {
}

body {
/* Margin bottom by footer height */
margin-bottom: 60px;
/* Margin bottom by footer height */
margin-bottom: 60px;
}
.footer {
position: absolute;
Expand Down

0 comments on commit a69df57

Please sign in to comment.