mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

fix new bottomleft menu

Browse source
This commit is contained in:
Matthew Hodgson 2016-04-14 22:26:48 +01:00
parent 6bc4c87ce4
commit 25b5c14527
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/structures/BottomLeftMenu.js
View file

@ -52,13 +52,13 @@ module.exports = React.createClass({
<div className="mx_BottomLeftMenu"> <div className="mx_BottomLeftMenu">
<div className="mx_BottomLeftMenu_options"> <div className="mx_BottomLeftMenu_options">
<div className="mx_BottomLeftMenu_createRoom" title="Start chat" onClick={ this.onCreateRoomClick }> <div className="mx_BottomLeftMenu_createRoom" title="Start chat" onClick={ this.onCreateRoomClick }>
<TintableSvg src="img/icons-create-room.svg" width="24" height="24"/> <TintableSvg src="img/icons-create-room.svg" width="24" height="24"/>
</div> </div>
<div className="mx_BottomLeftMenu_directory" title="Room directory" onClick={ this.onRoomDirectoryClick }> <div className="mx_BottomLeftMenu_directory" title="Room directory" onClick={ this.onRoomDirectoryClick }>
<TintableSvg src="img/icons-directory.svg" width="24" height="24"/> <TintableSvg src="img/icons-directory.svg" width="24" height="24"/>
</div> </div>
<div className="mx_BottomLeftMenu_settings" title="Settings" onClick={ this.onSettingsClick }> <div className="mx_BottomLeftMenu_settings" title="Settings" onClick={ this.onSettingsClick }>
<TintableSvg src="img/icons-settings.svg" width="24" height="24"/> <TintableSvg src="img/icons-settings.svg" width="24" height="24"/>
</div> </div>
</div> </div>
</div> </div>

14
src/skins/vector/css/vector-web/structures/LeftPanel.css
View file

@ -58,7 +58,7 @@ limitations under the License.
-webkit-order: 3; -webkit-order: 3;
order: 3; order: 3;
border-top: 1px solid rgba(0,0,0,0.1); border-top: 1px solid rgba(0, 0, 0, 0.1);
margin-left: 20px; margin-left: 20px;
margin-right: 20px; margin-right: 20px;
-webkit-flex: 0 0 60px; -webkit-flex: 0 0 60px;
@ -70,6 +70,10 @@ limitations under the License.
width: 100%; width: 100%;
} }
.mx_BottomLeftMenu_options object {
pointer-events: none;
}
.mx_LeftPanel .mx_BottomLeftMenu_createRoom, .mx_LeftPanel .mx_BottomLeftMenu_createRoom,
.mx_LeftPanel .mx_BottomLeftMenu_directory, .mx_LeftPanel .mx_BottomLeftMenu_directory,
.mx_LeftPanel .mx_BottomLeftMenu_settings { .mx_LeftPanel .mx_BottomLeftMenu_settings {
@ -77,6 +81,14 @@ limitations under the License.
cursor: pointer; cursor: pointer;
} }
.collapsed .mx_BottomLeftMenu_createRoom,
.collapsed .mx_BottomLeftMenu_directory,
.collapsed .mx_BottomLeftMenu_settings {
margin-left: 0px ! important;
padding-top: 3px ! important;
padding-bottom: 3px ! important;
}
.mx_LeftPanel .mx_BottomLeftMenu_directory { .mx_LeftPanel .mx_BottomLeftMenu_directory {
margin-left: 10px; margin-left: 10px;
} }