Compare commits

..

No commits in common. "55b46ff929d269b14364dd55377c435f433a2ce3" and "e0d0ede2ce5468c525193465b0092a1c10518eb6" have entirely different histories.

8 changed files with 78 additions and 36 deletions

10
Cargo.lock generated
View File

@ -2469,7 +2469,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "letterbox"
version = "0.0.48"
version = "0.0.47"
dependencies = [
"build-info",
"build-info-build",
@ -2988,7 +2988,7 @@ dependencies = [
[[package]]
name = "notmuch"
version = "0.0.48"
version = "0.0.47"
dependencies = [
"itertools 0.10.5",
"log",
@ -3625,7 +3625,7 @@ dependencies = [
[[package]]
name = "procmail2notmuch"
version = "0.0.48"
version = "0.0.47"
dependencies = [
"anyhow",
]
@ -4547,7 +4547,7 @@ dependencies = [
[[package]]
name = "server"
version = "0.0.48"
version = "0.0.47"
dependencies = [
"ammonia",
"anyhow",
@ -4646,7 +4646,7 @@ dependencies = [
[[package]]
name = "shared"
version = "0.0.48"
version = "0.0.47"
dependencies = [
"build-info",
"notmuch",

View File

@ -1,6 +1,6 @@
[package]
name = "notmuch"
version = "0.0.48"
version = "0.0.47"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View File

@ -1,6 +1,6 @@
[package]
name = "procmail2notmuch"
version = "0.0.48"
version = "0.0.47"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View File

@ -1,6 +1,6 @@
[package]
name = "server"
version = "0.0.48"
version = "0.0.47"
edition = "2021"
default-run = "server"

View File

@ -1,6 +1,6 @@
[package]
name = "shared"
version = "0.0.48"
version = "0.0.47"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View File

@ -1,5 +1,5 @@
[package]
version = "0.0.48"
version = "0.0.47"
name = "letterbox"
repository = "https://github.com/seed-rs/seed-quickstart"
authors = ["Bill Thiede <git@xinu.tv>"]

View File

@ -387,13 +387,12 @@ fn render_avatar(avatar: Option<String>, from: &str, big: bool) -> Node<Msg> {
.collect();
let from_color = compute_color(from);
let size = if big {
C!["w-16", "h-16", "text-4xl"]
C!["w-16", "h-16", "text-5xl"]
} else {
C!["w-8", "h-8", "text-l"]
C!["w-8", "h-8", "text-xl"]
};
div![
C![
"[text-shadow:_0_1px_0_rgb(0_0_0_/_40%)]",
"font-extrabold",
"grid",
"place-content-center",
@ -492,12 +491,9 @@ fn render_open_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Node<
div![avatar],
div![
C!["px-4", "mr-auto"],
span![
C!["font-semibold", "text-sm"],
&from,
span![C!["font-semibold", "text-sm"], &from],
" ",
from_detail.as_ref().map(|text| copy_text_widget(&text))
],
from_detail.as_ref().map(|text| copy_text_widget(&text)),
IF!(!msg.to.is_empty() =>div![
C!["text-xs"],
span![
@ -510,7 +506,13 @@ fn render_open_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Node<
span![
name.as_ref().unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown)),
" ",
addr.as_ref().map(|addr| copy_text_widget(&addr)),
span![
i![C!["far", "fa-clone"]],
addr.clone().map(|addr| ev(Ev::Click, move |e| {
e.stop_propagation();
Msg::CopyToClipboard(addr)
}))
],
" "
]
})
@ -528,7 +530,13 @@ fn render_open_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Node<
span![
name.as_ref().unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown)),
" ",
addr.as_ref().map(|addr| copy_text_widget(&addr)),
span![
i![C!["far", "fa-clone"]],
addr.clone().map(|addr| ev(Ev::Click, move |e| {
e.stop_propagation();
Msg::CopyToClipboard(addr)
}))
],
" "
]
})
@ -574,15 +582,14 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
let is_unread = has_unread(&msg.tags);
let avatar = render_avatar(avatar, &from, false);
let unknown = "UNKNOWN".to_string();
div![
div![figure![
C!["flex"],
div![avatar],
div![
C!["px-4"],
C!["w-fit"],
span![C!["font-semibold", "text-sm"], &from],
C!["px-4", "mr-auto"],
div![C!["font-semibold", "text-sm"], &from],
" ",
IF!(!msg.to.is_empty() => div![
IF!(!msg.to.is_empty() => span![
C!["text-xs"],
span![
C!["font-semibold"],
@ -599,18 +606,21 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
],
" "
]),
IF!(!msg.cc.is_empty() => div![
C!["text-xs", "max-w-full", "overflow-clip", "text-ellipsis"],
IF!(!msg.cc.is_empty() => span![
C!["text-xs"],
span![
C!["font-semibold"],
"CC: "
],
span![
msg.cc.iter().enumerate().map(|(i, cc)| {
let ShowThreadQueryThreadOnEmailThreadMessagesCc { name, addr } = cc;
span![
if i > 0 { ", " } else { "" },
name.as_ref().unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown))
, " "]
]
})
]
])
],
span![
@ -632,13 +642,13 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
Msg::SetUnread(id, !is_unread)
}),
]
]
]]
}
fn message_render(msg: &ShowThreadQueryThreadOnEmailThreadMessages, open: bool) -> Node<Msg> {
let expand_id = msg.id.clone();
div![
C!["message", "p-4" "bg-grey-900"],
C!["message"],
div![
C!["header"],
if open {

View File

@ -41,6 +41,38 @@
}
}
.message {
display: inline-block;
padding: 0.5em;
width: 100%;
}
.message .header table td {
border: 0;
padding: 0;
}
.message .header .media-right {
padding: 1rem;
}
.message .headers {
position: relative;
width: 100%;
}
.message .headers .read-status {
position: absolute;
right: 1em;
top: 0em;
}
.message .headers .header {
overflow: clip;
text-overflow: ellipsis;
white-space: nowrap;
}
.message .body {
background: white;
color: black;