Merge branch 'develop' into kegan/invite-search
This commit is contained in:
commit
317e1fb9cd
6 changed files with 1107 additions and 26 deletions
|
@ -86,6 +86,13 @@ limitations under the License.
|
|||
border-bottom: 1px solid #eee;
|
||||
}
|
||||
|
||||
.mx_UserSettings h3 {
|
||||
font-weight: bold;
|
||||
font-size: 15px;
|
||||
margin-top: 4px;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
.mx_UserSettings_section {
|
||||
margin-left: 63px;
|
||||
margin-top: 28px;
|
||||
|
@ -104,8 +111,7 @@ limitations under the License.
|
|||
float: left;
|
||||
}
|
||||
|
||||
.mx_UserSettings_profileTableRow,
|
||||
.mx_UserSettings_notifTableRow
|
||||
.mx_UserSettings_profileTableRow
|
||||
{
|
||||
display: table-row;
|
||||
}
|
||||
|
@ -137,24 +143,6 @@ limitations under the License.
|
|||
font-size: 16px;
|
||||
}
|
||||
|
||||
.mx_UserSettings_profileInputCell .mx_EditableText_placeholder {
|
||||
color: rgba(74, 74, 74, 0.5);
|
||||
}
|
||||
|
||||
.mx_UserSettings_notifInputCell {
|
||||
display: table-cell;
|
||||
padding-bottom: 21px;
|
||||
padding-right: 8px;
|
||||
width: 16px;
|
||||
}
|
||||
|
||||
.mx_UserSettings_notifLabelCell
|
||||
{
|
||||
padding-bottom: 21px;
|
||||
width: 270px;
|
||||
display: table-cell;
|
||||
}
|
||||
|
||||
.mx_UserSettings_logout {
|
||||
float: right;
|
||||
margin-right: 32px;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue