From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop
---
skins/larry/settings.css | 72 ++++++++++++++++++++++++++++++++----
1 files changed, 64 insertions(+), 8 deletions(-)
diff --git a/skins/larry/settings.css b/skins/larry/settings.css
index 1d99b75..7b9fe36 100644
--- a/skins/larry/settings.css
+++ b/skins/larry/settings.css
@@ -8,15 +8,13 @@
* License. It is allowed to copy, distribute, transmit and to adapt the work
* by keeping credits to the original autors in the README file.
* See http://creativecommons.org/licenses/by-sa/3.0/ for details.
- *
- * $Id$
*/
#settings-sections {
position: absolute;
top: 0;
left: 0;
- width: 220px;
+ width: 200px;
bottom: 0;
}
@@ -24,7 +22,7 @@
#settings-right {
position: absolute;
top: 0;
- left: 232px;
+ left: 212px;
right: 0;
bottom: 0;
}
@@ -40,7 +38,7 @@
#preferences-box {
position: absolute;
top: 0;
- left: 270px;
+ left: 272px;
right: 0;
bottom: 0;
}
@@ -54,7 +52,9 @@
#settings-sections span.listitem a,
#settings-sections span.tablink a {
padding-left: 36px;
- background: url(images/listicons.png) -100px 0 no-repeat;
+ background-image: url(images/listicons.png);
+ background-position: -100px 0;
+ background-repeat: no-repeat;
}
/* note: support span.tablink because this is used by plugins */
@@ -108,6 +108,14 @@
#settings-sections span.password.selected a {
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 {
@@ -171,15 +179,30 @@
position: absolute;
top: 0;
left: 0;
- width: 300px;
+ width: 260px;
bottom: 0;
+}
+
+#identities-table {
+ width: 100%;
+ table-layout: fixed;
+}
+
+#identities-table tbody td.mail {
+ width: 100%;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
+#identities-table tbody tr.readonly td {
+ font-style: italic;
}
#folder-details,
#identity-details {
position: absolute;
top: 0;
- left: 310px;
+ left: 272px;
right: 0;
bottom: 0;
}
@@ -206,6 +229,39 @@
text-align: right;
}
+.skinselection {
+ display: block;
+}
+
+.skinselection span {
+ display: inline-block;
+ vertical-align: middle;
+ padding-right: 1em;
+}
+
+.skinselection .skinname {
+ font-weight: bold;
+}
+
+.skinselection .skinlicense,
+.skinselection .skinlicense a {
+ font-style: italic;
+ color: #666;
+ text-decoration: none;
+}
+
+.skinselection .skinlicense a:hover {
+ text-decoration: underline;
+}
+
+img.skinthumbnail {
+ width: 64px;
+ height: 64px;
+ border: 1px solid #ccc;
+ background: #fff;
+ border-radius: 4px;
+}
+
#pluginlist td.version {
width: 5em;
}
--
Gitblit v1.9.1