Merge branch 'master' of github.com:roundcube/roundcubemail

pull/195/head
Aleksander Machniak 11 years ago
commit 778d2363f1

@ -283,11 +283,11 @@ class html
continue; continue;
} }
// ignore not allowed attributes, except data-* // ignore not allowed attributes, except aria-* and data-*
if (!empty($allowed)) { if (!empty($allowed)) {
$is_data_attr = @substr_compare($key, 'data-', 0, 5) === 0; $is_data_attr = @substr_compare($key, 'data-', 0, 5) === 0;
$is_aria_attr = @substr_compare($key, 'aria-', 0, 5) === 0; $is_aria_attr = @substr_compare($key, 'aria-', 0, 5) === 0;
if (!$is_aria_attr && !isset($allowed_f[$key]) && (!$is_data_attr || !isset($allowed_f['data-*']))) { if (!$is_aria_attr && !$is_data_attr && !isset($allowed_f[$key])) {
continue; continue;
} }
} }

@ -1389,36 +1389,18 @@ div.message-partheaders .headers-table td.header {
background-position: 6px -1555px; background-position: 6px -1555px;
} }
#contacts-table.focus tr.focused td.contactgroup {
background-position: 4px -1555px;
}
#contacts-table tr.unfocused td.contactgroup,
#contacts-table tr.selected td.contactgroup { #contacts-table tr.selected td.contactgroup {
background-position: 6px -1579px; background-position: 6px -1579px;
} }
#contacts-table.focus tr.selected.focused td.contactgroup {
background-position: 4px -1579px;
}
#contacts-table td.contact { #contacts-table td.contact {
background-position: 6px -1603px; background-position: 6px -1603px;
} }
#contacts-table.focus tr.focused td.contact {
background-position: 4px -1603px;
}
#contacts-table tr.unfocused td.contact,
#contacts-table tr.selected td.contact { #contacts-table tr.selected td.contact {
background-position: 6px -1627px; background-position: 6px -1627px;
} }
#contacts-table.focus tr.selected.focused td.contact {
background-position: 4px -1627px;
}
#compose-content { #compose-content {
position: absolute; position: absolute;
top: 0; top: 0;

@ -36,7 +36,8 @@ img {
} }
.voice { .voice {
display: none; position: absolute;
top: -1000px;
} }
input[type="text"], input[type="text"],

Loading…
Cancel
Save