2016-06-19 19:25:46 +10:00
|
|
|
/*
|
|
|
|
|
* Copyright 2016 Software Freedom Conservancy Inc.
|
2017-10-04 17:43:18 +11:00
|
|
|
* Copyright 2016, 2017 Michael Gratton <mike@vee.net>
|
2016-06-19 19:25:46 +10:00
|
|
|
*
|
|
|
|
|
* This software is licensed under the GNU Lesser General Public License
|
|
|
|
|
* (version 2.1 or later). See the COPYING file in this distribution.
|
|
|
|
|
*/
|
|
|
|
|
|
2017-11-08 18:13:51 +11:00
|
|
|
/* MainWindow */
|
|
|
|
|
|
2016-06-18 16:07:55 +02:00
|
|
|
.geary-folder-frame > border {
|
|
|
|
|
border-left-width: 0;
|
|
|
|
|
border-top-width: 0;
|
|
|
|
|
border-right-width: 0;
|
|
|
|
|
}
|
|
|
|
|
.geary-conversation-frame > border {
|
|
|
|
|
border-left-width: 0;
|
|
|
|
|
border-top-width: 0;
|
|
|
|
|
border-right-width: 0;
|
|
|
|
|
}
|
|
|
|
|
/* For 3-pane mode only */
|
|
|
|
|
.geary-sidebar-pane-separator.vertical .conversation-frame > border {
|
|
|
|
|
border-bottom-width: 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
.geary-composer-box > border {
|
|
|
|
|
border-width: 0px;
|
|
|
|
|
}
|
|
|
|
|
.geary-composer-body > border {
|
|
|
|
|
border-left-width: 0;
|
|
|
|
|
border-right-width: 0;
|
|
|
|
|
border-bottom-width: 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
.geary-titlebar-left:dir(ltr),
|
|
|
|
|
.geary-titlebar-right:dir(rtl) {
|
|
|
|
|
border-top-right-radius: 0px;
|
|
|
|
|
}
|
|
|
|
|
.geary-titlebar-right:dir(ltr),
|
|
|
|
|
.geary-titlebar-left:dir(rtl) {
|
|
|
|
|
border-top-left-radius: 0px;
|
|
|
|
|
}
|
2016-06-20 05:43:07 +02:00
|
|
|
|
2017-11-08 18:13:51 +11:00
|
|
|
/* MainWindowInfoBarSet */
|
|
|
|
|
|
|
|
|
|
.geary-info-bar-frame > border {
|
|
|
|
|
border-top-width: 0;
|
|
|
|
|
border-left-width: 0;
|
|
|
|
|
border-right-width: 0;
|
|
|
|
|
}
|
|
|
|
|
|
2016-07-26 23:32:27 +10:00
|
|
|
/* FolderPopover */
|
|
|
|
|
|
2016-06-20 05:43:07 +02:00
|
|
|
row.geary-folder-popover-list-row {
|
|
|
|
|
padding: 6px;
|
|
|
|
|
border-color: @borders;
|
|
|
|
|
border-style: groove;
|
|
|
|
|
border-bottom-width: 1px;
|
|
|
|
|
}
|
|
|
|
|
row.geary-folder-popover-list-row > label {
|
|
|
|
|
color: @theme_text_color;
|
|
|
|
|
}
|
2016-04-09 18:06:41 +10:00
|
|
|
|
2016-07-26 23:32:27 +10:00
|
|
|
/* ConversationListBox */
|
|
|
|
|
|
2016-07-25 10:33:42 +10:00
|
|
|
.conversation-listbox {
|
2016-04-16 23:59:19 +10:00
|
|
|
padding: 18px;
|
2016-04-09 18:06:41 +10:00
|
|
|
}
|
2016-07-25 10:33:42 +10:00
|
|
|
.conversation-listbox > row {
|
2016-04-09 18:06:41 +10:00
|
|
|
margin: 0;
|
2016-04-15 02:15:44 +10:00
|
|
|
border: 1px solid @borders;
|
|
|
|
|
border-bottom-width: 0;
|
2016-04-09 18:06:41 +10:00
|
|
|
padding: 0;
|
|
|
|
|
box-shadow: 0 4px 8px 1px rgba(0,0,0,0.4);
|
Reenable displaying sub-messages.
Geary currently displays RFC 822 attachments inline, below the email's
primary message body, using the same HTML chrome for the headers and
email body as for the primary body. Taking the same approach but using
GTK+ widgets meant splitting ConversationMessage up into a
ConversationEmail class that manages the UI for displaying an email in
its entirety, and a ConversationMessage to manage the only header widgets
and webview for displaying an individual RFC 822 message, usable for both
the primary body and any sub-messages. Thus, this is a big change.
One behavioural change is that each sub-message with remote images now
requires individual approval, rather than being dependant on the
containing message's sender and/or approval. This prevents some attacks
e.g. a trusted sender forwarding a spam/malware message, but does not
prevent it if the message is forwarded inline, obviosuly.
* src/client/conversation-viewer/conversation-email.vala (ConversationEmail):
New class for managing the UI for an overall email message. This
replaces the old ConversationMessage and contains much of it's code and
widgets - anything from that class which does not directly support
displaying headers or a message body.
* src/client/conversation-viewer/conversation-message.vala:
(ConversationMessage): Same class as before, but now with its scope
narrowed to only display message headers and body. The draft infobar
remains here rather than being put ConversationEmail where it belongs
since it's bit of a pain to insert in the right place and doesn't
really hurt.
(::email): Moved this property and any code that depends on it to
ConversationEmail.
(::always_load_remote_images): New property passed in via the ctor,
allowing one dependency on the old ::email property to be removed.
(::inlined_content_ids): Moved to ConversationEmail, since that is the
class that keeps track of attachments to display. Add the signal
attachment_displayed_inline to allow ConversationEmail to be notified
of inlined attachments instead.
(::flag_remote_images, ::remember_remote_images): New signals to notify
ConversationEmail that the user has flagged this message or the
message's sender for loading remote images. This is passed through
since in the former's case we may need to set flags on the email
itself, the latter because it is one less use of the contact_store
property, which should be removed from this class at some point.
* src/client/conversation-viewer/conversation-viewer.vala: Chase API
changes from the above. In general, replace use of the term "message"
with "email" since this class is now mostly dealing with
ConversationEmail instances, rather than ConversationMessage instances.
(ConversationViewer::check_mark_read): Only consider the
ConversationEmail's primary message body when checking for visibility
rather than that and any submessages to keep things simple.
(ConversationViewer::show_message, ::hide_message): Renamed to
expand_email/collapse_email respectively since we don't ever actually
hide it. Carry that change on to same methods on ConversationEmail.
* src/engine/rfc822/rfc822-message.vala (Geary.RFC822.Message): Add
get_primary_originator(), almost vermatim from Geary.Email, to support
determining the sender for remembering remote message loading for
senders of sub-emails.
* src/client/components/main-window.vala (MainWindow::set_styling): Fix
background transition for collapsed emails.
* src/client/application/geary-controller.vala: Chase API name changes.
* src/CMakeLists.txt: Include new ConversationEmail source file.
* ui/conversation-email.ui: New UI for ConversationEmail, move the email
action box, attachments box amd sub-messages box here from
conversation-message.ui.
* ui/CMakeLists.txt: Include new UI in compiled resources.
* po/POTFILES.in: Add new UI for transation.
2016-04-19 16:52:34 +10:00
|
|
|
transition: margin 0.1s;
|
2016-04-15 02:15:44 +10:00
|
|
|
}
|
2016-09-25 22:53:34 +10:00
|
|
|
.conversation-listbox > row > box {
|
2016-07-08 11:12:42 +10:00
|
|
|
background: @theme_base_color;
|
Reenable displaying sub-messages.
Geary currently displays RFC 822 attachments inline, below the email's
primary message body, using the same HTML chrome for the headers and
email body as for the primary body. Taking the same approach but using
GTK+ widgets meant splitting ConversationMessage up into a
ConversationEmail class that manages the UI for displaying an email in
its entirety, and a ConversationMessage to manage the only header widgets
and webview for displaying an individual RFC 822 message, usable for both
the primary body and any sub-messages. Thus, this is a big change.
One behavioural change is that each sub-message with remote images now
requires individual approval, rather than being dependant on the
containing message's sender and/or approval. This prevents some attacks
e.g. a trusted sender forwarding a spam/malware message, but does not
prevent it if the message is forwarded inline, obviosuly.
* src/client/conversation-viewer/conversation-email.vala (ConversationEmail):
New class for managing the UI for an overall email message. This
replaces the old ConversationMessage and contains much of it's code and
widgets - anything from that class which does not directly support
displaying headers or a message body.
* src/client/conversation-viewer/conversation-message.vala:
(ConversationMessage): Same class as before, but now with its scope
narrowed to only display message headers and body. The draft infobar
remains here rather than being put ConversationEmail where it belongs
since it's bit of a pain to insert in the right place and doesn't
really hurt.
(::email): Moved this property and any code that depends on it to
ConversationEmail.
(::always_load_remote_images): New property passed in via the ctor,
allowing one dependency on the old ::email property to be removed.
(::inlined_content_ids): Moved to ConversationEmail, since that is the
class that keeps track of attachments to display. Add the signal
attachment_displayed_inline to allow ConversationEmail to be notified
of inlined attachments instead.
(::flag_remote_images, ::remember_remote_images): New signals to notify
ConversationEmail that the user has flagged this message or the
message's sender for loading remote images. This is passed through
since in the former's case we may need to set flags on the email
itself, the latter because it is one less use of the contact_store
property, which should be removed from this class at some point.
* src/client/conversation-viewer/conversation-viewer.vala: Chase API
changes from the above. In general, replace use of the term "message"
with "email" since this class is now mostly dealing with
ConversationEmail instances, rather than ConversationMessage instances.
(ConversationViewer::check_mark_read): Only consider the
ConversationEmail's primary message body when checking for visibility
rather than that and any submessages to keep things simple.
(ConversationViewer::show_message, ::hide_message): Renamed to
expand_email/collapse_email respectively since we don't ever actually
hide it. Carry that change on to same methods on ConversationEmail.
* src/engine/rfc822/rfc822-message.vala (Geary.RFC822.Message): Add
get_primary_originator(), almost vermatim from Geary.Email, to support
determining the sender for remembering remote message loading for
senders of sub-emails.
* src/client/components/main-window.vala (MainWindow::set_styling): Fix
background transition for collapsed emails.
* src/client/application/geary-controller.vala: Chase API name changes.
* src/CMakeLists.txt: Include new ConversationEmail source file.
* ui/conversation-email.ui: New UI for ConversationEmail, move the email
action box, attachments box amd sub-messages box here from
conversation-message.ui.
* ui/CMakeLists.txt: Include new UI in compiled resources.
* po/POTFILES.in: Add new UI for transation.
2016-04-19 16:52:34 +10:00
|
|
|
transition: background 0.25s;
|
2016-04-16 23:59:19 +10:00
|
|
|
}
|
2016-09-25 22:53:34 +10:00
|
|
|
.conversation-listbox > row:hover > box {
|
2016-07-08 11:12:42 +10:00
|
|
|
background: shade(@theme_base_color, 0.96);
|
2016-04-09 18:06:41 +10:00
|
|
|
}
|
2016-07-25 10:33:42 +10:00
|
|
|
.conversation-listbox > row.geary-expanded {
|
2016-07-08 16:29:19 +10:00
|
|
|
margin-bottom: 6px;
|
2016-04-09 18:06:41 +10:00
|
|
|
border-bottom-width: 1px;
|
|
|
|
|
}
|
2017-02-23 11:06:05 +11:00
|
|
|
.conversation-listbox *.geary-matched *.geary-match {
|
2016-09-12 22:27:49 +10:00
|
|
|
color: @theme_selected_fg_color;
|
|
|
|
|
background: @theme_selected_bg_color;
|
|
|
|
|
}
|
2016-07-25 10:33:42 +10:00
|
|
|
.conversation-listbox > row.geary-last {
|
2016-04-16 23:59:19 +10:00
|
|
|
margin-bottom: 0;
|
|
|
|
|
}
|
2016-04-09 18:06:41 +10:00
|
|
|
|
2016-08-19 23:49:40 +10:00
|
|
|
/* ConversationEmail */
|
|
|
|
|
|
2016-12-08 22:08:39 +11:00
|
|
|
.geary-unread grid.geary-message-summary {
|
2016-08-19 23:49:40 +10:00
|
|
|
border-color: @theme_selected_bg_color;
|
|
|
|
|
transition: border 0.25s;
|
|
|
|
|
}
|
|
|
|
|
|
2016-07-26 23:32:27 +10:00
|
|
|
/* ConversationMessage */
|
|
|
|
|
|
2016-12-08 22:08:39 +11:00
|
|
|
grid.geary-message-summary {
|
2016-08-19 23:49:40 +10:00
|
|
|
border-top: 4px solid transparent;
|
|
|
|
|
padding: 12px;
|
|
|
|
|
padding-top: 8px;
|
|
|
|
|
transition: border 4s;
|
2016-04-09 18:06:41 +10:00
|
|
|
}
|
2016-07-26 23:32:27 +10:00
|
|
|
|
|
|
|
|
.geary-headers label {
|
|
|
|
|
margin: 0;
|
|
|
|
|
padding: 1px;
|
|
|
|
|
}
|
2017-12-11 21:42:55 +11:00
|
|
|
.geary-headers label.geary-header:dir(ltr) {
|
2016-07-26 23:32:27 +10:00
|
|
|
padding-right: 6px;
|
2016-04-09 18:06:41 +10:00
|
|
|
}
|
2017-12-11 21:42:55 +11:00
|
|
|
.geary-headers label.geary-header:dir(rtl) {
|
|
|
|
|
padding-left: 6px;
|
|
|
|
|
}
|
2016-07-26 23:32:27 +10:00
|
|
|
.geary-headers flowboxchild {
|
|
|
|
|
margin: 0;
|
|
|
|
|
padding: 1px;
|
|
|
|
|
}
|
|
|
|
|
.geary-headers flowboxchild label {
|
2016-06-10 10:56:18 -07:00
|
|
|
margin: 0;
|
|
|
|
|
padding: 0;
|
|
|
|
|
}
|
2016-07-26 23:32:27 +10:00
|
|
|
|
2016-10-08 16:07:35 +11:00
|
|
|
.geary-headers label.geary-from {
|
|
|
|
|
font-weight: bold;
|
|
|
|
|
}
|
|
|
|
|
|
2016-12-08 22:08:39 +11:00
|
|
|
.geary-header-value > flowboxchild:active {
|
2016-10-08 17:32:40 +11:00
|
|
|
background: mix(@theme_base_color, @theme_bg_color, 0.5);
|
|
|
|
|
}
|
|
|
|
|
|
2016-12-08 22:08:39 +11:00
|
|
|
.geary-header-value > flowboxchild:hover {
|
2016-10-08 17:32:40 +11:00
|
|
|
background: @theme_base_color;
|
|
|
|
|
}
|
|
|
|
|
|
2017-12-11 21:42:55 +11:00
|
|
|
.geary-header-value > flowboxchild label.dim-label:dir(ltr) {
|
2017-10-04 17:43:18 +11:00
|
|
|
margin-left: 6px;
|
2016-10-08 17:32:40 +11:00
|
|
|
}
|
2017-12-11 21:42:55 +11:00
|
|
|
.geary-header-value > flowboxchild label.dim-label:dir(rtl) {
|
|
|
|
|
margin-right: 6px;
|
|
|
|
|
}
|
|
|
|
|
|
2016-10-08 17:32:40 +11:00
|
|
|
|
2016-07-08 11:12:42 +10:00
|
|
|
.geary-submessages .geary-message {
|
|
|
|
|
background-image: linear-gradient(rgba(0,0,0,0.2), @bg_color 6px);
|
2016-04-13 00:08:14 +10:00
|
|
|
}
|
2016-04-12 01:06:09 +10:00
|
|
|
|
2016-07-26 23:32:27 +10:00
|
|
|
/* Composer */
|
|
|
|
|
|
2016-07-08 16:27:44 +10:00
|
|
|
.geary-composer-embed headerbar {
|
|
|
|
|
border-top: 1px solid @borders;
|
2016-04-12 01:06:09 +10:00
|
|
|
border-radius: 0px;
|
|
|
|
|
}
|
2016-04-15 02:18:01 +10:00
|
|
|
|
2016-07-26 23:32:27 +10:00
|
|
|
/* EmptyPlaceholder */
|
|
|
|
|
|
2016-07-25 10:33:42 +10:00
|
|
|
.geary-empty-placeholder > image {
|
|
|
|
|
margin-bottom: 12px;
|
|
|
|
|
}
|
|
|
|
|
.geary-empty-placeholder > .title {
|
|
|
|
|
font-weight: bold;
|
2016-04-15 02:18:01 +10:00
|
|
|
}
|