diff --git a/app/javascript/dashboard/assets/scss/widgets/_login.scss b/app/javascript/dashboard/assets/scss/widgets/_login.scss index 8deaef1f8..dddf1d7af 100644 --- a/app/javascript/dashboard/assets/scss/widgets/_login.scss +++ b/app/javascript/dashboard/assets/scss/widgets/_login.scss @@ -1,68 +1,97 @@ -.auth-wrap { - width: 100%; +.auth--wrap { + display: flex; + justify-content: center; } -// Outside login wrapper -.login { - @include full-height; - overflow-y: auto; - padding-top: $space-larger * 1.2; +.flex-divided-view { + display: flex; + justify-content: center; + align-items: center; + flex: 1; +} - .login__hero { - margin-bottom: $space-larger; +.form--wrap { + padding: 0 var(--space-mega); +} - .hero__logo { - width: 180px; - } +.auth--footer { + margin-top: var(--space-three); + margin-bottom: var(--space-two); + font-size: var(--font-size-small); + font-weight: var(--font-weight-medium); +} - .hero__title { - font-weight: $font-weight-light; - margin-top: $space-larger; - } - - .hero__sub { - color: $medium-gray; - font-size: $font-size-medium; - } +@media screen and (max-width: 1200px) { + .flex-divided-view { + display: flex; + justify-content: center; + flex: 0.9; } - // Login box - .login-box { - @include background-white; - @include border-normal; - @include border-top-radius($space-smaller); - @include border-right-radius($space-smaller); - @include border-bottom-radius($space-smaller); - @include border-left-radius($space-smaller); - @include elegant-card; - padding: $space-large; - - label { - color: $color-gray; - font-size: $font-size-default; - - input { - font-size: $font-size-default; - height: $space-larger; - padding: $space-slab; - } - - .error { - font-size: $font-size-small; - } - } - - .button { - height: $space-larger; - } - } - - .sigin__footer { - font-size: $font-size-default; - padding: $space-medium; - - >a { - font-weight: $font-weight-bold; - } + .form--wrap { + padding: 0 var(--space-two); } } +// .login { +// @include full-height; +// overflow-y: auto; +// padding-top: $space-larger * 1.2; + +// .login__hero { +// margin-bottom: $space-larger; + +// .hero__logo { +// width: 180px; +// } + +// .hero__title { +// font-weight: $font-weight-light; +// margin-top: $space-larger; +// } + +// .hero__sub { +// color: $medium-gray; +// font-size: $font-size-medium; +// } +// } + +// Login box +// .login-box { +// // @include background-white; +// // @include border-normal; +// // @include border-top-radius($space-smaller); +// // @include border-right-radius($space-smaller); +// // @include border-bottom-radius($space-smaller); +// // @include border-left-radius($space-smaller); +// // @include elegant-card; +// // padding: $space-large; + +// label { +// color: $color-gray; +// font-size: $font-size-default; + +// input { +// font-size: $font-size-default; +// height: $space-larger; +// padding: $space-slab; +// } + +// .error { +// font-size: $font-size-small; +// } +// } + +// .button { +// height: $space-larger; +// } +// } + +// .sigin__footer { +// font-size: $font-size-default; +// padding: $space-medium; + +// > a { +// font-weight: $font-weight-bold; +// } +// } +// } diff --git a/app/javascript/dashboard/i18n/locale/en/login.json b/app/javascript/dashboard/i18n/locale/en/login.json index 30f667052..b3bc8693e 100644 --- a/app/javascript/dashboard/i18n/locale/en/login.json +++ b/app/javascript/dashboard/i18n/locale/en/login.json @@ -1,6 +1,7 @@ { "LOGIN": { "TITLE": "Login to Chatwoot", + "DESCRIPTION": "login to your chatwoot account", "EMAIL": { "LABEL": "Email", "PLACEHOLDER": "Email eg: someone@example.com" diff --git a/app/javascript/dashboard/i18n/locale/en/resetPassword.json b/app/javascript/dashboard/i18n/locale/en/resetPassword.json index bb678e809..60bab3d1c 100644 --- a/app/javascript/dashboard/i18n/locale/en/resetPassword.json +++ b/app/javascript/dashboard/i18n/locale/en/resetPassword.json @@ -1,6 +1,7 @@ { "RESET_PASSWORD": { "TITLE": "Reset Password", + "DESCRIPTION": "Enter your email address", "EMAIL": { "LABEL": "Email", "PLACEHOLDER": "Please enter your email", diff --git a/app/javascript/dashboard/i18n/locale/en/setNewPassword.json b/app/javascript/dashboard/i18n/locale/en/setNewPassword.json index 94a3fd2e1..f35fc2d3b 100644 --- a/app/javascript/dashboard/i18n/locale/en/setNewPassword.json +++ b/app/javascript/dashboard/i18n/locale/en/setNewPassword.json @@ -1,6 +1,7 @@ { "SET_NEW_PASSWORD": { "TITLE": "Set New Password", + "DESCRIPTION": "Enter your new password", "PASSWORD": { "LABEL": "Password", "PLACEHOLDER": "Password", diff --git a/app/javascript/dashboard/i18n/locale/en/signup.json b/app/javascript/dashboard/i18n/locale/en/signup.json index 6eaa5d646..581c92610 100644 --- a/app/javascript/dashboard/i18n/locale/en/signup.json +++ b/app/javascript/dashboard/i18n/locale/en/signup.json @@ -1,7 +1,7 @@ { "REGISTER": { - "TRY_WOOT": "Register an account", - "TITLE": "Register", + "TITLE": "Sign Up", + "TRY_WOOT": "Create your chatwoot account", "TERMS_ACCEPT": "By signing up, you agree to our T & C and Privacy policy", "ACCOUNT_NAME": { "LABEL": "Account name", diff --git a/app/javascript/dashboard/routes/auth/Auth.vue b/app/javascript/dashboard/routes/auth/Auth.vue index e829308fb..78547c462 100644 --- a/app/javascript/dashboard/routes/auth/Auth.vue +++ b/app/javascript/dashboard/routes/auth/Auth.vue @@ -1,5 +1,14 @@ + diff --git a/app/javascript/dashboard/routes/auth/Confirmation.vue b/app/javascript/dashboard/routes/auth/Confirmation.vue index 1abf16f1e..50379a552 100644 --- a/app/javascript/dashboard/routes/auth/Confirmation.vue +++ b/app/javascript/dashboard/routes/auth/Confirmation.vue @@ -1,5 +1,7 @@ + diff --git a/app/javascript/dashboard/routes/auth/ResetPassword.vue b/app/javascript/dashboard/routes/auth/ResetPassword.vue index e9eae00ab..ab9b797b8 100644 --- a/app/javascript/dashboard/routes/auth/ResetPassword.vue +++ b/app/javascript/dashboard/routes/auth/ResetPassword.vue @@ -1,37 +1,54 @@ + diff --git a/app/javascript/dashboard/routes/auth/Signup.vue b/app/javascript/dashboard/routes/auth/Signup.vue index 36b63662d..e1bc22af1 100644 --- a/app/javascript/dashboard/routes/auth/Signup.vue +++ b/app/javascript/dashboard/routes/auth/Signup.vue @@ -1,96 +1,97 @@