Commit b75a0283 authored by catch's avatar catch
Browse files

Issue #1488962 by mcjim, lewisnyman, Fr0s7, jtwalters, JohnAlbin, edward_or,...

Issue #1488962 by mcjim, lewisnyman, Fr0s7, jtwalters, JohnAlbin, edward_or, chellman: Increase touch target size of admin menu lists.
parent d736cc1a
...@@ -75,21 +75,9 @@ ul.inline li { ...@@ -75,21 +75,9 @@ ul.inline li {
padding-left: 1em; padding-left: 1em;
padding-right: 0; padding-right: 0;
} }
ul.admin-list li { .admin-list li a {
padding: 9px 30px 0 0;
margin-right: 0;
background: url(images/list-item-rtl.png) no-repeat right 11px; background: url(images/list-item-rtl.png) no-repeat right 11px;
} padding: 9px 39px 9px 9px;
ul.admin-list li a {
margin-right: -30px;
margin-left: 0;
padding: 0 30px 4px 0;
}
ul.admin-list.compact li a {
margin-right: 0;
}
ul.admin-list li div.description a {
margin-right: 0;
} }
/** /**
......
...@@ -98,7 +98,6 @@ acronym { ...@@ -98,7 +98,6 @@ acronym {
border-bottom: dotted 1px; border-bottom: dotted 1px;
} }
ul, ul,
.block ul,
.item-list ul { .item-list ul {
list-style-type: disc; list-style-type: disc;
list-style-image: none; list-style-image: none;
...@@ -339,50 +338,40 @@ ul.inline li { ...@@ -339,50 +338,40 @@ ul.inline li {
ul.inline li { ul.inline li {
display: inline; display: inline;
} }
ul.admin-list li { .admin-list {
margin: 0;
padding: 0;
}
.admin-list li {
position: relative; position: relative;
padding-left: 30px; /* LTR */
padding-top: 9px;
border-top: 1px solid #ccc; border-top: 1px solid #ccc;
margin-left: 0; /* LTR */ margin: 0;
margin-bottom: 10px;
background: url(images/list-item.png) no-repeat 0 11px; /* LTR */
list-style-type: none; list-style-type: none;
list-style-image: none; list-style-image: none;
}
.admin-panel .item-list ul,
ul.admin-list {
margin: 0;
padding: 0; padding: 0;
} }
.admin-panel .item-list ul, .admin-list.compact li {
ul.admin-list.compact {
margin: 8px 0;
}
.admin-panel .item-list li,
ul.admin-list.compact li {
border: none; border: none;
background: none;
margin: 0 0 0.75em;
line-height: 1;
padding: 0;
} }
ul.admin-list li:last-child { .admin-list li a {
border-bottom: none; background: url(images/list-item.png) no-repeat 9px 11px; /* LTR */
} display: block;
ul.admin-list li a { padding: 9px 9px 9px 39px; /* LTR */
margin-left: -30px; /* LTR */
padding: 0 0 4px 30px; /* LTR */
min-height: 0; min-height: 0;
} }
ul.admin-list.compact li a { .admin-list.compact li a {
margin-left: 0; /* LTR */ background-image: none;
padding: 0; padding: 2px 19px;
} }
ul.admin-list li div.description a { .admin-list li a:hover,
margin-left: 0; /* LTR */ .admin-list li a:focus,
padding: 0; .admin-list li a:active {
min-height: inherit; text-decoration: none;
}
.admin-list li a:hover .label,
.admin-list li a:focus .label,
.admin-list li a:active .label {
text-decoration: underline;
} }
div.submitted { div.submitted {
color: #898989; color: #898989;
......
...@@ -48,8 +48,10 @@ function seven_node_add_list($variables) { ...@@ -48,8 +48,10 @@ function seven_node_add_list($variables) {
$output = '<ul class="admin-list">'; $output = '<ul class="admin-list">';
foreach ($content as $type) { foreach ($content as $type) {
$output .= '<li class="clearfix">'; $output .= '<li class="clearfix">';
$output .= '<span class="label">' . l($type->name, 'node/add/' . $type->type) . '</span>'; $content = '<span class="label">' . check_plain($type->name) . '</span>';
$output .= '<div class="description">' . filter_xss_admin($type->description) . '</div>'; $content .= '<div class="description">' . filter_xss_admin($type->description) . '</div>';
$options['html'] = TRUE;
$output .= l($content, 'node/add/' . $type->type, $options);
$output .= '</li>'; $output .= '</li>';
} }
$output .= '</ul>'; $output .= '</ul>';
...@@ -71,11 +73,14 @@ function seven_admin_block_content($variables) { ...@@ -71,11 +73,14 @@ function seven_admin_block_content($variables) {
if (!empty($content)) { if (!empty($content)) {
$output = system_admin_compact_mode() ? '<ul class="admin-list compact">' : '<ul class="admin-list">'; $output = system_admin_compact_mode() ? '<ul class="admin-list compact">' : '<ul class="admin-list">';
foreach ($content as $item) { foreach ($content as $item) {
$output .= '<li class="leaf">'; $output .= '<li>';
$output .= l($item['title'], $item['href'], $item['localized_options']); $content = '<span class="label">' . filter_xss_admin($item['title']) . '</span>';
$options = $item['localized_options'];
$options['html'] = TRUE;
if (isset($item['description']) && !system_admin_compact_mode()) { if (isset($item['description']) && !system_admin_compact_mode()) {
$output .= '<div class="description">' . filter_xss_admin($item['description']) . '</div>'; $content .= '<div class="description">' . filter_xss_admin($item['description']) . '</div>';
} }
$output .= l($content, $item['href'], $options);
$output .= '</li>'; $output .= '</li>';
} }
$output .= '</ul>'; $output .= '</ul>';
......
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