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.

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

[AdminBundle] Cleanup and fix styling FOS Change Password form #386

Merged
merged 1 commit into from
May 4, 2015
Merged

[AdminBundle] Cleanup and fix styling FOS Change Password form #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 23 additions & 0 deletions src/Kunstmaan/AdminBundle/Resources/ui/scss/default-theme/general/_login.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,26 @@
bottom: 2rem;
transform: translateX(-50%);
}



/* FOS - User change password overwrites
========================================================================== */
.fos_user_change_password {

label {
@extend .label--lighter;
}

input[type="text"], input[type="password"] {
@extend .form-control;

margin-bottom: 1rem;
}

input[type="submit"] {
@extend .btn;
@extend .btn-primary;
@extend .btn-block;
}
}
6 changes: 4 additions & 2 deletions src/Kunstmaan/AdminBundle/Resources/views/Resetting/checkEmail.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
{% extends "FOSUserBundle::layout.html.twig" %}

{% block fos_user_content %}
<div class="alert fade in">
<a class="close" href="{{ path('fos_user_security_login') }}">×</a>
<div class="alert alert-success">
{{ 'We have sent you an email with a link to reset your password.' | trans }}
<a class="btn alert__action" href="{{ path('fos_user_security_login') }}">
<i class="fa fa-times"></i>
</a>
</div>
{% endblock %}
9 changes: 5 additions & 4 deletions src/Kunstmaan/AdminBundle/Resources/views/Resetting/passwordAlreadyRequested.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{% extends "FOSUserBundle::layout.html.twig" %}

{% block fos_user_content %}
<div class="alert fade in alert-error">
<a class="close" href="{{ path('fos_user_security_login') }}">×</a>
<strong>{{ 'form.error' | trans }}: </strong>
{{ 'The password for this user has already been requested.' |trans }}
<div class="alert alert-error">
<strong>{{ 'form.error' | trans }}:</strong> {{ 'The password for this user has already been requested.' |trans }}
<a class="btn alert__action" href="{{ path('fos_user_security_login') }}">
<i class="fa fa-times"></i>
</a>
</div>
{% endblock fos_user_content %}
4 changes: 2 additions & 2 deletions src/Kunstmaan/AdminBundle/Resources/views/Resetting/request_content.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

{% if invalid_username is defined %}
<div class="alert alert-error">
<strong>{{ 'form.error' | trans }}: </strong>
{{ 'The username or email address does not exist.' | trans }}
<button type="button" class="close" data-dismiss="alert">
<i class="fa fa-times"></i>
</button>
<strong>{{ 'form.error' | trans }}: </strong>
{{ 'The username or email address does not exist.' | trans }}
</div>
{% endif %}

Expand Down
4 changes: 2 additions & 2 deletions src/Kunstmaan/AdminBundle/Resources/views/layout.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
{% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
<div class="alert alert-warning">
<strong>{{ 'form.warning' | trans }}: </strong>
{{ 'layout.logged_in_as'|trans({'%username%': app.user.username}, 'FOSUserBundle') }} |
<a href="{{ path('fos_user_security_logout') }}" class="alert__action">
{{ 'layout.logged_in_as'|trans({'%username%': app.user.username}, 'FOSUserBundle') }}
<a href="{{ path('fos_user_security_logout') }}" class="btn btn-warning alert__action">
{{ 'layout.logout'|trans({}, 'FOSUserBundle') }}
</a>
</div>
Expand Down
2 changes: 0 additions & 2 deletions src/Kunstmaan/UserManagementBundle/Resources/views/Users/edit.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@
</div>

<!-- Fields -->


<fieldset class="form__fieldset--padded">
{% if tabPane is defined %}
{{ tabs_widget(tabPane) }}
Expand Down