mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-08-31 13:09:21 +03:00
Merge branch 'master' into addressbook
# Conflicts: # snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
This commit is contained in:
commit
f46e996570
138 changed files with 2587 additions and 1016 deletions
|
|
@ -142,6 +142,13 @@ html.rl-side-preview-pane {
|
|||
}
|
||||
}
|
||||
|
||||
#top-system-dropdown-id::after,
|
||||
#move-dropdown-id.dropdown-toggle::after,
|
||||
#button-add-prop-dropdown-id::after {
|
||||
content: '▼';
|
||||
font-size: 80%;
|
||||
}
|
||||
|
||||
.dropdown-menu * + .dividerbar {
|
||||
margin-top: 9px;
|
||||
padding-top: 9px;
|
||||
|
|
@ -166,9 +173,6 @@ html.rl-side-preview-pane {
|
|||
|
||||
.btn-group.open .btn.btn-transparent.dropdown-toggle {
|
||||
color: #BD362F;
|
||||
.caret {
|
||||
border-top-color: #BD362F;
|
||||
}
|
||||
}
|
||||
|
||||
.btn-group > .btn.single {
|
||||
|
|
|
|||
26
dev/Styles/User/MessageFlags.less
Normal file
26
dev/Styles/User/MessageFlags.less
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
/* RFC8457 */
|
||||
.msgflag-\$important .checkboxMessage { background-color: #F00; color: #fff; }
|
||||
.msgflag-\$important.focused { background-color: rgba(255, 0, 0, 0.30); }
|
||||
.msgflag-\$important:not(.focused) { color: #F00; }
|
||||
|
||||
/* KMail tags */
|
||||
.msgflag-\$todo .checkboxMessage { background-color: #00F; color: #fff; }
|
||||
.msgflag-\$todo.focused { background-color: rgba( 64, 64, 255, 0.30); }
|
||||
.msgflag-\$todo:not(.focused) { color: #33F; }
|
||||
|
||||
/* Thunderbird labels */
|
||||
.msgflag-\$label5 .checkboxMessage { background-color: #808; color: #fff; }
|
||||
.msgflag-\$label4 .checkboxMessage { background-color: #00F; color: #fff; }
|
||||
.msgflag-\$label3 .checkboxMessage { background-color: #080; color: #fff; }
|
||||
.msgflag-\$label2 .checkboxMessage { background-color: #FA0; color: #fff; }
|
||||
.msgflag-\$label1 .checkboxMessage { background-color: #F00; color: #fff; }
|
||||
.msgflag-\$label5.focused { background-color: rgba(255, 0, 255, 0.30); }
|
||||
.msgflag-\$label4.focused { background-color: rgba( 64, 64, 255, 0.30); }
|
||||
.msgflag-\$label3.focused { background-color: rgba( 0, 255, 0, 0.30); }
|
||||
.msgflag-\$label2.focused { background-color: rgba(255, 170, 0, 0.30); }
|
||||
.msgflag-\$label1.focused { background-color: rgba(255, 0, 0, 0.30); }
|
||||
.msgflag-\$label5:not(.focused) { color: #939; }
|
||||
.msgflag-\$label4:not(.focused) { color: #33F; }
|
||||
.msgflag-\$label3:not(.focused) { color: #090; }
|
||||
.msgflag-\$label2:not(.focused) { color: #F90; }
|
||||
.msgflag-\$label1:not(.focused) { color: #F00; }
|
||||
|
|
@ -188,7 +188,7 @@ html:not(rl-mobile) {
|
|||
flex-wrap: wrap;
|
||||
|
||||
position: relative;
|
||||
font-size: 12px;
|
||||
font-size: 13px;
|
||||
overflow: hidden;
|
||||
cursor: pointer;
|
||||
|
||||
|
|
@ -211,16 +211,11 @@ html:not(rl-mobile) {
|
|||
border-left-color: #ccc;
|
||||
}
|
||||
|
||||
.importantMark {
|
||||
color:red;
|
||||
margin-right:5px
|
||||
}
|
||||
|
||||
&.flag-\\deleted {
|
||||
opacity: .7;
|
||||
.subjectParent {
|
||||
text-decoration: line-through;
|
||||
}
|
||||
.priorityHigh::before {
|
||||
content: '!'; /*❗*/
|
||||
color: red;
|
||||
font-weight: bolder;
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
&.deleted {
|
||||
|
|
@ -276,7 +271,7 @@ html:not(rl-mobile) {
|
|||
opacity: 0.5;
|
||||
}
|
||||
|
||||
.threads-len span {
|
||||
.threads-len {
|
||||
border-radius: 6px;
|
||||
border: 1px solid #ccc;
|
||||
font-size: 11px;
|
||||
|
|
@ -287,6 +282,9 @@ html:not(rl-mobile) {
|
|||
border-color: #666;
|
||||
}
|
||||
}
|
||||
.threads-len::after {
|
||||
content: ' ›';
|
||||
}
|
||||
|
||||
.replyFlag, .forwardFlag {
|
||||
margin-right: 0.25em;
|
||||
|
|
@ -329,26 +327,41 @@ html:not(rl-mobile) {
|
|||
border-bottom-color: rgba(57, 140, 242, 0.2);
|
||||
border-left-color: #398CF2;
|
||||
z-index: 101;
|
||||
|
||||
+ .messageListItem {
|
||||
border-bottom-color: rgba(57, 140, 242, 0.3);
|
||||
}
|
||||
}
|
||||
|
||||
.flagParent {
|
||||
padding: 0 10px 0 5px;
|
||||
}
|
||||
&.flag-\\flagged .flagParent::after,
|
||||
.flagParent::after {
|
||||
content: '☆'; /*⚐*/
|
||||
}
|
||||
&.msgflag-\\flagged .flagParent::after,
|
||||
&.hasFlaggedSubMessage .flagParent::after {
|
||||
color: orange;
|
||||
content: '★'; /*⚑*/
|
||||
}
|
||||
&:not(.flag-\\flagged):not(.hasFlaggedSubMessage) .flagParent::after {
|
||||
content: '☆'; /*⚐*/
|
||||
}
|
||||
&:not(.flag-\\flagged):not(.hasFlaggedSubMessage) .flagParent:not(:hover) {
|
||||
&:not(.msgflag-\\flagged):not(.hasFlaggedSubMessage) .flagParent:not(:hover) {
|
||||
opacity: 0.5;
|
||||
}
|
||||
|
||||
.senderParent::before {
|
||||
font-family: snappymail;
|
||||
}
|
||||
&.msgflag-\\answered .senderParent::before {
|
||||
content: '← ';
|
||||
}
|
||||
&.msgflag-\$forwarded .senderParent::before {
|
||||
content: '→ ';
|
||||
}
|
||||
&.msgflag-\\answered.msgflag-\$forwarded .senderParent::before {
|
||||
content: '←→ ';
|
||||
}
|
||||
&.msgflag-\\deleted {
|
||||
opacity: .7;
|
||||
.subjectParent {
|
||||
text-decoration: line-through;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
html.rl-ctrl-key-pressed .messageListItem {
|
||||
|
|
@ -442,35 +455,3 @@ html:not(.rl-mobile):not(.rl-side-preview-pane) {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
.senderParent::before {
|
||||
font-family: snappymail;
|
||||
}
|
||||
.flag-\\answered .senderParent::before {
|
||||
content: '← ';
|
||||
}
|
||||
.flag-\$forwarded .senderParent::before {
|
||||
content: '→ ';
|
||||
}
|
||||
.flag-\\answered.flag-\$forwarded .senderParent::before {
|
||||
content: '←→ ';
|
||||
}
|
||||
|
||||
/* Thunderbird labels */
|
||||
/*
|
||||
.flag-\$label5 .checkboxMessage { background-color: #808; }
|
||||
.flag-\$label4 .checkboxMessage { background-color: #00F; }
|
||||
.flag-\$label3 .checkboxMessage { background-color: #080; }
|
||||
.flag-\$label2 .checkboxMessage { background-color: #FA0; }
|
||||
.flag-\$label1 .checkboxMessage { background-color: #F00; }
|
||||
*/
|
||||
.messageListItem.flag-\$label5.focused { background-color: rgba(255, 0, 255, 0.30); }
|
||||
.messageListItem.flag-\$label4.focused { background-color: rgba( 64, 64, 255, 0.30); }
|
||||
.messageListItem.flag-\$label3.focused { background-color: rgba( 0, 255, 0, 0.30); }
|
||||
.messageListItem.flag-\$label2.focused { background-color: rgba(255, 170, 0, 0.30); }
|
||||
.messageListItem.flag-\$label1.focused { background-color: rgba(255, 0, 0, 0.30); }
|
||||
.messageListItem.flag-\$label5:not(.focused) { color: #939; }
|
||||
.messageListItem.flag-\$label4:not(.focused) { color: #33F; }
|
||||
.messageListItem.flag-\$label3:not(.focused) { color: #090; }
|
||||
.messageListItem.flag-\$label2:not(.focused) { color: #F90; }
|
||||
.messageListItem.flag-\$label1:not(.focused) { color: #F00; }
|
||||
|
|
|
|||
|
|
@ -90,6 +90,14 @@ html.rl-no-preview-pane {
|
|||
}
|
||||
}
|
||||
|
||||
.messageTags {
|
||||
margin-top: 6px;
|
||||
}
|
||||
.messageTags span span {
|
||||
border: 1px solid #808080;
|
||||
padding: 2px;
|
||||
}
|
||||
|
||||
.messageItemHeader {
|
||||
|
||||
background-color: #f8f8f8;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
|
||||
#top-system-dropdown-id {
|
||||
overflow: hidden;
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
padding-left: 8px;
|
||||
padding-right: 6px;
|
||||
}
|
||||
|
||||
.rl-left-panel-disabled #more-list-dropdown-id + .dropdown-menu {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue