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

[AdminBundle] New login styling #2888

Merged
merged 6 commits into from
Jul 25, 2021
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\PasswordType;
use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\FormBuilderInterface;

final class NewPasswordType extends AbstractType
Expand All @@ -23,10 +22,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
'second_options' => [
'label' => 'settings.user.repeatedpassword',
],
'attr' => [
'autocomplete' => 'new-password',
],
])
->add('submit', SubmitType::class, [
'label' => 'security.resetting.reset',
'attr' => ['class' => 'btn btn-primary btn--raise-on-hover'],
]);
;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace Kunstmaan\AdminBundle\Form\Authentication;

use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;

Expand All @@ -13,12 +12,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
->add('email', TextType::class, [
'label' => 'settings.user.email',
'attr' => ['class' => 'form-control form-group--icon-in-control__form-control'],
'label' => 'security.resetting.email',
'required' => true,
])
->add('submit', SubmitType::class, [
'label' => 'settings.user.password',
'attr' => ['class' => 'btn btn-primary btn--raise-on-hover'],
]);
;
}
}
15,181 changes: 15,152 additions & 29 deletions src/Kunstmaan/AdminBundle/Resources/public/css/style.css

Large diffs are not rendered by default.

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

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3,268 changes: 3,265 additions & 3 deletions src/Kunstmaan/AdminBundle/Resources/public/js/admin-bundle.next.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

13 changes: 12 additions & 1 deletion src/Kunstmaan/AdminBundle/Resources/translations/messages.en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ pages:
movingconfirmation: You are moving "%title%" to "%target%", are you sure?

security:
general:
logged_in_as: 'Logged in as %username%'
logout: 'Logout'
login:
title: 'Log in to %websitetitle%'
username: Username
password: Password
submit: Submit
Expand All @@ -19,6 +23,12 @@ security:
resetting:
mail:
subject: 'Password reset'
content:
description: If you lost your password or wish to reset it,<br />use the link below to get started
footer: If you did not request a password reset, you can safely ignore this email. Only a person with access to your email can reset your account password.
link: Reset your password
powered_by: Powered by
title: Password reset
send_email_success: 'An email has been sent to your address'
user_not_found: 'User not found'
password_set_success: 'Your password has been changed.'
Expand All @@ -31,7 +41,8 @@ security:
new_password_confirmation: 'Repeat new password'
submit: 'Change password'
success:
flash: 'The password for "%username%" has been changed.'
continue: Login
message: 'The password for "%username%" has been changed.'

# Modules
modules:
Expand Down
10 changes: 10 additions & 0 deletions src/Kunstmaan/AdminBundle/Resources/translations/messages.nl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,11 @@ toolbar:
title: Exceptions
message: "<strong>%X%</strong> exception(s) veroorzaakt door <strong>%Y%</strong> events"
security:
general:
logged_in_as: 'Ingelogd als %username%'
logout: 'Uitloggen'
login:
title: 'Log in op %websitetitle%'
username: Gebruikersnaam
password: Wachtwoord
submit: Inloggen
Expand All @@ -143,6 +147,12 @@ security:
resetting:
mail:
subject: 'Wachtwoord vergeten'
content:
title: 'Wachtwoord vergeten'
description: 'Klik op de link hieronder om uw wachtwoord opnieuw in te stellen.'
link: 'Wachtwoord instellen'
footer: 'Als u geen nieuw wachtwoord heeft aangevraagd, dan mag u deze email negeren.'
powered_by: 'Powered by'
send_email_success: 'Een email is verzonden naar jouw emailadres'
user_not_found: 'Gebruiker niet gevonden.'
password_set_success: 'Uw wachtwoord is aangepast.'
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,6 @@
--color-error: #FA1A57;
--color-disabled: #2E2B29;
--color-text: #2E2B29;
--highlight-color-bg: #01A1E6;
--highlight-color-fg: var(--color-greyscale-000);
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@
Never add styles directly to this file
========================================================================== */

// @import "...";
@import "forms/all";
@import "buttons";
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
/* ==========================================================================
Buttons
========================================================================== */

.btn {
padding: 0;

background: none;
box-shadow: none;

border-radius: 3px;
border: none;

line-height: 1;

transition: $snip-ease-sine-in-out background-color .3s, $snip-ease-sine-in-out color .3s;

&:hover,
&:focus {
outline: none;
}
}

.btn--primary {
background-color: var(--highlight-color-bg);

color: var(--highlight-color-fg);

&:hover,
&:focus {
background-color: var(--color-kuma-primary);

color: var(--highlight-color-fg);
}
}

.btn--secondary {
background-color: var(--color-kuma-primary);

color: var(--color-greyscale-500);

&:hover,
&:focus {
background-color: var(--color-kuma-secondary-2);

color: var(--highlight-color-fg);
}
}

.btn--inverted {
background-color: var(--color-greyscale-500);

color: var(--color-kuma-primary);

&:hover,
&:focus {
background-color: var(--color-greyscale-400);

color: var(--color-kuma-primary);
}
}

.btn--inverted-grey {
background-color: var(--color-greyscale-500);

color: var(--color-greyscale-100);

&:hover,
&:focus {
background-color: var(--color-greyscale-400);

color: var(--color-greyscale-000);
}
}

.btn--lg {
padding: 25px 40px;

font-size: 18px;
}

.btn--md {
padding: 1em 25px;

font-size: 15px;
}

.btn--sm {
padding: 10px 15px;

font-size: 14px;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/* ==========================================================================
Forms
========================================================================== */

@import "form-group";
@import "form-control";
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/* ==========================================================================
form control
========================================================================== */


.form-control {
width: 100%;
max-width: 380px;
height: 55px;
padding: 17px;


outline: none;
border: 2px solid transparent;
border-radius: 3px;


&:focus,
&:active {
box-shadow: inset 0 1px 3px rgba(#2E2B29, .5);

border-color: var(--color-kuma-secondary-1);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/* ==========================================================================
form group
========================================================================== */
.form-group--icon-in-control {
.form-control {
padding-left: 3rem;
}
}

.form-group--icon-in-control__icon {
top: 4.4rem;
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
========================================================================== */

// @import "...";
@import "login";
Loading