Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into matthew/roomsettings2

Browse Source
This commit is contained in:
Matthew Hodgson 2016-01-14 16:49:48 +00:00
commit f2fa9fe398
4 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.json
View File

@ -1,4 +1,4 @@
{
"default_hs_url": "http://localhost:8008",
"default_hs_url": "https://matrix.org",
"default_is_url": "https://vector.im"
}

5
src/skins/vector/css/matrix-react-sdk/views/rooms/MemberTile.css
View File

@ -60,11 +60,6 @@ limitations under the License.
text-overflow: ellipsis;
}
.mx_MemberTile_presence {
font-size: 11px;
opacity: 0.5;
}
.mx_MemberTile_chevron {
margin-top: 8px;
margin-right: -4px;

20
src/skins/vector/css/matrix-react-sdk/views/rooms/PresenceLabel.css Normal file
View File

@ -0,0 +1,20 @@
/*
Copyright 2016 OpenMarket Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
.mx_PresenceLabel {
font-size: 11px;
opacity: 0.5;
}

16
src/skins/vector/css/matrix-react-sdk/views/rooms/TabCompleteBar.css
View File

@ -24,6 +24,22 @@ limitations under the License.
cursor: pointer;
}
.mx_TabCompleteBar_command {
margin-right: 8px;
background-color: #76CFA6;
padding-left: 8px;
padding-right: 8px;
padding-top: 2px;
padding-bottom: 2px;
margin-bottom: 6px;
border-radius: 30px;
}
.mx_TabCompleteBar_command .mx_TabCompleteBar_text {
opacity: 1.0;
color: #fff;
}
.mx_TabCompleteBar_item img {
border-radius: 24px;
margin-right: 8px;