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

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

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 {