Merge branch 'dev-canned-responses'

Conflicts (resolved):
	skins/classic/includes/settingstabs.html
	skins/larry/includes/settingstabs.html

1 files changed, 12 insertions, 0 deletions

diff --git a/skins/larry/settings.css b/skins/larry/settings.css
index 6afa48c40..a769ac412 100644
--- a/skins/larry/settings.css
+++ b/skins/larry/settings.css
@@ -130,6 +130,14 @@
 	background-position: 6px -1819px;
 }
 
+#settings-sections span.responses a {
+	background-position: 6px -1972px;
+}
+
+#settings-sections span.responses.selected a {
+	background-position: 6px -1996px;
+}
+
 #sections-table #rcmrowgeneral td.section {
 	background-position: 6px -573px;
 }
@@ -206,6 +214,10 @@
 	text-overflow: ellipsis;
 }
 
+#identities-table tbody tr.readonly td {
+	font-style: italic;
+}
+
 #folder-details,
 #identity-details {
 	position: absolute;