Add reset button to admin accounts search, improve looks a little (#3100)

This commit is contained in:
Eugen Rochko 2017-05-18 00:38:01 +02:00 committed by GitHub
parent 05008f3930
commit 226c9836e4
3 changed files with 14 additions and 5 deletions

View File

@ -159,9 +159,11 @@ code {
.actions { .actions {
margin-top: 30px; margin-top: 30px;
display: flex;
} }
button, button,
.button,
.block-button { .block-button {
display: block; display: block;
width: 100%; width: 100%;
@ -170,6 +172,8 @@ code {
background: $ui-highlight-color; background: $ui-highlight-color;
color: $primary-text-color; color: $primary-text-color;
font-size: 18px; font-size: 18px;
line-height: inherit;
height: auto;
padding: 10px; padding: 10px;
text-transform: uppercase; text-transform: uppercase;
text-decoration: none; text-decoration: none;
@ -179,6 +183,11 @@ code {
font-weight: 500; font-weight: 500;
outline: 0; outline: 0;
margin-bottom: 10px; margin-bottom: 10px;
margin-right: 10px;
&:last-child {
margin-right: 0;
}
&:hover { &:hover {
background-color: lighten($ui-highlight-color, 5%); background-color: lighten($ui-highlight-color, 5%);

View File

@ -20,7 +20,7 @@
%li= filter_link_to t('admin.accounts.order.alphabetic'), recent: nil %li= filter_link_to t('admin.accounts.order.alphabetic'), recent: nil
%li= filter_link_to t('admin.accounts.order.most_recent'), recent: '1' %li= filter_link_to t('admin.accounts.order.most_recent'), recent: '1'
= form_tag(admin_accounts_url, { method: 'GET', class: 'simple_form' }) do = form_tag admin_accounts_url, method: 'GET', class: 'simple_form' do
.fields-group .fields-group
- Admin::FilterHelper::ACCOUNT_FILTERS.each do |key| - Admin::FilterHelper::ACCOUNT_FILTERS.each do |key|
- if params[key].present? - if params[key].present?
@ -28,12 +28,11 @@
- %i(username display_name email ip).each do |key| - %i(username display_name email ip).each do |key|
.input.string.optional .input.string.optional
.label_input = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.accounts.#{key}")
%label.string.optional= t("admin.accounts.#{key}")
= text_field_tag key, params[key], class: 'string optional'
.actions .actions
%button.btn= t('admin.accounts.search') %button= t('admin.accounts.search')
= link_to t('admin.accounts.reset'), admin_accounts_path, class: 'button negative'
%table.table %table.table
%thead %thead

View File

@ -85,6 +85,7 @@ en:
profile_url: Profile URL profile_url: Profile URL
public: Public public: Public
push_subscription_expires: PuSH subscription expires push_subscription_expires: PuSH subscription expires
reset: Reset
reset_password: Reset password reset_password: Reset password
salmon_url: Salmon URL salmon_url: Salmon URL
search: Search search: Search