From 4e773c266516147642eaa0d1be180d6f5d9ac1e7 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Tue, 6 Nov 2018 14:47:58 +0100 Subject: [PATCH] Make right panel a dark-panel instead of every descendant. Also move bg color central. --- res/css/structures/_FilePanel.scss | 1 - res/css/structures/_LeftPanel.scss | 1 - res/css/structures/_NotificationPanel.scss | 1 - res/css/structures/_RoomSubList.scss | 1 - res/css/views/rooms/_MemberInfo.scss | 1 - res/css/views/rooms/_MemberList.scss | 1 - res/css/views/rooms/_RoomList.scss | 1 - res/css/views/rooms/_RoomTile.scss | 1 - res/themes/dharma/css/_dharma.scss | 7 ++++++- src/components/structures/RightPanel.js | 1 + src/components/views/groups/GroupMemberList.js | 2 +- src/components/views/groups/GroupRoomList.js | 2 +- src/components/views/rooms/MemberList.js | 2 +- 13 files changed, 10 insertions(+), 12 deletions(-) diff --git a/res/css/structures/_FilePanel.scss b/res/css/structures/_FilePanel.scss index aa56c23866..677fa34c6f 100644 --- a/res/css/structures/_FilePanel.scss +++ b/res/css/structures/_FilePanel.scss @@ -17,7 +17,6 @@ limitations under the License. .mx_FilePanel { order: 2; flex: 1 1 0; - background-color: $secondary-accent-color; overflow-y: auto; } diff --git a/res/css/structures/_LeftPanel.scss b/res/css/structures/_LeftPanel.scss index fc1622aa4d..1fe7a42678 100644 --- a/res/css/structures/_LeftPanel.scss +++ b/res/css/structures/_LeftPanel.scss @@ -46,7 +46,6 @@ limitations under the License. } .mx_LeftPanel { - background-color: $secondary-accent-color; flex: 1; overflow-x: hidden; display: flex; diff --git a/res/css/structures/_NotificationPanel.scss b/res/css/structures/_NotificationPanel.scss index 6fd1f1690d..b171aa3e36 100644 --- a/res/css/structures/_NotificationPanel.scss +++ b/res/css/structures/_NotificationPanel.scss @@ -17,7 +17,6 @@ limitations under the License. .mx_NotificationPanel { order: 2; flex: 1 1 0; - background-color: $secondary-accent-color; overflow-y: auto; } diff --git a/res/css/structures/_RoomSubList.scss b/res/css/structures/_RoomSubList.scss index e062a912a5..30ce90a84f 100644 --- a/res/css/structures/_RoomSubList.scss +++ b/res/css/structures/_RoomSubList.scss @@ -45,7 +45,6 @@ limitations under the License. padding-top: 6px; padding-bottom: 6px; cursor: pointer; - background-color: $secondary-accent-color; } .mx_RoomSubList_label.mx_RoomSubList_fixed { diff --git a/res/css/views/rooms/_MemberInfo.scss b/res/css/views/rooms/_MemberInfo.scss index ab029874b4..a027c575dd 100644 --- a/res/css/views/rooms/_MemberInfo.scss +++ b/res/css/views/rooms/_MemberInfo.scss @@ -15,7 +15,6 @@ limitations under the License. */ .mx_MemberInfo { - background-color: $secondary-accent-color; display: flex; flex-direction: column; flex: 1; diff --git a/res/css/views/rooms/_MemberList.scss b/res/css/views/rooms/_MemberList.scss index db41f6bc28..e21bc22f2e 100644 --- a/res/css/views/rooms/_MemberList.scss +++ b/res/css/views/rooms/_MemberList.scss @@ -17,7 +17,6 @@ limitations under the License. .mx_MemberList, .mx_GroupMemberList, .mx_GroupRoomList { - background-color: $secondary-accent-color; flex: 1; display: flex; flex-direction: column; diff --git a/res/css/views/rooms/_RoomList.scss b/res/css/views/rooms/_RoomList.scss index 54f7d023e4..30a569d41f 100644 --- a/res/css/views/rooms/_RoomList.scss +++ b/res/css/views/rooms/_RoomList.scss @@ -37,7 +37,6 @@ limitations under the License. } .mx_RoomList_emptySubListTip_container { - background-color: $secondary-accent-color; padding-left: 18px; padding-right: 18px; padding-top: 8px; diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss index ca23d79137..475d2ac275 100644 --- a/res/css/views/rooms/_RoomTile.scss +++ b/res/css/views/rooms/_RoomTile.scss @@ -23,7 +23,6 @@ limitations under the License. margin: 0; padding: 2px 12px; position: relative; - background-color: $secondary-accent-color; } .mx_RoomTile_tooltip { diff --git a/res/themes/dharma/css/_dharma.scss b/res/themes/dharma/css/_dharma.scss index 1fa5963ccd..0b53202240 100644 --- a/res/themes/dharma/css/_dharma.scss +++ b/res/themes/dharma/css/_dharma.scss @@ -180,7 +180,7 @@ $lightbox-border-color: #ffffff; // unused? $progressbar-color: #000; -// form elements +/*** form elements ***/ // .mx_textinput is a container for a text input // + some other controls like buttons, ... @@ -220,6 +220,11 @@ input[type=search] { min-width: 0; } +/*** panels ***/ +.dark-panel { + background-color: $secondary-accent-color; +} + .dark-panel { :not(.mx_textinput) > input[type=text], :not(.mx_textinput) > input[type=search], diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js index 95261597fe..5aaa2a1c06 100644 --- a/src/components/structures/RightPanel.js +++ b/src/components/structures/RightPanel.js @@ -213,6 +213,7 @@ export default class RightPanel extends React.Component { const classes = classNames("mx_RightPanel", "mx_fadable", { "collapsed": this.props.collapsed, "mx_fadable_faded": this.props.disabled, + "dark-panel": true }); return ( diff --git a/src/components/views/groups/GroupMemberList.js b/src/components/views/groups/GroupMemberList.js index 156785efe8..38c679a5b5 100644 --- a/src/components/views/groups/GroupMemberList.js +++ b/src/components/views/groups/GroupMemberList.js @@ -163,7 +163,7 @@ export default React.createClass({ :
; return ( -
+
{ inputBox } { joined } diff --git a/src/components/views/groups/GroupRoomList.js b/src/components/views/groups/GroupRoomList.js index 1abf6acb94..cfd2b806d4 100644 --- a/src/components/views/groups/GroupRoomList.js +++ b/src/components/views/groups/GroupRoomList.js @@ -131,7 +131,7 @@ export default React.createClass({ const GeminiScrollbarWrapper = sdk.getComponent("elements.GeminiScrollbarWrapper"); const TruncatedList = sdk.getComponent("elements.TruncatedList"); return ( -
+
{ inputBox } +
{ inviteButton }