imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into luke/rts-welcome-pages

Browse source
This commit is contained in:
Luke Barnard 2017-02-07 12:41:52 +01:00 • committed by GitHub
commit fa552ad5af
20 changed files with 402 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
View file

@ -107,6 +107,16 @@ limitations under the License.
justify-content: flex-start;
}
.mx_RoomView_empty {
flex: 1 1 auto;
font-size: 13px;
padding-left: 3em;
padding-right: 3em;
margin-right: 20px;
margin-top: 33%;
text-align: center;
}
.mx_RoomView_MessageList {
width: 100%;
list-style-type: none;

2
src/skins/vector/css/matrix-react-sdk/structures/login/_Login.scss
View file

@ -46,7 +46,7 @@ limitations under the License.
}
.mx_Login_logo img {
height: 100%
max-height: 100%
}
.mx_Login_support {

2
src/skins/vector/css/matrix-react-sdk/views/dialogs/_UnknownDeviceDialog.scss
View file

@ -54,7 +54,7 @@ limitations under the License.
margin-right: 8px;
padding-left: 0.5em;
padding-right: 0.5em;
width: 70px;
width: 85px;
outline: none;
cursor: pointer;
color: $accent-color;

11
src/skins/vector/css/vector-web/structures/_RightPanel.scss
View file

@ -34,14 +34,15 @@ limitations under the License.
.mx_RightPanel_headerButtonGroup {
margin-top: 6px;
float: left;
display: flex;
width: 100%;
background-color: $primary-bg-color;
margin-left: 0px;
}
.mx_RightPanel_headerButton {
cursor: pointer;
display: table-cell;
flex: 0;
vertical-align: top;
padding-left: 4px;
padding-right: 5px;
@ -69,6 +70,12 @@ limitations under the License.
padding-bottom: 2px;
}
.mx_RightPanel_collapsebutton {
flex: 1;
text-align: right;
margin-top: 20px;
}
.mx_RightPanel .mx_MemberList,
.mx_RightPanel .mx_MemberInfo,
.mx_RightPanel_blank {