OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2668 from azuenko/develop 

Fix waste of space of collapsed left panel
pull/21833/head
Travis Ralston 2019-08-06 13:54:04 -06:00 committed by GitHub
parent f6dbeef204 a3eb45e0b9
commit 610baff09a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
res/css/structures/_LeftPanel.scss
View File

@ -24,13 +24,13 @@ limitations under the License.
.mx_LeftPanel_container.collapsed {
min-width: unset;
/* Collapsed LeftPanel 70px */
flex: 0 0 70px;
/* Collapsed LeftPanel 50px */
flex: 0 0 50px;
}
.mx_LeftPanel_container.collapsed.mx_LeftPanel_container_hasTagPanel {
/* TagPanel 70px + Collapsed LeftPanel 70px */
flex: 0 0 140px;
/* TagPanel 70px + Collapsed LeftPanel 50px */
flex: 0 0 120px;
}
.mx_LeftPanel_tagPanelContainer {

2
res/css/structures/_RoomSubList.scss
View File

@ -143,7 +143,7 @@ limitations under the License.
}
.mx_RoomSubList_labelContainer {
margin-right: 14px;
margin-right: 8px;
margin-left: 2px;
}

2
res/css/structures/_TopLeftMenuButton.scss
View File

@ -22,7 +22,7 @@ limitations under the License.
display: flex;
align-items: center;
min-width: 0;
padding: 0 7px;
padding: 0 4px;
overflow: hidden;
}

2
res/css/views/rooms/_RoomTile.scss
View File

@ -117,7 +117,7 @@ limitations under the License.
.collapsed {
.mx_RoomTile {
margin: 0 2px;
margin: 0 6px;
padding: 0 2px;
position: relative;
justify-content: center;

4
src/components/structures/TopLeftMenuButton.js
View File

@ -98,10 +98,12 @@ export default class TopLeftMenuButton extends React.Component {
render() {
const name = this._getDisplayName();
let nameElement;
let chevronElement;
if (!this.props.collapsed) {
nameElement = <div className="mx_TopLeftMenuButton_name">
{ name }
</div>;
chevronElement = <span className="mx_TopLeftMenuButton_chevron" />;
}
return (
@ -121,7 +123,7 @@ export default class TopLeftMenuButton extends React.Component {
resizeMethod="crop"
/>
{ nameElement }
<span className="mx_TopLeftMenuButton_chevron" />
{ chevronElement }
</AccessibleButton>
);
}