From c9887f7bc32810e2e880873a9f6d7031a54140a3 Mon Sep 17 00:00:00 2001
From: Vincent <vincent@loki.network>
Date: Mon, 9 Dec 2019 16:11:23 +1100
Subject: [PATCH] Exports simplification and message selection
---
stylesheets/_session.scss | 2 ++
stylesheets/_session_theme_dark.scss | 8 ++++++++
ts/components/conversation/Message.tsx | 2 +-
ts/components/session/icon/index.tsx | 4 +---
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index 79163a6fb..74808e242 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -33,6 +33,8 @@ $session-color-dark-3: #404146;
$session-color-dark-4: #5c5d5f;
$session-color-dark-5: #a5a6a8;
+$session-color-dark-highlight: #212126;
+
$session-font-family: 'SpaceMono';
$session-transition-duration: 0.25s;
diff --git a/stylesheets/_session_theme_dark.scss b/stylesheets/_session_theme_dark.scss
index 466bdf42f..81679a373 100644
--- a/stylesheets/_session_theme_dark.scss
+++ b/stylesheets/_session_theme_dark.scss
@@ -31,6 +31,14 @@
.module-message__container--outgoing {
background-color: $session-color-dark-3;
}
+
+ .message-highlighted {
+ background-color: $session-color-dark-highlight;
+ border-radius: 0;
+ }
+ .message-selected {
+ background-color: rgba($session-color-dark-highlight, 0.8);
+ }
}
.message-read-receipt-container {
diff --git a/ts/components/conversation/Message.tsx b/ts/components/conversation/Message.tsx
index 7b27416f5..2d6916acb 100644
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@@ -1175,7 +1175,7 @@ export class Message extends React.PureComponent<Props, State> {
return (
<div className={classNames(classes)}>
- <span className="module-message__check-box">✓</span>
+ <SessionIcon iconType={SessionIconType.Check} />
</div>
);
}
diff --git a/ts/components/session/icon/index.tsx b/ts/components/session/icon/index.tsx
index f44da34b7..a413d55c0 100644
--- a/ts/components/session/icon/index.tsx
+++ b/ts/components/session/icon/index.tsx
@@ -1,3 +1 @@
-import { icons, SessionIconSize, SessionIconType } from './Icons';
-
-export { icons, SessionIconSize, SessionIconType };
+export { icons, SessionIconSize, SessionIconType } from './Icons';