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/styles.css | 79 ++++++++++++++++++++++++++++++++++++---
1 files changed, 73 insertions(+), 6 deletions(-)
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 4da8788..e298f32 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -878,7 +878,7 @@
}
/* fix scrolling within iframes in webkit browsers on touch devices */
-@media screen and (-webkit-min-device-pixel-ratio:0) {
+@media screen and (-webkit-min-device-pixel-ratio:0) and (max-device-width:1024px) {
.iframebox {
overflow: auto;
-webkit-overflow-scrolling: touch;
@@ -995,9 +995,17 @@
background-color: #d9ecf4;
}
+ul.listing li ul {
+ border-top: 1px solid #bbd3da;
+}
+
ul.listing li.droptarget,
table.listing tr.droptarget td {
background-color: #e8e798;
+}
+
+.listbox table.listing {
+ background-color: #d9ecf4;
}
table.listing,
@@ -1009,6 +1017,32 @@
table.layout td {
vertical-align: top;
+}
+
+ul.treelist li {
+ position: relative;
+}
+
+ul.treelist li div.treetoggle {
+ position: absolute;
+ top: 13px;
+ left: 19px;
+ width: 13px;
+ height: 13px;
+ background: url(images/listicons.png) -3px -144px no-repeat;
+ cursor: pointer;
+}
+
+ul.treelist li div.treetoggle.expanded {
+ background-position: -3px -168px;
+}
+
+ul.treelist li.selected > div.collapsed {
+ background-position: -23px -144px;
+}
+
+ul.treelist li.selected > div.expanded {
+ background-position: -23px -168px;
}
.listbox .boxfooter {
@@ -1352,6 +1386,20 @@
.propform fieldset fieldset legend {
color: #666;
font-size: 12px;
+}
+
+.propform div.prop {
+ margin-bottom: 0.5em;
+}
+
+.propform div.prop.block label {
+ display: block;
+ margin-bottom: 0.3em;
+}
+
+.propform div.prop.block input,
+.propform div.prop.block textarea {
+ width: 95%;
}
fieldset.floating {
@@ -1728,6 +1776,9 @@
background-position: 0 -1745px;
}
+.toolbar a.button.responses {
+ background-position: center -1932px;
+}
a.menuselector {
display: inline-block;
@@ -1829,6 +1880,7 @@
}
ul.toolbarmenu,
+ul.toolbarmenu ul,
#rcmKSearchpane ul {
margin: 0;
padding: 0;
@@ -1847,13 +1899,13 @@
}
.googie_list tr:first-child td,
-ul.toolbarmenu li:first-child,
+ul.toolbarmenu > li:first-child,
select.decorated option:first-child {
border-top: 0;
}
.googie_list tr:last-child td,
-ul.toolbarmenu li:last-child,
+ul.toolbarmenu > li:last-child,
select.decorated option:last-child {
border-bottom: 0;
}
@@ -1905,6 +1957,11 @@
color: #fff;
padding: 4px 8px;
text-shadow: 0px 1px 1px #333;
+}
+
+ul.toolbarmenu li.separator label {
+ color: #bbb;
+ font-style: italic;
}
ul.toolbarmenu li a.icon {
@@ -1983,6 +2040,15 @@
ul.toolbarmenu li span.conversation {
background-position: 0 -1532px;
+}
+
+#snippetslist {
+ max-width: 200px;
+}
+
+#snippetslist li a {
+ overflow: hidden;
+ text-overflow: ellipsis;
}
#rcmKSearchpane {
@@ -2199,12 +2265,13 @@
display: block;
color: #333;
font-weight: bold;
- padding: 8px 4px 3px 30px;
+ padding: 3px 4px 3px 30px;
text-shadow: 0px 1px 1px #fff;
text-decoration: none;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
+ line-height: 20px;
}
#compose-attachments ul li {
@@ -2222,9 +2289,9 @@
.attachmentslist li a.delete,
.attachmentslist li a.cancelupload {
position: absolute;
- top: 6px;
+ top: 4px;
right: 0;
- width: 24px;
+ width: 20px;
height: 18px;
padding: 0;
text-decoration: none;
--
Gitblit v1.9.1