- Fix some issues regarding to cancel icon on attachments list, improve delete icon handling

5 files changed, 30 insertions, 4 deletions

diff --git a/skins/default/common.css b/skins/default/common.css
index 57fc1275a..3e8bee71a 100644
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -556,6 +556,11 @@ body.iframe .boxtitle
   background-position: -74px 0;
 }
 
+img.uploading
+{
+  width: 16px;
+  height: 16px;
+}
 
 /***** common table settings ******/
 
diff --git a/skins/default/images/messageicons.gif b/skins/default/images/messageicons.gif
index 5c681e354..a914a955a 100644
--- a/skins/default/images/messageicons.gif
+++ b/skins/default/images/messageicons.gif
diff --git a/skins/default/images/messageicons.png b/skins/default/images/messageicons.png
index 99038c732..ca7b23075 100644
--- a/skins/default/images/messageicons.png
+++ b/skins/default/images/messageicons.png
diff --git a/skins/default/mail.css b/skins/default/mail.css
index b884eda87..a217b8571 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -204,7 +204,8 @@
   background-position: 7px -71px;
 }
 
-#markmessagemenu li a
+#markmessagemenu li a,
+#compose-attachments li a
 {
   background: url(images/messageicons.png) no-repeat;
 }
@@ -1469,9 +1470,29 @@ input.from_address
   -o-text-overflow: ellipsis;
 }
 
-#compose-attachments ul li img
+#compose-attachments li a
 {
-  padding-right: 2px;
+  text-indent: -1000px;
+  width: 17px;
+  display: block;
+  float: left;
+  text-decoration: none;
+}
+
+#compose-attachments li img
+{
+  vertical-align: middle;
+}
+
+#compose-attachments li a.delete,
+#compose-attachments li a.cancelupload
+{
+  background-position: 0px -392px;
+}
+
+#compose-attachments li span
+{
+  line-height: 18px;
   vertical-align: middle;
 }
 
diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index 285a783a1..adb0949c1 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -43,7 +43,7 @@
 <div id="compose-attachments">
 <div class="boxtitle"><roundcube:label name="attachments" /></div>
 <div class="boxlistcontent">
-    <roundcube:object name="composeAttachmentList" deleteIcon="/images/icons/delete.png" cancelIcon="/images/icons/delete.png" loadingIcon="/images/display/loading_blue.gif" />
+    <roundcube:object name="composeAttachmentList" id="attachmentslist" loadingIcon="/images/display/loading_blue.gif" />
 </div>
 <div class="boxfooter">
   <roundcube:button name="uploadmenulink" id="uploadmenulink" type="link" title="addattachment" class="button addgroup" onclick="rcmail_ui.show_popup('uploadmenu', true);return false" content=" " />