From 9fcddbb6bf759b1dbb669fcc9da993ddfeaad466 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 18 Apr 2018 16:42:44 +0000 Subject: [PATCH] SusiMail: Initial CSS for new buttons --- apps/susimail/src/src/i2p/susi/webmail/WebMail.java | 8 +++++--- installer/resources/themes/susimail/classic/susimail.css | 5 +++-- installer/resources/themes/susimail/light/susimail.css | 5 +++-- installer/resources/themes/susimail/midnight/susimail.css | 5 +++-- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java index 9ae77af49..6afbd039a 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java +++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java @@ -3195,7 +3195,7 @@ public class WebMail extends HttpServlet out.println("
"); String name = folderName.equals(DIR_FOLDER) ? "Inbox" : folderName; out.println(_t("Folder") + ": " + _t(name) + "    "); // TODO css to center it - out.println(button(SWITCH_TO, _t("Change to Folder"))); + out.println(button(SWITCH_TO, _t("Change to Folder") + ':')); showFolderSelect(out, folderName, false); if (pages > 1) { if (outputHidden) @@ -3230,7 +3230,9 @@ public class WebMail extends HttpServlet * @since 0.9.35 */ private static void showFolderSelect(PrintWriter out, String currentName, boolean disableCurrent) { - out.println(""); for (int i = 0; i < DIRS.length; i++) { String dir = DIRS[i]; if (currentName.equals(dir)) { @@ -3297,7 +3299,7 @@ public class WebMail extends HttpServlet if (mail.hasBody() && !mc.getFolderName().equals(DIR_DRAFTS)) { // can't move unless has body // can't move from drafts - out.println(button(MOVE_TO, _t("Move to Folder"))); + out.println(button(MOVE_TO, _t("Move to Folder") + ':')); showFolderSelect(out, mc.getFolderName(), true); } if (sessionObject.reallyDelete) diff --git a/installer/resources/themes/susimail/classic/susimail.css b/installer/resources/themes/susimail/classic/susimail.css index 8a3d654c7..6d0b88923 100644 --- a/installer/resources/themes/susimail/classic/susimail.css +++ b/installer/resources/themes/susimail/classic/susimail.css @@ -630,13 +630,14 @@ input.offline:hover, input.offline:focus { background: url(/themes/susimail/images/offline_hover.png) no-repeat 7px center, linear-gradient(to bottom, #ddd 0%, #fff 100%); } -input.list { +input.list, input.moveto, input.switchto { background: #eee url(/themes/susimail/images/folder.png) no-repeat 7px center; background: url(/themes/susimail/images/folder.png) no-repeat 7px center, linear-gradient(to bottom, #fff 0%, #ddd 100%); padding: 5px 8px 5px 24px; } -input.list:hover, input.list:focus { +input.list:hover, input.moveto:hover, input.switchto:hover, +input.list:focus, input.moveto:focus, input.switchto:focus { background: #eee url(/themes/susimail/images/folder-open.png) no-repeat 7px center; background: url(/themes/susimail/images/folder-open.png) no-repeat 7px center, linear-gradient(to bottom, #ddd 0%, #fff 100%); } diff --git a/installer/resources/themes/susimail/light/susimail.css b/installer/resources/themes/susimail/light/susimail.css index 1cd08f5dc..3110ebe49 100644 --- a/installer/resources/themes/susimail/light/susimail.css +++ b/installer/resources/themes/susimail/light/susimail.css @@ -607,13 +607,13 @@ input.offline:hover { background: url(/themes/susimail/images/offline_hover.png) no-repeat 6px center, linear-gradient(to bottom, #eee, #fff); } -input.list { +input.list, input.moveto, input.switchto { background: #eee url(/themes/susimail/images/folder.png) no-repeat 6px center; background: url(/themes/susimail/images/folder.png) no-repeat 6px center, linear-gradient(to bottom, #fff, #efefff); padding: 5px 7px 5px 24px; } -input.list:hover { +input.list:hover, input.moveto:hover, input.switchto:hover { background: #eee url(/themes/susimail/images/folder-open.png) no-repeat 6px center; background: url(/themes/susimail/images/folder-open.png) no-repeat 6px center, linear-gradient(to bottom, #eee, #fff); } @@ -1174,6 +1174,7 @@ h3#config { float: none !important; } +.topbuttons select.select1, .topbuttons input.new, .topbuttons input.refresh, .topbuttons input.logout, .topbuttons input.reply, .topbuttons input.replyall, .topbuttons input.forward, .topbuttons input.saveas, .topbuttons input.delete { float: left; diff --git a/installer/resources/themes/susimail/midnight/susimail.css b/installer/resources/themes/susimail/midnight/susimail.css index 8d91e6c10..1c1f70bfd 100644 --- a/installer/resources/themes/susimail/midnight/susimail.css +++ b/installer/resources/themes/susimail/midnight/susimail.css @@ -1071,13 +1071,14 @@ input.offline:hover, input.offline:focus { background: #000 url(/themes/susimail/images/offline_hover.png) no-repeat 6px center !important; } -input.list { +input.list, input.moveto, input.switchto { background: #000 url(/themes/susimail/images/folder.png) no-repeat 6px center !important; background: url(/themes/susimail/images/folder.png) no-repeat 6px center, linear-gradient(to bottom, #1f1e32, #090812 50%, #000 50%) !important; padding: 5px 7px 5px 23px !important; } -input.list:hover, input.list:focus { +input.list:hover, input.moveto:hover, input.switchto:hover, +input.list:focus, input.moveto:focus, input.switchto:focus { background: #000 url(/themes/susimail/images/folder-open.png) no-repeat 6px center !important; }