Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Add divider between tabs and regular buttons in room header #2621

Merged
merged 1 commit into from
Feb 13, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions res/css/_components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
28 changes: 28 additions & 0 deletions res/css/structures/_HeaderButtons.scss
Original file line number Diff line number Diff line change
@@ -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;
}

1 change: 1 addition & 0 deletions res/themes/dharma/css/_dharma.scss
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ $roomtopic-color: #9fa9ba;
$eventtile-meta-color: $roomtopic-color;

$composer-e2e-icon-color: #c9ced6;
$header-divider-color: #e6eaee;

// ********************

Expand Down
2 changes: 1 addition & 1 deletion res/themes/light/css/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/components/views/right_panel/HeaderButtons.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export default class HeaderButtons extends React.Component {

render() {
// inline style as this will be swapped around in future commits
return <div style={{display: 'flex'}}>
return <div className="mx_HeaderButtons">
{ this.renderButtons() }
</div>;
}
Expand Down