From ccaa0179803214e4231688ae5a43f828edf79212 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Tue, 12 Feb 2019 20:04:24 +0100 Subject: [PATCH] add divider between tabs and regular buttons in room header --- res/css/_components.scss | 1 + res/css/structures/_HeaderButtons.scss | 28 +++++++++++++++++++ res/themes/dharma/css/_dharma.scss | 1 + res/themes/light/css/_base.scss | 2 +- .../views/right_panel/HeaderButtons.js | 2 +- 5 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 res/css/structures/_HeaderButtons.scss diff --git a/res/css/_components.scss b/res/css/_components.scss index 80add0b1ad..9ed153ef6a 100644 --- a/res/css/_components.scss +++ b/res/css/_components.scss @@ -7,6 +7,7 @@ @import "./structures/_CustomRoomTagPanel.scss"; @import "./structures/_FilePanel.scss"; @import "./structures/_GroupView.scss"; +@import "./structures/_HeaderButtons.scss"; @import "./structures/_HomePage.scss"; @import "./structures/_LeftPanel.scss"; @import "./structures/_MatrixChat.scss"; diff --git a/res/css/structures/_HeaderButtons.scss b/res/css/structures/_HeaderButtons.scss new file mode 100644 index 0000000000..3c33b325ff --- /dev/null +++ b/res/css/structures/_HeaderButtons.scss @@ -0,0 +1,28 @@ +/* +Copyright 2019 New Vector Ltd + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +.mx_HeaderButtons { + display: flex; +} + +.mx_HeaderButtons::before { + content: ""; + background-color: $header-divider-color; + margin: 2px 20px 5px 15px ; + border-radius: 2px; + width: 2px; +} + diff --git a/res/themes/dharma/css/_dharma.scss b/res/themes/dharma/css/_dharma.scss index e389cc944c..424532a609 100644 --- a/res/themes/dharma/css/_dharma.scss +++ b/res/themes/dharma/css/_dharma.scss @@ -143,6 +143,7 @@ $roomtopic-color: #9fa9ba; $eventtile-meta-color: $roomtopic-color; $composer-e2e-icon-color: #c9ced6; +$header-divider-color: #e6eaee; // ******************** diff --git a/res/themes/light/css/_base.scss b/res/themes/light/css/_base.scss index 8185ba0ace..e2aa005b68 100644 --- a/res/themes/light/css/_base.scss +++ b/res/themes/light/css/_base.scss @@ -136,7 +136,7 @@ $roomtopic-color: $settings-grey-fg-color; $eventtile-meta-color: $roomtopic-color; $composer-e2e-icon-color: #c9ced6; - +$header-divider-color: #e6eaee; // ******************** $roomtile-name-color: rgba(69, 69, 69, 0.8); diff --git a/src/components/views/right_panel/HeaderButtons.js b/src/components/views/right_panel/HeaderButtons.js index 3f5f58121d..b7155b922f 100644 --- a/src/components/views/right_panel/HeaderButtons.js +++ b/src/components/views/right_panel/HeaderButtons.js @@ -88,7 +88,7 @@ export default class HeaderButtons extends React.Component { render() { // inline style as this will be swapped around in future commits - return
+ return
{ this.renderButtons() }
; }