From 778d2363f1a0cb5b6bebae1864de76d1c31669d8 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 05 Jun 2014 09:54:45 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
skins/larry/styles.css | 3 ++-
program/lib/Roundcube/html.php | 4 ++--
skins/larry/mail.css | 18 ------------------
3 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/program/lib/Roundcube/html.php b/program/lib/Roundcube/html.php
index 0209d1b..3aae7cf 100644
--- a/program/lib/Roundcube/html.php
+++ b/program/lib/Roundcube/html.php
@@ -283,11 +283,11 @@
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 b82fb79..2df5e2b 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -1389,34 +1389,16 @@
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 {
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 17543c8..7e20495 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -36,7 +36,8 @@
}
.voice {
- display: none;
+ position: absolute;
+ top: -1000px;
}
input[type="text"],
--
Gitblit v1.9.1