From bbdd624e12f58884f3363e94077e470980ff57bc Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Thu, 24 Jan 2013 19:27:12 +0100 Subject: Added embed.css for classic skin, improved/unified warnings style (button is still different), cleanup --- skins/classic/embed.css | 35 +++++++++++++++++++++++++++++++++++ skins/larry/addressbook.css | 2 -- skins/larry/embed.css | 10 +++++----- skins/larry/iehacks.css | 2 -- skins/larry/mail.css | 4 +--- skins/larry/print.css | 2 -- skins/larry/styles.css | 2 -- skins/larry/svggradients.css | 2 -- 8 files changed, 41 insertions(+), 18 deletions(-) create mode 100644 skins/classic/embed.css diff --git a/skins/classic/embed.css b/skins/classic/embed.css new file mode 100644 index 000000000..b9715c77c --- /dev/null +++ b/skins/classic/embed.css @@ -0,0 +1,35 @@ +/** + * Roundcube webmail "embedded" stylesheets + * + * Copyright (c) 2013, The Roundcube Dev Team + * + * The contents are subject to the Creative Commons Attribution-ShareAlike + * License. It is allowed to copy, distribute, transmit and to adapt the work + * by keeping credits to the original autors in the README file. + * See http://creativecommons.org/licenses/by-sa/3.0/ for details. + */ + +.rcmail-inline-message { + font-family: sans-serif; + font-size: 14px; + color: #000; + margin-bottom: .8em; + min-height: 20px; + padding: 10px 10px 6px 46px; + background: url(images/display/icons.png) 6px 3px no-repeat #F7FDCB; + border: 1px solid #C2D071; +} + +.rcmail-inline-message > button { + margin-left: 1em; + vertical-align: baseline; +} + +.rcmail-inline-message em { + font-size: 90%; + color: #666; +} + +.rcmail-inline-buttons { + margin-bottom: 0; +} diff --git a/skins/larry/addressbook.css b/skins/larry/addressbook.css index 74bc0d7d8..54fabfa8b 100644 --- a/skins/larry/addressbook.css +++ b/skins/larry/addressbook.css @@ -8,8 +8,6 @@ * License. It is allowed to copy, distribute, transmit and to adapt the work * by keeping credits to the original autors in the README file. * See http://creativecommons.org/licenses/by-sa/3.0/ for details. - * - * $Id$ */ #addressview-left { diff --git a/skins/larry/embed.css b/skins/larry/embed.css index 8c4e95d42..2c8ba39dc 100644 --- a/skins/larry/embed.css +++ b/skins/larry/embed.css @@ -11,11 +11,12 @@ .rcmail-inline-message { font-family: sans-serif; - font-size: 14px; - color: #333; + font-size: 11px; + font-weight: bold; + color: #996600; border: 1px solid #ffdf0e; - background-color: #fef893; - padding: 0.6em 1em; + background: url("images/messages.png") no-repeat scroll 5px -83px #fef893; + padding: 6px 12px 4px 30px; margin-bottom: 0.8em; } @@ -26,7 +27,6 @@ .rcmail-inline-message em { font-size: 90%; - color: #666; } .rcmail-inline-buttons { diff --git a/skins/larry/iehacks.css b/skins/larry/iehacks.css index 357ea220f..871cce4fd 100644 --- a/skins/larry/iehacks.css +++ b/skins/larry/iehacks.css @@ -7,8 +7,6 @@ * License. It is allowed to copy, distribute, transmit and to adapt the work * by keeping credits to the original autors in the README file. * See http://creativecommons.org/licenses/by-sa/3.0/ for details. - * - * $Id$ */ input.button { diff --git a/skins/larry/mail.css b/skins/larry/mail.css index 33e66d10e..ca8ac62c8 100644 --- a/skins/larry/mail.css +++ b/skins/larry/mail.css @@ -8,8 +8,6 @@ * License. It is allowed to copy, distribute, transmit and to adapt the work * by keeping credits to the original autors in the README file. * See http://creativecommons.org/licenses/by-sa/3.0/ for details. - * - * $Id$ */ #mailview-left { @@ -987,7 +985,7 @@ div.hide-headers { color: #960; border: 1px solid #ffdf0e; background-color: #fef893; - background-position: 5px -85px; + background-position: 5px -83px; padding: 6px 12px 4px 30px; white-space: normal; } diff --git a/skins/larry/print.css b/skins/larry/print.css index fa256746b..6481ea9e6 100644 --- a/skins/larry/print.css +++ b/skins/larry/print.css @@ -7,8 +7,6 @@ * License. It is allowed to copy, distribute, transmit and to adapt the work * by keeping credits to the original autors in the README file. * See http://creativecommons.org/licenses/by-sa/3.0/ for details. - * - * $Id$ */ body { font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif; diff --git a/skins/larry/styles.css b/skins/larry/styles.css index 60f874a23..7c44e9f5a 100644 --- a/skins/larry/styles.css +++ b/skins/larry/styles.css @@ -8,8 +8,6 @@ * License. It is allowed to copy, distribute, transmit and to adapt the work * by keeping credits to the original autors in the README file. * See http://creativecommons.org/licenses/by-sa/3.0/ for details. - * - * $Id$ */ body { diff --git a/skins/larry/svggradients.css b/skins/larry/svggradients.css index 06c6f4732..2172ac31a 100644 --- a/skins/larry/svggradients.css +++ b/skins/larry/svggradients.css @@ -7,8 +7,6 @@ * License. It is allowed to copy, distribute, transmit and to adapt the work * by keeping credits to the original autors in the README file. * See http://creativecommons.org/licenses/by-sa/3.0/ for details. - * - * $Id$ */ input.button { -- cgit v1.2.3 From 01fc82d0efa913892ea407462c8725645ae08621 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Fri, 25 Jan 2013 11:49:21 +0100 Subject: Fix new browser window size in Chrome (#1488931), make new windows smaller --- program/js/app.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/program/js/app.js b/program/js/app.js index ce17245e1..989024d7d 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -583,11 +583,11 @@ function rcube_webmail() var prevstate = this.env.compose_extwin; $("input[name='_action']", this.gui_objects.messageform).val('compose'); this.gui_objects.messageform.action = this.url('mail/compose', { _id: this.env.compose_id, _extwin: 1 }); - this.gui_objects.messageform.target = this.open_window('', 1150, 900); + this.gui_objects.messageform.target = this.open_window('', 1100, 900); this.gui_objects.messageform.submit(); } else { - this.open_window(this.env.permaurl, 1000, 1200); + this.open_window(this.env.permaurl, 900, 900); } break; @@ -1679,11 +1679,10 @@ function rcube_webmail() var w = Math.min(width, screen.width - 10), h = Math.min(height, screen.height - 100), l = (screen.width - w) / 2 + (screen.left || 0), - t = Math.max(0, (screen.height - h) / 2 + (screen.top || 0) - 20); - - var wname = 'rcmextwin' + new Date().getTime(), - extwin = window.open(url + '&_extwin=1', wname, 'width='+w+',height='+h+',top='+t+',left='+l+',resizable=yes,toolbar=no,status=no'); - extwin.moveTo(l,t); + t = Math.max(0, (screen.height - h) / 2 + (screen.top || 0) - 20), + wname = 'rcmextwin' + new Date().getTime(), + extwin = window.open(url + '&_extwin=1', wname, + 'width='+w+',height='+h+',top='+t+',left='+l+',resizable=yes,toolbar=no,status=no,location=no'); // write loading... message to empty windows if (!url && extwin.document) { @@ -1691,7 +1690,9 @@ function rcube_webmail() } // focus window, delayed to bring to front - window.setTimeout(function(){ extwin.focus(); }, 10); + window.setTimeout(function() { extwin.focus(); }, 10); + // position window with setTimeout for Chrome (#1488931) + window.setTimeout(function() { extwin.moveTo(l,t); }, bw.chrome ? 100 : 10); return wname; }; -- cgit v1.2.3 From 18372a236d459f2a098c8604a0f912f9aa728f98 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Fri, 25 Jan 2013 12:36:50 +0100 Subject: Send LOGOUT only when closing connection in logged state (#1487784) --- program/lib/Roundcube/rcube_imap_generic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php index 8d84bf736..b9a796c33 100644 --- a/program/lib/Roundcube/rcube_imap_generic.php +++ b/program/lib/Roundcube/rcube_imap_generic.php @@ -906,7 +906,7 @@ class rcube_imap_generic */ function closeConnection() { - if ($this->putLine($this->nextTag() . ' LOGOUT')) { + if ($this->logged && $this->putLine($this->nextTag() . ' LOGOUT')) { $this->readReply(); } -- cgit v1.2.3