fix up UserSettings a bit

This commit is contained in:
Matthew Hodgson 2016-04-15 18:23:47 +01:00
parent d0d4760ddc
commit cf3cdaccf3
5 changed files with 23 additions and 22 deletions

View File

@ -155,7 +155,10 @@ module.exports = React.createClass({
panel = <MemberInfo roomId={this.props.roomId} member={this.state.member} key={this.props.roomId} /> panel = <MemberInfo roomId={this.props.roomId} member={this.state.member} key={this.props.roomId} />
} }
} }
}
if (!panel) {
panel = <div className="mx_RightPanel_blank"></div>;
} }
var classes = "mx_RightPanel mx_fadable"; var classes = "mx_RightPanel mx_fadable";

View File

@ -54,7 +54,7 @@ limitations under the License.
} }
.mx_SearchBox_maximise { .mx_SearchBox_maximise {
margin-left: 6px; margin-left: 9px;
} }
.mx_SearchBox object { .mx_SearchBox object {

View File

@ -50,9 +50,25 @@ limitations under the License.
-webkit-flex: 1 1 0; -webkit-flex: 1 1 0;
flex: 1 1 0; flex: 1 1 0;
margin-top: -20px;
overflow-y: auto; overflow-y: auto;
} }
.mx_UserSettings h3 {
clear: both;
margin-left: 63px;
text-transform: uppercase;
color: #3d3b39;
font-weight: 600;
font-size: 13px;
margin-top: 26px;
margin-bottom: 10px;
}
.mx_UserSettings_section h3 {
margin-left: 0px;
}
.mx_UserSettings_spinner { .mx_UserSettings_spinner {
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
@ -78,22 +94,6 @@ limitations under the License.
cursor: pointer; cursor: pointer;
} }
.mx_UserSettings h2 {
clear: both;
margin-top: 32px;
margin-bottom: 8px;
margin-left: 63px;
padding-bottom: 6px;
border-bottom: 1px solid #e5e5e5;
}
.mx_UserSettings h3 {
font-weight: bold;
font-size: 15px;
margin-top: 4px;
margin-bottom: 4px;
}
.mx_UserSettings_section { .mx_UserSettings_section {
margin-left: 63px; margin-left: 63px;
margin-top: 28px; margin-top: 28px;

View File

@ -86,7 +86,8 @@ limitations under the License.
} }
.mx_RightPanel .mx_MemberList, .mx_RightPanel .mx_MemberList,
.mx_RightPanel .mx_MemberInfo { .mx_RightPanel .mx_MemberInfo,
.mx_RightPanel_blank {
-webkit-box-ordinal-group: 2; -webkit-box-ordinal-group: 2;
-moz-box-ordinal-group: 2; -moz-box-ordinal-group: 2;
-ms-flex-order: 2; -ms-flex-order: 2;

View File

@ -3,9 +3,6 @@
<svg version="1.1" id="Layer_1" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns" <svg version="1.1" id="Layer_1" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="-254 253 10 16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="-254 253 10 16"
style="enable-background:new -254 253 10 16;" xml:space="preserve"> style="enable-background:new -254 253 10 16;" xml:space="preserve">
<style type="text/css">
.st0{fill:none;stroke:#76CFA6;stroke-width:2;}
</style>
<title>minimise</title> <title>minimise</title>
<desc>Created with sketchtool.</desc> <desc>Created with sketchtool.</desc>
<g id="_x30_2-Chat" sketch:type="MSPage"> <g id="_x30_2-Chat" sketch:type="MSPage">
@ -13,7 +10,7 @@
<g id="Room-list" sketch:type="MSLayerGroup"> <g id="Room-list" sketch:type="MSLayerGroup">
<g id="Room-list_x2F_Header" sketch:type="MSShapeGroup"> <g id="Room-list_x2F_Header" sketch:type="MSShapeGroup">
<g id="minimise" transform="translate(172.000000, 25.000000)"> <g id="minimise" transform="translate(172.000000, 25.000000)">
<path id="Path-53-Copy" class="st0" d="M-248.7,256.3l5.7,5.7l-5.7,5.7"/> <path id="Path-53-Copy" fill="none" stroke-width="2" stroke="#76CFA6" d="M-248.7,256.3l5.7,5.7l-5.7,5.7"/>
</g> </g>
</g> </g>
</g> </g>

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 987 B