gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2017-10-23 13:55:46 +00:00
parent ec12b8ee93 c7d18ff52e
commit e05ec68a61
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config.sample.json
View File

@ -5,7 +5,10 @@
"integrations_ui_url": "https://scalar.vector.im/",
"integrations_rest_url": "https://scalar.vector.im/api",
"bug_report_endpoint_url": "https://riot.im/bugreports/submit",
"enableLabs": true,
"features": {
"feature_groups": "labs"
"feature_pinning": "labs",
},
"default_federate": true,
"roomDirectory": {
"servers": [

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

@ -67,8 +67,9 @@ limitations under the License.
}
.mx_EventTile .mx_SenderProfile .mx_Flair img {
vertical-align: -3px;
vertical-align: -2px;
margin-right: 2px;
border-radius: 8px;
}
.mx_EventTile .mx_MessageTimestamp {