nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'develop' into new-guest-access

Browse Source
This commit is contained in:
Matthew Hodgson
2017-05-28 22:50:53 +01:00
parent 75eca60d76 47d412df73
commit a92d96347b
59 changed files with 2009 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/skins/vector/css/matrix-react-sdk/views/dialogs/_ConfirmUserActionDialog.scss
View File

@@ -37,6 +37,7 @@ limitations under the License.
font-family: 'Open Sans', Arial, Helvetica, Sans-Serif;
font-size: 14px;
color: $primary-fg-color;
background-color: $primary-bg-color;
border-radius: 3px;
border: solid 1px $input-border-color;

12
src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
View File

@@ -183,6 +183,10 @@ limitations under the License.
visibility: visible;
}
.mx_MessagePanel_alwaysShowTimestamps .mx_MessageTimestamp {
visibility: visible;
}
.mx_EventTile_selected .mx_MessageTimestamp {
left: 3px;
}
@@ -263,6 +267,14 @@ limitations under the License.
cursor: pointer;
}
.mx_EventTile_12hr .mx_EventTile_e2eIcon {
padding-left: 5px;
}
.mx_EventTile_12hr .mx_MessageTimestamp {
text-align: center;
}
.mx_EventTile:hover.mx_EventTile_verified .mx_EventTile_line,
.mx_EventTile:hover.mx_EventTile_unverified .mx_EventTile_line {
padding-left: 60px;