summaryrefslogtreecommitdiff
path: root/skins
diff options
context:
space:
mode:
Diffstat (limited to 'skins')
-rw-r--r--skins/classic/common.css80
-rw-r--r--skins/classic/editor_content.css31
-rw-r--r--skins/classic/functions.js44
-rw-r--r--skins/classic/images/filedrop.pngbin0 -> 605 bytes
-rw-r--r--skins/classic/mail.css24
-rw-r--r--skins/classic/print.css12
-rw-r--r--skins/classic/templates/about.html2
-rw-r--r--skins/classic/templates/compose.html2
-rw-r--r--skins/larry/editor_content.css31
-rw-r--r--skins/larry/images/buttons.pngbin39455 -> 16644 bytes
-rw-r--r--skins/larry/images/listicons.pngbin29530 -> 13514 bytes
-rw-r--r--skins/larry/mail.css62
-rw-r--r--skins/larry/print.css11
-rw-r--r--skins/larry/settings.css6
-rw-r--r--skins/larry/styles.css44
-rw-r--r--skins/larry/templates/about.html2
-rw-r--r--skins/larry/templates/compose.html6
-rw-r--r--skins/larry/ui.js14
18 files changed, 177 insertions, 194 deletions
diff --git a/skins/classic/common.css b/skins/classic/common.css
index c0d0a2610..cc1f3e60a 100644
--- a/skins/classic/common.css
+++ b/skins/classic/common.css
@@ -546,6 +546,7 @@ body.iframe .boxtitle
.popupmenu li a.active:visited
{
color: #333;
+ cursor: pointer;
}
.popupmenu li a.active:hover,
@@ -605,6 +606,7 @@ img.uploading
height: 16px;
}
+
/***** common table settings ******/
table.records-table thead tr th,
@@ -751,18 +753,25 @@ ul.treelist li.droptarget
/***** mac-style quicksearch field *****/
+div.searchbox,
#quicksearchbar
{
- position: absolute;
- top: 55px;
- right: 10px;
+ position: relative;
width: 190px;
height: 20px;
text-align: right;
background: url(images/searchfield.gif) top left no-repeat;
}
-#searchreset
+#quicksearchbar
+{
+ position: absolute;
+ top: 55px;
+ right: 10px;
+}
+
+#searchreset,
+div.searchbox a.searchreset
{
position: absolute;
top: 3px;
@@ -770,19 +779,42 @@ ul.treelist li.droptarget
text-decoration: none;
}
-#searchmenulink
+#searchmenulink,
+div.searchbox a.searchmenu,
+div.searchbox a.searchicon
{
position: absolute;
top: 3px;
right: 168px;
}
+div.searchbox a.searchreset
+{
+ display: block;
+ width: 14px;
+ height: 14px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-indent: 50000px;
+ background: url(images/icons/reset.gif) top left no-repeat;
+}
+
+div.searchbox a.searchicon
+{
+ display: inline-block;
+ width: 16px;
+ height: 16px;
+ overflow: hidden;
+ background: url(images/icons/glass.png) top left no-repeat;
+}
+
#quicksearchbar img
{
vertical-align: middle;
}
-#quicksearchbox
+#quicksearchbox,
+div.searchbox > input
{
position: absolute;
top: 2px;
@@ -1192,3 +1224,39 @@ fieldset.tabbed
.quota_text_high { color: white; }
.quota_text_mid { color: #666; }
.quota_text_low { color: #666; }
+
+
+/********** TinyMCE styles **********/
+.mce-btn-small button
+{
+ height: 22px;
+}
+
+.mce-btn-small i
+{
+ line-height: 16px !important;
+ vertical-align: text-top !important;
+}
+
+.mce-combobox button
+{
+ padding: 6px 8px !important;
+}
+
+.mce-tinymce,
+.mce-panel.mce-toolbar-grp
+{
+ border: 0 !important;
+}
+
+#image-selector-form.droptarget {
+ background: url(images/filedrop.png) center bottom no-repeat;
+}
+
+#image-selector-form.droptarget.hover
+{
+ background-color: #F0F0EE;
+ box-shadow: 0 0 5px 0 #999;
+ -moz-box-shadow: 0 0 5px 0 #999;
+ -o-box-shadow: 0 0 5px 0 #999;
+}
diff --git a/skins/classic/editor_content.css b/skins/classic/editor_content.css
deleted file mode 100644
index aabed07b5..000000000
--- a/skins/classic/editor_content.css
+++ /dev/null
@@ -1,31 +0,0 @@
-/* This file contains the CSS data for the editable area(iframe) of TinyMCE */
-
-body, td, pre {
- font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
-}
-
-body {
- background-color: #FFFFFF;
- margin-left: 4px;
- margin-right: 4px;
- margin-top: 2px;
-}
-
-pre
-{
- margin: 0;
- padding: 0;
- white-space: -moz-pre-wrap !important;
- white-space: pre-wrap !important;
- white-space: pre;
- word-wrap: break-word; /* IE (and Safari) */
-}
-
-blockquote
-{
- padding-left: 5px;
- border-left: #1010ff 2px solid;
- margin-left: 5px;
- width: 100%;
-}
diff --git a/skins/classic/functions.js b/skins/classic/functions.js
index ae9898c68..b4f6ed766 100644
--- a/skins/classic/functions.js
+++ b/skins/classic/functions.js
@@ -112,6 +112,7 @@ function rcube_mail_ui()
mailboxmenu: {id:'mailboxoptionsmenu', above:1},
composemenu: {id:'composeoptionsmenu', editable:1, overlap:1},
spellmenu: {id:'spellmenu'},
+ responsesmenu: {id:'responsesmenu'},
// toggle: #1486823, #1486930
uploadmenu: {id:'attachment-form', editable:1, above:1, toggle:!bw.ie&&!bw.linux },
uploadform: {id:'upload-form', editable:1, toggle:!bw.ie&&!bw.linux }
@@ -422,21 +423,21 @@ menu_save: function(prop)
this.save_listmenu();
},
-body_mouseup: function(evt, p)
+body_mouseup: function(e)
{
- var i, target = rcube_event.get_target(evt);
+ var target = e.target; ref = this;
- for (i in this.popups) {
- if (this.popups[i].obj.is(':visible') && target != rcube_find_object(i+'link')
- && !this.popups[i].toggle
- && target != this.popups[i].obj.get(0) // check if scroll bar was clicked (#1489832)
- && (!this.popups[i].editable || !this.target_overlaps(target, this.popups[i].id))
- && (!this.popups[i].sticky || !rcube_mouse_is_over(evt, rcube_find_object(this.popups[i].id)))
+ $.each(this.popups, function(i, popup) {
+ if (popup.obj.is(':visible') && target != rcube_find_object(i + 'link')
+ && !popup.toggle
+ && target != popup.obj.get(0) // check if scroll bar was clicked (#1489832)
+ && (!popup.editable || !ref.target_overlaps(target, popup.id))
+ && (!popup.sticky || !rcube_mouse_is_over(e, rcube_find_object(popup.id)))
&& !$(target).is('.folder-selector-link') && !$(target).children('.folder-selector-link').length
) {
window.setTimeout('rcmail_ui.show_popup("'+i+'",false);', 50);
}
- }
+ });
},
target_overlaps: function (target, elementid)
@@ -450,9 +451,9 @@ target_overlaps: function (target, elementid)
return false;
},
-body_keydown: function(evt, p)
+body_keydown: function(e)
{
- if (rcube_event.get_keycode(evt) == 27) {
+ if (e.keyCode == 27) {
for (var k in this.popups) {
if (this.popups[k].obj.is(':visible'))
this.show_popup(k, false);
@@ -556,10 +557,9 @@ resize_compose_body: function()
w = div.width() - 2, h = div.height(),
x = bw.ie || bw.opera ? 4 : 0;
- $('#compose-body_tbl').width((w+3)+'px').height('');
- $('#compose-body_ifr').width((w+3)+'px').height((h-54)+'px');
- $('#compose-body').width((w-x)+'px').height(h+'px');
- $('#googie_edit_layer').height(h+'px');
+ $('#compose-body_ifr').width(w+3).height(h-2 - $('div.mce-toolbar').height());
+ $('#compose-body').width(w-x).height(h);
+ $('#googie_edit_layer').height(h);
},
resize_compose_body_ev: function()
@@ -800,7 +800,7 @@ function iframe_events()
// this==iframe
try {
var doc = this.contentDocument ? this.contentDocument : this.contentWindow ? this.contentWindow.document : null;
- rcube_event.add_listener({ element: doc, object:rcmail_ui, method:'body_mouseup', event:'mouseup' });
+ $(doc).mouseup(function(e) { rcmail_ui.body_mouseup(e); });
}
catch (e) {
// catch possible "Permission denied" error in IE
@@ -953,18 +953,16 @@ function percent_indicator(obj, data)
};
// Optional parameters used by TinyMCE
-var rcmail_editor_settings = {
- skin: "default", // "default", "o2k7"
- skin_variant: "" // "", "silver", "black"
-};
+var rcmail_editor_settings = {};
var rcmail_ui;
function rcube_init_mail_ui()
{
rcmail_ui = new rcube_mail_ui();
- rcube_event.add_listener({ object:rcmail_ui, method:'body_mouseup', event:'mouseup' });
- rcube_event.add_listener({ object:rcmail_ui, method:'body_keydown', event:'keydown' });
+
+ $(document.body).mouseup(function(e) { rcmail_ui.body_mouseup(e); })
+ .mousedown(function(e) { rcmail_ui.body_keydown(e); });
rcmail.addEventListener('init', function() {
if (rcmail.env.quota_content)
@@ -972,7 +970,7 @@ function rcube_init_mail_ui()
rcmail.addEventListener('setquota', update_quota);
$('iframe').load(iframe_events)
- .contents().mouseup(function(e){rcmail_ui.body_mouseup(e)});
+ .contents().mouseup(function(e) { rcmail_ui.body_mouseup(e); });
if (rcmail.env.task == 'mail') {
rcmail.addEventListener('enable-command', 'enable_command', rcmail_ui);
diff --git a/skins/classic/images/filedrop.png b/skins/classic/images/filedrop.png
new file mode 100644
index 000000000..d4d455bdf
--- /dev/null
+++ b/skins/classic/images/filedrop.png
Binary files differ
diff --git a/skins/classic/mail.css b/skins/classic/mail.css
index 2521fed14..4c4e5d968 100644
--- a/skins/classic/mail.css
+++ b/skins/classic/mail.css
@@ -1309,17 +1309,12 @@ div.message-htmlpart a
color: #0000CC;
}
-div.message-part pre,
-div.message-htmlpart pre,
div.message-part div.pre
{
margin: 0px;
padding: 0px;
font-family: monospace;
font-size: 12px;
- white-space: -moz-pre-wrap !important;
- white-space: pre-wrap !important;
- white-space: pre;
}
div.message-part span.sig
@@ -1333,8 +1328,10 @@ div.message-part blockquote
border-left: 2px solid blue;
border-right: 2px solid blue;
background-color: #F6F6F6;
- margin: 2px 0px;
- padding: 1px 8px 1px 10px;
+ margin: 2px 0;
+ padding: 0 0.4em;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
div.message-part blockquote blockquote
@@ -1567,17 +1564,6 @@ div.hide-headers
outline: none;
}
-#compose-body_tbl,
-#compose-body_tbl td
-{
- border: none;
-}
-
-#compose-body_tbl tr.mceFirst td.mceToolbar
-{
- border-bottom: 1px solid #ccc;
-}
-
#compose-headers
{
width: 100%;
@@ -1866,7 +1852,7 @@ input.from_address
color: #999;
}
-#compose-contacts #quicksearchbar
+#compose-contacts .searchbox
{
top: 2px;
left: 7px;
diff --git a/skins/classic/print.css b/skins/classic/print.css
index d7e332dba..8eac41f53 100644
--- a/skins/classic/print.css
+++ b/skins/classic/print.css
@@ -100,17 +100,12 @@ div.message-part a
color: #0000CC;
}
-div.message-part pre,
-div.message-htmlpart pre,
div.message-part div.pre
{
margin: 0;
padding: 0;
font-family: monospace;
- white-space: -moz-pre-wrap !important;
- white-space: pre-wrap !important;
- white-space: pre;
- word-wrap: break-word; /* IE (and Safari) */
+ font-size: 12px;
}
div.message-part blockquote
@@ -119,8 +114,8 @@ div.message-part blockquote
border-left: 2px solid blue;
border-right: 2px solid blue;
background-color: #F6F6F6;
- margin: 2px 0px;
- padding: 1px 8px 1px 10px;
+ margin: 2px 0;
+ padding: 0 0.4em;
}
div.message-part blockquote blockquote
@@ -164,4 +159,3 @@ p.image-attachment .attachment-links
{
display: none;
}
-
diff --git a/skins/classic/templates/about.html b/skins/classic/templates/about.html
index 429dfcf5f..36fb65739 100644
--- a/skins/classic/templates/about.html
+++ b/skins/classic/templates/about.html
@@ -20,7 +20,7 @@
<div id="license">
<roundcube:object name="aboutcontent" />
<h2 class="sysname">Roundcube Webmail <roundcube:object name="version" /></h2>
-<p class="copyright">Copyright &copy; 2005-2013, The Roundcube Dev Team</p>
+<p class="copyright">Copyright &copy; 2005-2014, The Roundcube Dev Team</p>
<p class="license">This program is free software; you can redistribute it and/or modify
it under the terms of the <a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GNU General Public License</a>
as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br/>
diff --git a/skins/classic/templates/compose.html b/skins/classic/templates/compose.html
index c43adbc27..4705600c7 100644
--- a/skins/classic/templates/compose.html
+++ b/skins/classic/templates/compose.html
@@ -50,7 +50,7 @@
<div id="compose-contacts">
<div class="boxtitle"><roundcube:label name="contacts" /></div>
<div class="boxlistcontent">
- <div id="quicksearchbar">
+ <div class="searchbox">
<img id="searchmenulink" src="/images/icons/glass.png" width="16" height="16" />
<roundcube:object name="searchform" id="quicksearchbox" form="true" tabindex="13" />
<roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" width="13" height="13" />
diff --git a/skins/larry/editor_content.css b/skins/larry/editor_content.css
deleted file mode 100644
index aabed07b5..000000000
--- a/skins/larry/editor_content.css
+++ /dev/null
@@ -1,31 +0,0 @@
-/* This file contains the CSS data for the editable area(iframe) of TinyMCE */
-
-body, td, pre {
- font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
-}
-
-body {
- background-color: #FFFFFF;
- margin-left: 4px;
- margin-right: 4px;
- margin-top: 2px;
-}
-
-pre
-{
- margin: 0;
- padding: 0;
- white-space: -moz-pre-wrap !important;
- white-space: pre-wrap !important;
- white-space: pre;
- word-wrap: break-word; /* IE (and Safari) */
-}
-
-blockquote
-{
- padding-left: 5px;
- border-left: #1010ff 2px solid;
- margin-left: 5px;
- width: 100%;
-}
diff --git a/skins/larry/images/buttons.png b/skins/larry/images/buttons.png
index df4b3afd5..21298ab59 100644
--- a/skins/larry/images/buttons.png
+++ b/skins/larry/images/buttons.png
Binary files differ
diff --git a/skins/larry/images/listicons.png b/skins/larry/images/listicons.png
index 551639876..77a263aef 100644
--- a/skins/larry/images/listicons.png
+++ b/skins/larry/images/listicons.png
Binary files differ
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 98836bba2..b82fb790e 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -38,6 +38,9 @@
left: 0;
right: 0;
bottom: 0px;
+}
+
+html.ie #mailview-top {
overflow: visible; /* fixes display issues of fixed list header in IE */
}
@@ -92,6 +95,7 @@ html>/**/body #messagelist {
background: -ms-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
background: linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
border-radius: 0 0 4px 4px;
+ white-space: nowrap;
}
#messagelistfooter.rightalign {
@@ -312,11 +316,11 @@ a.iconbutton.threadmode.selected {
#mailboxlist li.mailbox ul li a {
padding-left: 52px; /* 36 + 1 x 16 */
- background-position: 22px -93px; /* 6 + 1 x 16 */
+ background-position: 22px -95px; /* 6 + 1 x 16 */
}
#mailboxlist li.mailbox ul li > a:focus,
#mailboxlist li.mailbox ul li.selected > a {
- background-position: 22px -117px;
+ background-position: 22px -119px;
}
#mailboxlist li.mailbox ul li div.treetoggle {
left: 33px;
@@ -325,11 +329,11 @@ a.iconbutton.threadmode.selected {
#mailboxlist li.mailbox ul ul li.mailbox a {
padding-left: 68px; /* 2x */
- background-position: 38px -93px;
+ background-position: 38px -95px;
}
#mailboxlist li.mailbox ul ul li > a:focus,
#mailboxlist li.mailbox ul ul li.selected > a {
- background-position: 38px -117px;
+ background-position: 38px -119px;
}
#mailboxlist li.mailbox ul ul li div.treetoggle {
left: 48px;
@@ -337,11 +341,11 @@ a.iconbutton.threadmode.selected {
#mailboxlist li.mailbox ul ul ul li.mailbox a {
padding-left: 84px; /* 3x */
- background-position: 54px -93px;
+ background-position: 54px -95px;
}
#mailboxlist li.mailbox ul ul ul li > a:focus,
#mailboxlist li.mailbox ul ul ul li.selected > a {
- background-position: 54px -117px;
+ background-position: 54px -119px;
}
#mailboxlist li.mailbox ul ul ul li div.treetoggle {
left: 64px;
@@ -349,11 +353,11 @@ a.iconbutton.threadmode.selected {
#mailboxlist li.mailbox ul ul ul ul li.mailbox a {
padding-left: 100px; /* 4x */
- background-position: 70px -93px;
+ background-position: 70px -95px;
}
#mailboxlist li.mailbox ul ul ul ul li > a:focus,
#mailboxlist li.mailbox ul ul ul ul li.selected > a {
- background-position: 70px -117px;
+ background-position: 70px -119px;
}
#mailboxlist li.mailbox ul ul ul ul li div.treetoggle {
left: 80px;
@@ -372,6 +376,7 @@ a.iconbutton.threadmode.selected {
top: 3px;
right: 6px;
min-width: 1.8em;
+ line-height: 15px;
padding: 2px 4px;
background: #82acb5;
background: -moz-linear-gradient(top, #82acb5 0%, #6a939f 100%);
@@ -796,7 +801,7 @@ table.messagelist.fixedcopy {
#messagecontframe {
border: 0;
- border-radius: 4px 4px 0 0;
+ border-radius: 4px;
}
#messagecontent {
@@ -1145,16 +1150,11 @@ div.message-partheaders {
border-top: 0;
}
-div.message-part pre,
-div.message-htmlpart pre,
div.message-part div.pre {
margin: 0;
padding: 0;
font-family: monospace;
font-size: 12px;
- white-space: -moz-pre-wrap !important;
- white-space: pre-wrap !important;
- white-space: pre;
}
div.message-part span.sig {
@@ -1166,8 +1166,10 @@ div.message-part blockquote {
border-left: 2px solid blue;
border-right: 2px solid blue;
background-color: #F6F6F6;
- margin: 2px 0 2px 0;
- padding: 1px 8px 1px 10px;
+ margin: 2px 0;
+ padding: 0 0.4em;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
div.message-part blockquote blockquote {
@@ -1316,23 +1318,6 @@ div.message-partheaders .headers-table td.header {
bottom: 0;
}
-#composequicksearch {
- position: relative;
- padding: 4px;
- background: #c7e3ef;
-}
-
-#composequicksearch .searchbox input {
- width: 100%;
- height: 26px;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
-}
-
-#composequicksearch #searchmenulink {
- width: 15px;
-}
-
#compose-contacts #directorylist {
border-bottom: 4px solid #c7e3ef;
}
@@ -1638,16 +1623,13 @@ div.message-partheaders .headers-table td.header {
padding-bottom: 8px;
}
-.defaultSkin table.mceLayout,
-.defaultSkin table.mceLayout tr.mceLast td {
- border: 0 !important;
-}
-
-.defaultSkin td.mceToolbar {
+#composebodycontainer .mce-tinymce {
border: 0 !important;
+ margin-top: 1px;
}
-.defaultSkin table.mceLayout tr.mceFirst td {
+#composebodycontainer .mce-panel {
+ border-color: #ccc !important;
background: #f0f0f0;
}
diff --git a/skins/larry/print.css b/skins/larry/print.css
index a56c9b938..22d6c5288 100644
--- a/skins/larry/print.css
+++ b/skins/larry/print.css
@@ -91,16 +91,11 @@ div.message-part a {
color: #00c;
}
-div.message-part pre,
-div.message-htmlpart pre,
div.message-part div.pre {
margin: 0;
padding: 0;
font-family: monospace;
- white-space: -moz-pre-wrap !important;
- white-space: pre-wrap !important;
- white-space: pre;
- word-wrap: break-word; /* IE (and Safari) */
+ font-size: 12px;
}
div.message-part blockquote {
@@ -108,8 +103,8 @@ div.message-part blockquote {
border-left: 2px solid blue;
border-right: 2px solid blue;
background-color: #F6F6F6;
- margin: 0.5em 0em 0.5em 0em;
- padding: 0.25em 1em 0.25em 1em;
+ margin: 2px 0;
+ padding: 0 0.4em;
}
div.message-part blockquote blockquote {
diff --git a/skins/larry/settings.css b/skins/larry/settings.css
index 4cbb1550f..1ac62cd31 100644
--- a/skins/larry/settings.css
+++ b/skins/larry/settings.css
@@ -45,7 +45,7 @@
#preferences-frame {
border: 0;
- border-radius: 4px 4px 0 0;
+ border-radius: 4px;
}
#preferences-details fieldset.advanced legend {
@@ -244,7 +244,7 @@
#subscription-table tr.root td {
font-size: 5%;
- height: 5px;
+ line-height: 5px;
padding: 2px;
}
@@ -256,7 +256,7 @@
#subscription-table td.subscribed {
min-width: 30px;
- padding: 3px 12px 3px 3px;
+ padding: 0 14px 0 2px;
text-align: right;
}
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index a2cad34f1..17543c875 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -447,11 +447,16 @@ a.iconbutton.disabled {
cursor: default;
}
+a.iconbutton.searchicon,
a.iconbutton.searchoptions {
width: 24px;
background-position: -2px -317px;
}
+a.iconbutton.searchicon {
+ width: 15px;
+}
+
a.iconbutton.reset {
width: 24px;
background-position: -25px -317px;
@@ -1135,8 +1140,8 @@ a.iconlink.upload {
.uibox .listing thead td {
font-size: 12px;
font-weight: bold;
- padding: 10px 8px 3px 8px;
- height: 20px; /* doesn't affect table-cells in FF */
+ padding: 7px 8px 6px 8px;
+ line-height: 20px;
margin: 0;
text-shadow: 0px 1px 1px #fff;
border-bottom: 1px solid #bbd3da;
@@ -1178,14 +1183,13 @@ a.iconlink.upload {
text-shadow: 0px 1px 1px #fff;
text-decoration: none;
cursor: default;
- padding: 6px 8px 2px 8px;
- height: 17px; /* doesn't affect table-cells in FF */
+ padding: 4px 8px;
+ line-height: 17px;
white-space: nowrap;
}
.listing tbody td {
display: table-cell;
- padding-bottom: 5px;
height: auto;
min-height: 14px;
outline: none;
@@ -1934,6 +1938,7 @@ ul.proplist li {
font-size: 11px;
}
+.searchbox .searchicon,
.searchbox #searchmenulink,
#quicksearchbar #searchmenulink {
position: absolute;
@@ -1942,12 +1947,25 @@ ul.proplist li {
}
.searchbox #searchreset,
+.searchbox .iconbutton.reset,
#quicksearchbar #searchreset {
position: absolute;
top: 4px;
right: 1px;
}
+.listsearchbox {
+ position: relative;
+ padding: 4px;
+ background: #c7e3ef;
+}
+
+.listsearchbox input {
+ width: 100%;
+ height: 26px;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
+}
/*** toolbar ***/
@@ -2292,7 +2310,7 @@ ul.toolbarmenu li a {
text-shadow: 0px 1px 1px #333;
text-decoration: none;
min-height: 14px;
- padding: 6px 10px 6px 10px;
+ padding: 6px 16px 6px 10px;
}
.googie_list td span {
@@ -2593,6 +2611,11 @@ ul.toolbarmenu li span.copy {
margin-bottom: 1px;
}
+.attachmentslist li.txt,
+.attachmentslist li.text {
+ background-position: 0 -416px;
+}
+
.attachmentslist li.pdf {
background-position: 0 -26px;
}
@@ -2652,11 +2675,6 @@ ul.toolbarmenu li span.copy {
background-position: 0 -338px;
}
-.attachmentslist li.txt,
-.attachmentslist li.text {
- background-position: 0 -416px;
-}
-
.attachmentslist li.ics,
.attachmentslist li.calendar {
background-position: 0 -364px;
@@ -2796,3 +2814,7 @@ ul.toolbarmenu li span.copy {
margin-left: 0;
background: none;
}
+
+#image-selector-form.droptarget {
+ background: url(images/filedrop.png) center bottom no-repeat;
+}
diff --git a/skins/larry/templates/about.html b/skins/larry/templates/about.html
index e2bd0b019..b0d36d177 100644
--- a/skins/larry/templates/about.html
+++ b/skins/larry/templates/about.html
@@ -14,7 +14,7 @@
<roundcube:object name="aboutcontent" />
<h2 class="sysname">Roundcube Webmail <roundcube:object name="version" /></h2>
-<p class="copyright">Copyright &copy; 2005-2013, The Roundcube Dev Team</p>
+<p class="copyright">Copyright &copy; 2005-2014, The Roundcube Dev Team</p>
<p class="license">This program is free software; you can redistribute it and/or modify
it under the terms of the <a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GNU General Public License</a>
as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br/>
diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html
index bfa6e6d14..2812d3706 100644
--- a/skins/larry/templates/compose.html
+++ b/skins/larry/templates/compose.html
@@ -43,13 +43,13 @@
<!-- inline address book -->
<div id="compose-contacts" class="uibox listbox" role="region" aria-labelledby="aria-label-composecontacts">
<h2 id="aria-label-composecontacts" class="boxtitle"><roundcube:label name="contacts" /></h2>
- <div id="composequicksearch" role="search" aria-labelledby="aria-label-composequicksearch">
+ <div class="listsearchbox" role="search" aria-labelledby="aria-label-composequicksearch">
<h3 id="aria-label-composequicksearch" class="voice"><roundcube:label name="arialabelcontactquicksearch" /></h3>
<div class="searchbox">
<label for="contactsearchbox" class="voice"><roundcube:label name="arialabelcontactsearchbox" /></label>
<roundcube:object name="searchform" id="contactsearchbox" />
- <a id="searchmenulink" class="iconbutton searchoptions"> </a>
- <roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
+ <a id="searchmenulink" class="iconbutton searchicon"> </a>
+ <roundcube:button command="reset-search" class="iconbutton reset" title="resetsearch" content=" " />
</div>
</div>
<roundcube:object name="addressbooks" id="directorylist" class="treelist listing" summary="ariasummarycomposecontacts" />
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index 6385e73b1..47183f73b 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -490,19 +490,19 @@ function rcube_mail_ui()
w, h, bh, ovflw, btns = 0,
minheight = 300,
- bh = (form.height() - bottom.position().top);
+ bh = form.height() - bottom.position().top;
ovflw = minheight - bh;
btns = ovflw > -100 ? 0 : 40;
- bottom.css('height', Math.max(minheight, bh) + 'px');
+ bottom.height(Math.max(minheight, bh));
form.css('overflow', ovflw > 0 ? 'auto' : 'hidden');
w = body.parent().width() - 5;
- h = body.parent().height() - 16;
+ h = body.parent().height() - 8;
body.width(w).height(h);
- $('#composebody_tbl').width((w+8)+'px').height('').css('margin-top', '1px');
- $('#composebody_ifr').width((w+8)+'px').height((h-40)+'px');
- $('#googie_edit_layer').height(h+'px');
+ $('#composebodycontainer > div').width(w+8);
+ $('#composebody_ifr').height(h + 4 - $('div.mce-toolbar').height());
+ $('#googie_edit_layer').height(h - 8);
// $('#composebodycontainer')[(btns ? 'addClass' : 'removeClass')]('buttons');
// $('#composeformbuttons')[(btns ? 'show' : 'hide')]();
@@ -1412,4 +1412,4 @@ rcube_splitter.get_instance = function(id)
return rcube_splitter._instances[id];
};
-// @license-end \ No newline at end of file
+// @license-end