From 80102a2dde8d2870ee7d8c4ad8e8626a555ecc2f Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 14 Feb 2014 13:50:18 +0100
Subject: Re-locate the move-message toolbar button to be next to the related
 delete icon; synchronize toolbars in larry and classic skin

---
 skins/larry/includes/mailtoolbar.html | 4 +---
 skins/larry/styles.css                | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'skins/larry')

diff --git a/skins/larry/includes/mailtoolbar.html b/skins/larry/includes/mailtoolbar.html
index 912cac6e2..ac08a3200 100644
--- a/skins/larry/includes/mailtoolbar.html
+++ b/skins/larry/includes/mailtoolbar.html
@@ -11,13 +11,11 @@
 </span>
 <roundcube:button command="delete" type="link" class="button delete disabled" classAct="button delete" classSel="button delete pressed" label="delete" title="deletemessage" />
 <roundcube:if condition="template:name == 'message'" />
+<roundcube:button command="move" type="link" class="button move disabled" classAct="button move" classSel="button move pressed" label="move" title="moveto" data-menu-pos="bottom" />
 <roundcube:button command="print" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="print" title="printmessage" />
 <roundcube:endif />
 <roundcube:container name="toolbar" id="mailtoolbar" />
 <roundcube:button name="markmenulink" id="markmessagemenulink" type="link" class="button markmessage" label="mark" title="markmessages" onclick="UI.show_popup('markmessagemenu');return false" />
-<roundcube:if condition="template:name == 'message'" />
-<roundcube:button command="move" type="link" class="button move disabled" classAct="button move" classSel="button move pressed" label="move" title="moveto" data-menu-pos="bottom" />
-<roundcube:endif />
 <roundcube:button name="messagemenulink" id="messagemenulink" type="link" class="button more" label="more" title="moreactions" onclick="UI.show_popup('messagemenu');return false" />
 
 <div id="forwardmenu" class="popupmenu">
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 96ffbb272..18ba49ae2 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -1896,7 +1896,7 @@ ul.proplist li {
 }
 
 .toolbar a.button.move {
-	background-position: center -1972px;
+	background-position: center -1971px;
 }
 
 .toolbar a.button.more {
-- 
cgit v1.2.3