be sure blocked border is shown even with mention or unread

pull/1334/head
Audric Ackermann 5 years ago
parent c34edee180
commit 2aef1f3132
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4

@ -1520,6 +1520,12 @@
.module-avatar { .module-avatar {
background-color: $color-dark-85; background-color: $color-dark-85;
} }
&--is-blocked {
@include themify($themes) {
border-left: 4px solid themed('destructive') !important;
}
}
} }
.module-conversation-list-item__unread-count { .module-conversation-list-item__unread-count {

@ -344,8 +344,6 @@ textarea {
} }
} }
$session-element-border-green: 4px solid $session-color-green;
/* CONVERSATION AND MESSAGES */ /* CONVERSATION AND MESSAGES */
@mixin standard-icon-button() { @mixin standard-icon-button() {

@ -132,7 +132,9 @@
margin: 0 auto; margin: 0 auto;
width: 70%; width: 70%;
padding-top: 0.5rem; padding-top: 0.5rem;
border-bottom: $session-element-border-green; @include themify($themes) {
border-bottom: themed('sessionUnreadBorder');
}
} }
} }
} }

@ -48,8 +48,8 @@ $session-compose-margin: 20px;
} }
&--has-unread { &--has-unread {
border-left: $session-element-border-green !important;
@include themify($themes) { @include themify($themes) {
border-left: themed('sessionUnreadBorder');
background: themed('conversationItemHasUnread'); background: themed('conversationItemHasUnread');
} }
} }

@ -664,17 +664,8 @@
.module-empty-state { .module-empty-state {
color: $color-dark-55; color: $color-dark-55;
} }
// Module: Conversation List Item // Module: Conversation List Item
.module-conversation-list-item--has-unread {
border-left: 4px solid $color-loki-green;
}
.module-conversation-list-item--is-blocked {
border-left: 4px solid $session-color-danger;
}
.module-conversation-list-item--is-selected { .module-conversation-list-item--is-selected {
background-color: $color-dark-70; background-color: $color-dark-70;
} }

@ -41,6 +41,7 @@ $themes: (
conversationItemSelected: #f0f0f0, conversationItemSelected: #f0f0f0,
clickableHovered: #dfdfdf, clickableHovered: #dfdfdf,
sessionBorder: 1px solid #f1f1f1, sessionBorder: 1px solid #f1f1f1,
sessionUnreadBorder: 4px solid $accentLightTheme,
leftpaneOverlayBackground: $white, leftpaneOverlayBackground: $white,
// scrollbars // scrollbars
scrollBarTrack: #fcfcfc, scrollBarTrack: #fcfcfc,
@ -91,6 +92,7 @@ $themes: (
conversationItemSelected: #404040, conversationItemSelected: #404040,
clickableHovered: #414347, clickableHovered: #414347,
sessionBorder: 1px solid rgba($white, 0.06), sessionBorder: 1px solid rgba($white, 0.06),
sessionUnreadBorder: 4px solid $accentDarkTheme,
leftpaneOverlayBackground: linear-gradient(180deg, #171717 0%, #121212 100%), leftpaneOverlayBackground: linear-gradient(180deg, #171717 0%, #121212 100%),
// scrollbars // scrollbars
scrollBarTrack: #1b1b1b, scrollBarTrack: #1b1b1b,

Loading…
Cancel
Save