From 9e1e7e0dbe4b5f62de38104424f5c1501c7c4ea6 Mon Sep 17 00:00:00 2001
From: Luke Barnard <luke@matrix.org>
Date: Thu, 15 Feb 2018 14:09:38 +0000
Subject: [PATCH] Fix RoomDropTarget and emptySubListTip to have containers
so that the correct background colour can be used to surround both.
---
src/components/views/rooms/RoomDropTarget.js | 8 ++++---
.../views/rooms/_RoomList.scss | 12 +++++++----
.../views/rooms/_RoomDropTarget.scss | 21 ++++++++++++-------
3 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/src/components/views/rooms/RoomDropTarget.js b/src/components/views/rooms/RoomDropTarget.js
index f5ca4f01..3cb10630 100644
--- a/src/components/views/rooms/RoomDropTarget.js
+++ b/src/components/views/rooms/RoomDropTarget.js
@@ -23,9 +23,11 @@ module.exports = React.createClass({
render: function() {
return (
- <div className="mx_RoomDropTarget">
- <div className="mx_RoomDropTarget_label">
- { this.props.label }
+ <div className="mx_RoomDropTarget_container">
+ <div className="mx_RoomDropTarget">
+ <div className="mx_RoomDropTarget_label">
+ { this.props.label }
+ </div>
</div>
</div>
);
diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomList.scss b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomList.scss
index d8a8d58a..581016d5 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomList.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomList.scss
@@ -39,12 +39,16 @@ limitations under the License.
z-index: 6;
}
+.mx_RoomList_emptySubListTip_container {
+ background-color: $secondary-accent-color;
+ padding-left: 18px;
+ padding-right: 18px;
+ padding-top: 8px;
+ padding-bottom: 7px;
+}
+
.mx_RoomList_emptySubListTip {
font-size: 13px;
- margin-left: 18px;
- margin-right: 18px;
- margin-top: 8px;
- margin-bottom: 7px;
padding: 5px;
border: 1px dashed $accent-color;
color: $primary-fg-color;
diff --git a/src/skins/vector/css/vector-web/views/rooms/_RoomDropTarget.scss b/src/skins/vector/css/vector-web/views/rooms/_RoomDropTarget.scss
index 08229e37..1076a056 100644
--- a/src/skins/vector/css/vector-web/views/rooms/_RoomDropTarget.scss
+++ b/src/skins/vector/css/vector-web/views/rooms/_RoomDropTarget.scss
@@ -14,12 +14,21 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
+.mx_RoomDropTarget_container {
+ background-color: $secondary-accent-color;
+ padding-left: 18px;
+ padding-right: 18px;
+ padding-top: 8px;
+ padding-bottom: 7px;
+}
+
+.collapsed .mx_RoomDropTarget_container {
+ padding-right: 10px;
+ padding-left: 10px;
+}
+
.mx_RoomDropTarget {
font-size: 13px;
- margin-left: 18px;
- margin-right: 18px;
- margin-top: 8px;
- margin-bottom: 7px;
padding-top: 5px;
padding-bottom: 5px;
border: 1px dashed $accent-color;
@@ -28,10 +37,6 @@ limitations under the License.
border-radius: 4px;
}
-.collapsed .mx_RoomDropTarget {
- margin-right: 10px;
- margin-left: 10px;
-}
.mx_RoomDropTarget_label {
position: relative;