Skip to content

Resetpassword design #323

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Mar 23, 2017
Merged

Resetpassword design #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4e9df9
Fixed #322
Mar 22, 2017
f84b471
Fixed #322
Mar 22, 2017
9bb47d0
Merge branch 'resetpasswordDesign' of https://github.com/Promact/oaut…
Mar 22, 2017
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Promact.Oauth.Server/src/Promact.Oauth.Server/Views/Account/Login.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
<div class="auth-content login-form">
@if (@ViewData["ReturnError"] != null)
{
<span class="text-danger error">@ViewData["ReturnError"]</span>
<p class="error-invalid">@ViewData["ReturnError"]</p>
}
<form asp-controller="Account" asp-action="Login" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post" class="form-horizontal">
@*<div asp-validation-summary="All" class="text-danger"></div>*@
<div class="form-group">
@*<label asp-for="Email"></label>*@
<div>
<input asp-for="Email" class="form-control" placeholder="Email"/>
<input asp-for="Email" class="form-control" placeholder="Email" />
<span asp-validation-for="Email" class="text-danger error"></span>
</div>
</div>
Expand Down
33 changes: 25 additions & 8 deletions Promact.Oauth.Server/src/Promact.Oauth.Server/Views/Account/ResetPasswordConfirmation.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,25 @@
@{
ViewData["Title"] = "Reset password confirmation";
}

<h1>@ViewData["Title"].</h1>
<p>
Your password has been reset. Please <a asp-controller="Account" asp-action="Login">Click here to log in</a>.
</p>
<head>
<base href="/">

<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="~/css/app-seagreen.css" rel="stylesheet" />
<link href="//fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">


</head>

<body class="reset-body">
<div class="reset-container">
<div class="reset-content">
@{
ViewData["Title"] = "Reset password confirmation";
}

<h1>@ViewData["Title"].</h1>
<p>
Your password has been reset. Please <a asp-controller="Account" asp-action="Login">Click here </a>to log in.
</p>
</div>
</div>
</body>
14 changes: 10 additions & 4 deletions Promact.Oauth.Server/src/Promact.Oauth.Server/wwwroot/css/app-seagreen.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,11 @@ ul{margin:0;padding:0;}
.align-left{float:left;display:inline-block}
.error{color:rgb(221,44,0);font-size: 13px;line-height: 14px;overflow: hidden;-webkit-transition: all .3s cubic-bezier(.55,0,.55,.2);transition: all .3s cubic-bezier(.55,0,.55,.2);opacity: 1;margin-top: 0;margin-bottom:2px;}
.in_block{display:inline-block;}
.alert-msg{color: #31708f;background-color: #d9edf7;border-color: #bce8f1;padding: 10px;border-radius: 4px;border: 1px solid #bce8f1;}
.alert-msg p { margin: 0;}
.btn-green{background-color:#4bcf99 !important;color:#fff !important;}
.auth {position: absolute;width: 100%;height: 100%;left: 0;background-color: #667380;overflow-x: hidden;overflow-y: auto;}
.auth-container {width: 450px;min-height: 330px;position: absolute;top: 50%;left: 50%;-webkit-transform: translateY(-50%) translateX(-50%);transform: translateY(-50%) translateX(-50%);}
.auth-container .auth-content {padding: 30px 60px;min-height: 260px;text-align:center}
.auth-container .auth-header {text-align: center;border-bottom: 1px solid #4bcf99 ;}
.auth-container .auth-header {text-align: center;border-bottom: 1px solid #ddd ;}
.auth-container .auth-title {color: #97A4B1;padding: 20px;line-height: 30px;font-size: 26px;font-weight: 300;margin: 0;}
.card {background-color: #fff;box-shadow: 1px 1px 5px rgba(126, 142, 159, 0.1);margin-bottom: 10px;border-radius: 0;border:none;}
.custom-btn{min-width: 83px !important;line-height: 33px !important;}
Expand All @@ -55,7 +53,8 @@ ul{margin:0;padding:0;}
.login-form input{width:260px;border:none;font-size: 16px;line-height: 1.7;color: #55595c;border-bottom:0.5px solid rgba(0, 0, 0, 0.38);padding: 5px;}
.login-form input:focus{ outline:none; }
.login-form .btn {padding: 10px 12px;font-size:20px;font-family: roboto-regular;border-radius:2px;width:275px;color: #ffffff;background-color: #4bcf99 ;border-color: #4bcf99 ;outline:none; margin-top: 15px;border-style: none;cursor: pointer; box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);transition: background 400ms cubic-bezier(0.25, 0.8, 0.25, 1), box-shadow 280ms cubic-bezier(0.4, 0, 0.2, 1);transform: translate3d(0, 0, 0);}
.login-form .form-group span.error{display:block;color:#FF4444;text-align:left;font-size:14px;}
.login-form .error-invalid{color:rgb(221,44,0);font-size:16px;margin-top:0;}
.login-form .form-group span.error{display:block;color:rgb(221,44,0);text-align:left;font-size:14px;padding: 4px 0px 3px 5px;position:absolute;}
.login-form .link{color:#969696;text-decoration:none;}
.login-form .link:hover{color:#33be85}
.rp-content{padding:25px 30px;}
Expand Down Expand Up @@ -170,6 +169,13 @@ md2-select:focus .md2-select-container ,md2-multiselect:focus .md2-multiselect-c
.list-group-item label{font-size:15px;}
.app-container .confirm-btn{width:136px;margin-right: 20px;padding: 8px 12px;font-size: 15px;font-family: roboto-regular;border-radius: 2px;color: #ffffff;background-color: #4bcf99;border-color: #4bcf99;outline: none;margin-top: 15px;border-style: none;cursor: pointer;box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);transition: background 400ms cubic-bezier(0.25, 0.8, 0.25, 1), box-shadow 280ms cubic-bezier(0.4, 0, 0.2, 1);transform: translate3d(0, 0, 0);}
.app-container .cancel-btn{padding: 8px 12px;font-size: 15px;font-family: roboto-regular;border-radius: 2px;color: rgb(33,33,33);background-color: rgb(250,250,250);border-color: #4bcf99;outline: none;margin-top: 15px;border-style: none;cursor: pointer;box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);transition: background 400ms cubic-bezier(0.25, 0.8, 0.25, 1), box-shadow 280ms cubic-bezier(0.4, 0, 0.2, 1);transform: translate3d(0, 0, 0);}


.reset-body{height: 100%;background-color: #667380;}
.reset-container{text-align:center;}
.reset-container .reset-content{background-color:#F7F7F7; margin: 70px auto;width: 50%;padding: 32px 20px;border-radius:4px;}
.reset-container .reset-content h1{margin-top:0;font-size:29px;}
.reset-container .reset-content a{color: #4bcf99;text-decoration: none;}
@keyframes rotate {
from {
transform: rotate(0deg);
Expand Down