mirror of https://github.com/vector-im/riot-web
tidy up rightpanel and searchbox
parent
72745b05dc
commit
90ae024a4e
|
@ -169,6 +169,8 @@ module.exports = React.createClass({
|
|||
{ buttonGroup }
|
||||
</div>
|
||||
{ panel }
|
||||
<div className="mx_RightPanel_footer">
|
||||
</div>
|
||||
</aside>
|
||||
);
|
||||
}
|
||||
|
|
|
@ -25,7 +25,6 @@ module.exports = React.createClass({
|
|||
|
||||
render: function() {
|
||||
var TintableSvg = sdk.getComponent('elements.TintableSvg');
|
||||
var EditableText = sdk.getComponent("elements.EditableText");
|
||||
|
||||
var toggleCollapse;
|
||||
if (this.props.collapsed) {
|
||||
|
@ -41,11 +40,9 @@ module.exports = React.createClass({
|
|||
className="mx_SearchBox_searchButton"
|
||||
src="img/search.svg" width="21" height="19"
|
||||
/>
|
||||
<EditableText
|
||||
<input
|
||||
type="text"
|
||||
className="mx_SearchBox_search"
|
||||
placeholderClassName="mx_SearchBox_searchPlaceholder"
|
||||
blurToCancel={ false }
|
||||
editable={ true }
|
||||
placeholder="Search Vector"
|
||||
/>
|
||||
{ toggleCollapse }
|
||||
|
|
|
@ -207,7 +207,7 @@ hr.mx_RoomView_myReadMarker {
|
|||
.mx_RoomView_statusAreaBox {
|
||||
max-width: 960px;
|
||||
margin: auto;
|
||||
min-height: 49px;
|
||||
min-height: 60px;
|
||||
}
|
||||
|
||||
.mx_RoomView_statusAreaBox_line {
|
||||
|
|
|
@ -18,8 +18,8 @@ limitations under the License.
|
|||
height: 24px;
|
||||
margin-left: 20px;
|
||||
margin-right: 20px;
|
||||
padding-top: 23px;
|
||||
padding-bottom: 23px;
|
||||
padding-top: 26px;
|
||||
padding-bottom: 20px;
|
||||
border-bottom: 1px solid rgba(0, 0, 0, 0.1);
|
||||
|
||||
display: flex;
|
||||
|
@ -33,13 +33,14 @@ limitations under the License.
|
|||
.mx_SearchBox_search {
|
||||
flex: 1;
|
||||
-webkit-flex: 1;
|
||||
font-family: 'Open Sans', Arial, Helvetica, Sans-Serif;
|
||||
font-size: 12px;
|
||||
height: 24px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
.mx_SearchBox_searchPlaceholder {
|
||||
opacity: 0.5;
|
||||
margin-top: -4px;
|
||||
border: 0px ! important;
|
||||
/* border-bottom: 1px solid rgba(0, 0, 0, 0.1) ! important; */
|
||||
background-color: transparent;
|
||||
border: 0px;
|
||||
}
|
||||
|
||||
.mx_SearchBox_minimise,
|
||||
|
|
|
@ -15,6 +15,7 @@ limitations under the License.
|
|||
*/
|
||||
|
||||
.mx_MemberInfo {
|
||||
margin-top: 20px;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
|
|
|
@ -17,6 +17,8 @@ limitations under the License.
|
|||
.mx_MemberList {
|
||||
height: 100%;
|
||||
|
||||
margin-top: 12px;
|
||||
|
||||
-webkit-flex: 1;
|
||||
flex: 1;
|
||||
|
||||
|
@ -77,17 +79,6 @@ limitations under the License.
|
|||
}
|
||||
*/
|
||||
|
||||
.mx_MemberList_bottom {
|
||||
order: 4;
|
||||
flex: 0 0 60px;
|
||||
-webkit-flex: 0 0 60px;
|
||||
}
|
||||
|
||||
.mx_MemberList_bottomRule {
|
||||
border-top: 1px solid #e5e5e5;
|
||||
margin-right: 15px;
|
||||
}
|
||||
|
||||
.mx_MemberList_invited h2 {
|
||||
text-transform: uppercase;
|
||||
color: #3d3b39;
|
||||
|
|
|
@ -33,6 +33,9 @@ limitations under the License.
|
|||
-webkit-order: 1;
|
||||
order: 1;
|
||||
|
||||
border-bottom: 1px solid #e5e5e5;
|
||||
margin-right: 20px;
|
||||
|
||||
-webkit-flex: 0 0 70px;
|
||||
flex: 0 0 70px;
|
||||
}
|
||||
|
@ -90,3 +93,17 @@ limitations under the License.
|
|||
-webkit-order: 2;
|
||||
order: 2;
|
||||
}
|
||||
|
||||
.mx_RightPanel_footer {
|
||||
-webkit-box-ordinal-group: 3;
|
||||
-moz-box-ordinal-group: 3;
|
||||
-ms-flex-order: 3;
|
||||
-webkit-order: 3;
|
||||
order: 3;
|
||||
|
||||
border-top: 1px solid #e5e5e5;
|
||||
margin-right: 20px;
|
||||
|
||||
-webkit-flex: 0 0 60px;
|
||||
flex: 0 0 60px;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue