diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-06-05 15:54:45 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-06-05 15:54:45 +0200 |
| commit | 778d2363f1a0cb5b6bebae1864de76d1c31669d8 (patch) | |
| tree | 3a8178d95669cde47410821d6f4776b0ab45dd82 | |
| parent | 64f7d6758fd269823ab19270a6ef5658f0a28669 (diff) | |
| parent | 8bd59c332782eea8b3de4ca5c22942e62100140f (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
| -rw-r--r-- | program/lib/Roundcube/html.php | 4 | ||||
| -rw-r--r-- | skins/larry/mail.css | 18 | ||||
| -rw-r--r-- | skins/larry/styles.css | 3 |
3 files changed, 4 insertions, 21 deletions
diff --git a/program/lib/Roundcube/html.php b/program/lib/Roundcube/html.php index 0209d1bf2..3aae7cfe7 100644 --- a/program/lib/Roundcube/html.php +++ b/program/lib/Roundcube/html.php @@ -283,11 +283,11 @@ class html continue; } - // ignore not allowed attributes, except data-* + // ignore not allowed attributes, except aria-* and data-* if (!empty($allowed)) { $is_data_attr = @substr_compare($key, 'data-', 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; } } diff --git a/skins/larry/mail.css b/skins/larry/mail.css index b82fb790e..2df5e2bc5 100644 --- a/skins/larry/mail.css +++ b/skins/larry/mail.css @@ -1389,36 +1389,18 @@ div.message-partheaders .headers-table td.header { 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 { background-position: 6px -1579px; } -#contacts-table.focus tr.selected.focused td.contactgroup { - background-position: 4px -1579px; -} - #contacts-table td.contact { 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 { background-position: 6px -1627px; } -#contacts-table.focus tr.selected.focused td.contact { - background-position: 4px -1627px; -} - #compose-content { position: absolute; top: 0; diff --git a/skins/larry/styles.css b/skins/larry/styles.css index 17543c875..7e20495d9 100644 --- a/skins/larry/styles.css +++ b/skins/larry/styles.css @@ -36,7 +36,8 @@ img { } .voice { - display: none; + position: absolute; + top: -1000px; } input[type="text"], |