From c4f32c1c75508d6d10288fd78e49077980a14956 Mon Sep 17 00:00:00 2001 From: Mark Banner Date: Tue, 25 Aug 2015 16:49:20 +0100 Subject: [PATCH] Bug 1193666 - Fix surrounding colour of context tiles for Loop's text chat views. Also fix the fallback icon for context on desktop. r=mikedeboer --- browser/components/loop/content/shared/css/common.css | 5 ++++- browser/components/loop/content/shared/css/conversation.css | 6 +++--- browser/components/loop/content/shared/js/textChatView.js | 6 ++---- browser/components/loop/content/shared/js/textChatView.jsx | 6 ++---- browser/components/loop/content/shared/js/views.js | 2 +- browser/components/loop/content/shared/js/views.jsx | 2 +- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/browser/components/loop/content/shared/css/common.css b/browser/components/loop/content/shared/css/common.css index 7428a5d54faf..f4c88e634393 100644 --- a/browser/components/loop/content/shared/css/common.css +++ b/browser/components/loop/content/shared/css/common.css @@ -586,7 +586,10 @@ html[dir="rtl"] .context-wrapper > .context-preview { } .clicks-allowed.context-wrapper:hover { - background-color: #dbf7ff; + border: 2px solid #5cccee; + /* Due to the increased border width, reduce the padding accordingly so that + the text doesn't move. */ + padding: calc(.8em - 1px); } /* Only underline the url, not the associated text */ diff --git a/browser/components/loop/content/shared/css/conversation.css b/browser/components/loop/content/shared/css/conversation.css index b8e57369a33a..c30e98f4ae2c 100644 --- a/browser/components/loop/content/shared/css/conversation.css +++ b/browser/components/loop/content/shared/css/conversation.css @@ -883,7 +883,7 @@ body[platform="win"] .share-service-dropdown.overflow > .dropdown-menu-item { 0.5rem for padding of .text-chat-entry > p */ padding: calc(18px - 1px - 0.5rem); margin-bottom: 0.5em; - background-color: #E8F6FE; + background-color: #dbf7ff; } .room-context { @@ -1610,13 +1610,13 @@ html[dir="rtl"] .text-chat-entry.received .text-chat-arrow { color: black; font-weight: bold; text-align: start; - background-color: #E8F6FE; + background-color: #dbf7ff; margin-bottom: 0; margin-right: 0; } .text-chat-entry.special.room-name p { - background: #E8F6FE; + background: #dbf7ff; max-width: 100%; /* 18px for indent of .text-chat-arrow, 1px for border of .text-chat-entry > p, 0.5rem for padding of .text-chat-entry > p */ diff --git a/browser/components/loop/content/shared/js/textChatView.js b/browser/components/loop/content/shared/js/textChatView.js index 515e6befb1b9..e8ef57480023 100644 --- a/browser/components/loop/content/shared/js/textChatView.js +++ b/browser/components/loop/content/shared/js/textChatView.js @@ -76,8 +76,7 @@ loop.shared.views.chat = (function(mozL10n) { mixins: [React.addons.PureRenderMixin], propTypes: { - message: React.PropTypes.string.isRequired, - useDesktopPaths: React.PropTypes.bool.isRequired + message: React.PropTypes.string.isRequired }, render: function() { @@ -180,8 +179,7 @@ loop.shared.views.chat = (function(mozL10n) { return ( React.createElement(TextChatRoomName, { key: i, - message: entry.message, - useDesktopPaths: this.props.useDesktopPaths}) + message: entry.message}) ); case CHAT_CONTENT_TYPES.CONTEXT: return ( diff --git a/browser/components/loop/content/shared/js/textChatView.jsx b/browser/components/loop/content/shared/js/textChatView.jsx index 703c6eb05f9d..c1b04405361c 100644 --- a/browser/components/loop/content/shared/js/textChatView.jsx +++ b/browser/components/loop/content/shared/js/textChatView.jsx @@ -76,8 +76,7 @@ loop.shared.views.chat = (function(mozL10n) { mixins: [React.addons.PureRenderMixin], propTypes: { - message: React.PropTypes.string.isRequired, - useDesktopPaths: React.PropTypes.bool.isRequired + message: React.PropTypes.string.isRequired }, render: function() { @@ -180,8 +179,7 @@ loop.shared.views.chat = (function(mozL10n) { return ( + message={entry.message} /> ); case CHAT_CONTENT_TYPES.CONTEXT: return ( diff --git a/browser/components/loop/content/shared/js/views.js b/browser/components/loop/content/shared/js/views.js index c6dfe319506f..56fef559c902 100644 --- a/browser/components/loop/content/shared/js/views.js +++ b/browser/components/loop/content/shared/js/views.js @@ -1155,7 +1155,7 @@ loop.shared.views = (function(_, mozL10n) { React.createElement(loop.shared.views.chat.TextChatView, { dispatcher: this.props.dispatcher, showRoomName: this.props.showContextRoomName, - useDesktopPaths: false}), + useDesktopPaths: this.props.useDesktopPaths}), this.state.localMediaAboslutelyPositioned ? null : this.renderLocalVideo() ) diff --git a/browser/components/loop/content/shared/js/views.jsx b/browser/components/loop/content/shared/js/views.jsx index 3ab1f88f418a..9f12b748f94a 100644 --- a/browser/components/loop/content/shared/js/views.jsx +++ b/browser/components/loop/content/shared/js/views.jsx @@ -1155,7 +1155,7 @@ loop.shared.views = (function(_, mozL10n) { + useDesktopPaths={this.props.useDesktopPaths} /> { this.state.localMediaAboslutelyPositioned ? null : this.renderLocalVideo() }