cherry-pick conflicts.

4 years ago · 4cdc852ea3
parent 0aaf40637c
commit 4cdc852ea3
2 changed files with 12 additions and 3 deletions
--- a/stylesheets/_session_theme.scss
+++ b/stylesheets/_session_theme.scss
@ -49,8 +49,14 @@
  }

  &__container--outgoing {
-    @include themify($themes) {
-      background: themed('sentMessageBackground');
+    &--opaque {
+      @include themify($themes) {
+        background: themed('sentMessageBackground');
+      }
+    }
+
+    &--transparent {
+      background: none;
    }

    .module-message__text {
--- a/ts/components/conversation/Message.tsx
+++ b/ts/components/conversation/Message.tsx
@ -781,7 +781,10 @@ class MessageInner extends React.PureComponent<MessageRegularProps, State> {
          <div
            className={classNames(
              'module-message__container',
-              `module-message__container--${direction}`
+              `module-message__container--${direction}`,
+              isShowingImage
+                ? `module-message__container--${direction}--transparent`
+                : `module-message__container--${direction}--opaque`
            )}
            style={{
              width: isShowingImage ? width : undefined,