Fix compose editor toggling and other style improvements

5 files changed, 47 insertions, 11 deletions

diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 618487469..8a29fa7ce 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -321,7 +321,7 @@ a.iconbutton.threadmode.selected {
 }
 
 .boxlistcontent tbody tr td {
-	padding: 4px 7px;
+	padding: 3px 7px;
 	border-bottom: 1px solid #ddd;
 	border-left: 1px dotted #bbd3da;
 	white-space: nowrap;
@@ -800,13 +800,20 @@ h3.subject {
 #message-objects div a.button,
 #messagebody span.part-notice a.button {
 	margin-left: 10px;
-	border: 1px solid #ccc;
 	box-shadow: 0 1px 1px 0 #e8e386;
 	-o-box-shadow: 0 1px 1px 0 #e8e386;
 	-webkit-box-shadow: 0 1px 1px 0 #e8e386;
 	-moz-box-shadow: 0 1px 1px 0 #e8e386;
 }
 
+#message-objects div a.button:hover,
+#messagebody span.part-notice a.button:hover {
+	box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
+	-moz-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
+	-webkit-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
+	-o-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
+}
+
 div.message-part,
 div.message-htmlpart {
 	padding: 10px 2px;
@@ -1115,6 +1122,11 @@ div.message-part blockquote blockquote blockquote {
 	resize: none;
 	font-family: monospace;
 	font-size: 9pt;
+	outline: none;
+}
+
+#composebody:active,
+#composebody:focus {
 }
 
 #compose-attachments {
@@ -1154,4 +1166,8 @@ div.message-part blockquote blockquote blockquote {
 	text-align: right;
 }
 
+.defaultSkin table.mceLayout,
+.defaultSkin table.mceLayout tr.mceLast td {
+	border: 0 !important;
+}
 
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 6db919764..80943a65a 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -66,7 +66,7 @@ textarea.placeholder {
 input.button {
 	display: inline-block;
 	margin: 0 2px;
-	padding: 3px 5px;
+	padding: 2px 5px;
 	color: #525252;
 	text-shadow: 0px 1px 1px #fff;
 	border: 1px solid #c0c0c0;
@@ -105,6 +105,7 @@ input.button {
 
 .formbuttons input.button:hover {
 	color: #f2f2f2;
+	border-color: #465864;
 	box-shadow: 0 0 5px 2px rgba(71,135,177, 0.6), inset 0 1px 0 0 #888;
 	-moz-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.6), inset 0 1px 0 0 #888;
 	-webkit-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.6), inset 0 1px 0 0 #888;
@@ -174,11 +175,33 @@ a.button {
 	text-decoration: none;
 }
 
+a.button:hover,
+input.button:hover {
+	border-color: #4fadd5;
+	box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
+	-moz-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
+	-webkit-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
+	-o-box-shadow: 0 0 2px 1px rgba(71,135,177, 0.6);
+}
+
 label.disabled,
 a.button.disabled {
 	color: #999;
 }
 
+a.button.disabled,
+input.button.disabled,
+input.button[disabled],
+a.button.disabled:hover,
+input.button.disabled:hover,
+input.button[disabled]:hover {
+	border-color: #c6c6c6;
+	box-shadow: 0 1px 1px 0 #ddd;
+	-o-box-shadow: 0 1px 1px 0 #ddd;
+	-webkit-box-shadow: 0 1px 1px 0 #ddd;
+	-moz-box-shadow: 0 1px 1px 0 #ddd;
+}
+
 a.button.disabled span.inner {
 	opacity: 0.4;
 }
diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html
index 44180be9a..b59c963a6 100644
--- a/skins/larry/templates/compose.html
+++ b/skins/larry/templates/compose.html
@@ -111,7 +111,7 @@
 	<div id="composeoptions">
 		<span class="composeoption">
 			<label><roundcube:label name="editortype" />
-				<roundcube:object name="editorSelector" editorid="compose-body" tabindex="12" /></label>
+				<roundcube:object name="editorSelector" editorid="composebody" tabindex="12" /></label>
 		</span>
 		<span class="composeoption">
 			<label><label for="rcmcomposepriority"><roundcube:label name="priority" />
diff --git a/skins/larry/templates/messagepreview.html b/skins/larry/templates/messagepreview.html
index 98ff6aa2e..0302df475 100644
--- a/skins/larry/templates/messagepreview.html
+++ b/skins/larry/templates/messagepreview.html
@@ -13,16 +13,13 @@
 
 <!-- record navigation -->
 <div id="countcontrols" class="pagenav">
+<roundcube:if condition="env:mailbox != config:drafts_mbox">
 	<roundcube:button command="reply" type="link" class="button reply" classSel="button reply pressed" innerClass="inner" title="replytomessage" content="&lt;-" />
 	<roundcube:button command="replyall" type="link" class="button replyall" classSel="button replyall pressed" innerClass="inner" title="replytoallmessage" content="&lt;&lt;-" />
 	<roundcube:button command="forward" type="link" class="button forward" classSel="button forward pressed" innerClass="inner" title="forwardmessage" content="-&gt;" />
 	&nbsp;
+<roundcube:endif />
 	<roundcube:button command="permaurl" type="link" class="button extwin" classSel="button extwin pressed" innerClass="inner" title="openinextwin" content="[]" target="_blank" />
-<!--
-	&nbsp;
-	<roundcube:button command="previousmessage" type="link" class="button pageup disabled" classAct="button pageup" classSel="button pageup pressed" innerClass="inner" title="previousmessage" content="&amp;lt;" />
-	<roundcube:button command="nextmessage" type="link" class="button pagedown disabled" classAct="button pagedown" classSel="button pagedown pressed" innerClass="inner" title="nextmessage" content="&amp;gt;" />
--->
 </div>
 
 </div>
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index ef4b65a5a..806ff2c6a 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -189,8 +189,8 @@ function rcube_mail_ui()
     body.width(w).height(h);
 
     if (window.tinyMCE && tinyMCE.get('composebody')) {
-      $('#composebody_tbl').width((w+6)+'px').height('');
-      $('#composebody_ifr').width((w+6)+'px').height((h-54)+'px');
+      $('#composebody_tbl').width((w+11)+'px').height('').css('margin-top', '1px');
+      $('#composebody_ifr').width((w+11)+'px').height((h-24)+'px');
     }
     else {
       $('#googie_edit_layer').height(h+'px');