Commit 683039a5 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review

Merge "made the email heading sit inline with the rest of the headings - Bug #1465107"

parents 0200afb9 bf27574d
......@@ -456,6 +456,7 @@ function build_admin_user_search_results($search, $offset, $limit) {
'name' => get_string('emails'),
'sort' => true,
'help' => true,
'class' => 'form-inline-align-bottom',
'helplink' => get_help_icon('core', 'admin', 'usersearch', 'email'),
'template' => 'admin/users/searchemailcolumn.tpl',
),
......@@ -481,7 +482,7 @@ function build_admin_user_search_results($search, $offset, $limit) {
'template' => 'strftimedatetime.tpl',
);
if (!$USER->get('admin') && !$USER->is_institutional_admin()) {
unset($cols['email']);
......
......@@ -131,6 +131,10 @@ label,
}
}
.form-inline-align-bottom a {
vertical-align: bottom;
}
.form-control:disabled {
color: #aaa;
}
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -137,6 +137,10 @@ label,
}
}
.form-inline-align-bottom a {
vertical-align: bottom;
}
.form-control.file {
padding: 0;
box-shadow: none;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment