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

Conflicts:
	plugins/password/config.inc.php.dist

1 files changed, 85 insertions, 64 deletions

diff --git a/skins/larry/settings.css b/skins/larry/settings.css
index 675ef9973..51bf12f88 100644
--- a/skins/larry/settings.css
+++ b/skins/larry/settings.css
@@ -45,7 +45,7 @@
 
 #preferences-frame {
 	border: 0;
-	border-radius: 4px 4px 0 0;
+	border-radius: 4px;
 }
 
 #preferences-details fieldset.advanced legend {
@@ -70,7 +70,7 @@
 	width: 20px;
 	height: 18px;
 	background: url('images/listicons.png') 0 -1157px no-repeat;
-	text-indent: 1000px;
+	text-indent: -5000px;
 	overflow: hidden;
 }
 
@@ -78,9 +78,10 @@
 	background-position: -24px -1137px;
 }
 
-#sections-table tbody td.section,
-#settings-sections span.listitem a,
-#settings-sections span.tablink a {
+#sections-table tbody td,
+#sections-table .listitem span,
+#settings-sections .listitem a,
+#settings-sections .tablink a {
 	padding-left: 36px;
 	background-image: url(images/listicons.png);
 	background-position: -100px 0;
@@ -88,120 +89,144 @@
 }
 
 /* note: support span.tablink because this is used by plugins */
-#settings-sections span.listitem a,
-#settings-sections span.tablink a {
+#settings-sections .listitem a,
+#settings-sections .tablink a {
 	background-position: 6px -862px;
 }
 
-#settings-sections span.selected a,
-#settings-sections span.tablink.selected a {
+#settings-sections .selected a,
+#settings-sections .tablink.selected a {
 	background-position: 6px -887px;
 }
 
-#settings-sections span.preferences a {
+#settings-sections .preferences a {
 	background-position: 6px -431px;
 }
 
-#settings-sections span.preferences.selected a {
+#settings-sections .preferences.selected a {
 	background-position: 6px -455px;
 }
 
-#settings-sections span.folders a,
-#sections-table #rcmrowfolders td.section {
+#settings-sections .folders a {
 	background-position: 6px 2px;
 }
 
-#settings-sections span.folders.selected a,
-#sections-table #rcmrowfolders.selected td.section {
+#settings-sections .folders.selected a {
 	background-position: 6px -22px;
 }
 
-#settings-sections span.identities a {
+#sections-table #rcmrowfolders .section {
+	background-position: 4px 2px;
+}
+
+#sections-table #rcmrowfolders.selected .section {
+	background-position: 4px -22px;
+}
+
+#settings-sections .identities a {
 	background-position: 6px -478px;
 }
 
-#settings-sections span.identities.selected a {
+#settings-sections .identities.selected a {
 	background-position: 6px -502px;
 }
 
-#settings-sections span.filter a {
+#settings-sections .filter a {
 	background-position: 6px -1746px;
 }
 
-#settings-sections span.filter.selected a {
+#settings-sections .filter.selected a {
 	background-position: 6px -1770px;
 }
 
-#settings-sections span.password a {
+#settings-sections .password a {
 	background-position: 6px -1795px;
 }
 
-#settings-sections span.password.selected a {
+#settings-sections .password.selected a {
 	background-position: 6px -1819px;
 }
 
-#settings-sections span.responses a {
+#settings-sections .responses a {
 	background-position: 6px -1972px;
 }
 
-#settings-sections span.responses.selected a {
+#settings-sections .responses.selected a {
 	background-position: 6px -1996px;
 }
 
-#sections-table #rcmrowgeneral td.section {
-	background-position: 6px -573px;
+#sections-table #rcmrowgeneral .section {
+	background-position: 4px -573px;
+}
+
+#sections-table #rcmrowgeneral.selected .section {
+	background-position: 4px -598px;
+}
+
+#sections-table #rcmrowmailbox .section {
+	background-position: 4px -621px;
+}
+
+#sections-table #rcmrowmailbox.selected .section {
+	background-position: 4px -646px;
 }
 
-#sections-table #rcmrowgeneral.selected td.section {
-	background-position: 6px -598px;
+#sections-table #rcmrowcompose .section {
+	background-position: 4px -670px;
 }
 
-#sections-table #rcmrowmailbox td.section {
-	background-position: 6px -621px;
+#sections-table #rcmrowcompose.selected .section {
+	background-position: 4px -695px;
 }
 
-#sections-table #rcmrowmailbox.selected td.section {
-	background-position: 6px -646px;
+#sections-table #rcmrowmailview .section {
+	background-position: 4px -718px;
 }
 
-#sections-table #rcmrowcompose td.section {
-	background-position: 6px -670px;
+#sections-table #rcmrowmailview.selected .section {
+	background-position: 4px -742px;
 }
 
-#sections-table #rcmrowcompose.selected td.section {
-	background-position: 6px -695px;
+#sections-table #rcmrowaddressbook .section {
+	background-position: 4px -766px;
 }
 
-#sections-table #rcmrowmailview td.section {
-	background-position: 6px -718px;
+#sections-table #rcmrowaddressbook.selected .section {
+	background-position: 4px -791px;
 }
 
-#sections-table #rcmrowmailview.selected td.section {
-	background-position: 6px -742px;
+#sections-table #rcmrowserver .section {
+	background-position: 4px -814px;
 }
 
-#sections-table #rcmrowaddressbook td.section {
-	background-position: 6px -766px;
+#sections-table #rcmrowserver.selected .section {
+	background-position: 4px -838px;
 }
 
-#sections-table #rcmrowaddressbook.selected td.section {
-	background-position: 6px -791px;
+#sections-table #rcmrowcalendar .section {
+	background-position: 4px -526px;
 }
 
-#sections-table #rcmrowserver td.section {
-	background-position: 6px -814px;
+#sections-table #rcmrowcalendar.selected .section {
+	background-position: 4px -550px;
 }
 
-#sections-table #rcmrowserver.selected td.section {
-	background-position: 6px -838px;
+#folderslist .boxtitle a.iconbutton.search {
+	background-position: -2px -317px;
+	cursor: pointer;
+	position: absolute;
+	right: 8px;
+	top: 8px;
+	width: 16px;
 }
 
-#sections-table #rcmrowcalendar td.section {
-	background-position: 6px -526px;
+#folderslist .listsearchbox + .scroller {
+	top: 34px;
 }
 
-#sections-table #rcmrowcalendar.selected td.section {
-	background-position: 6px -550px;
+.listsearchbox select {
+	width: 100%;
+	margin: 0 0 4px 0;
 }
 
 #folderslist,
@@ -237,26 +262,22 @@
 	bottom: 0;
 }
 
-#subscription-table {
-	table-layout: fixed;
-}
-
-#subscription-table tr.root td {
+#subscription-table li.root {
 	font-size: 5%;
+	line-height: 5px;
 	height: 5px;
 	padding: 2px;
 }
 
-#subscription-table td.name {
-	width: 85%;
-	overflow: hidden;
-	text-overflow: ellipsis;
+#subscription-table li input {
+	position: absolute;
+	right: 8px;
+	top: 4px;
+	margin-right: 0;
 }
 
-#subscription-table td.subscribed {
-	min-width: 30px;
-	padding: 3px 12px 3px 3px;
-	text-align: right;
+#subscription-table li a {
+	padding-right: 28px;
 }
 
 .skinselection {