Merge branch 'develop' into matthew/roomsettings2
This commit is contained in:
commit
f2fa9fe398
|
@ -1,4 +1,4 @@
|
||||||
{
|
{
|
||||||
"default_hs_url": "http://localhost:8008",
|
"default_hs_url": "https://matrix.org",
|
||||||
"default_is_url": "https://vector.im"
|
"default_is_url": "https://vector.im"
|
||||||
}
|
}
|
||||||
|
|
|
@ -60,11 +60,6 @@ limitations under the License.
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_MemberTile_presence {
|
|
||||||
font-size: 11px;
|
|
||||||
opacity: 0.5;
|
|
||||||
}
|
|
||||||
|
|
||||||
.mx_MemberTile_chevron {
|
.mx_MemberTile_chevron {
|
||||||
margin-top: 8px;
|
margin-top: 8px;
|
||||||
margin-right: -4px;
|
margin-right: -4px;
|
||||||
|
|
|
@ -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;
|
||||||
|
}
|
|
@ -24,6 +24,22 @@ limitations under the License.
|
||||||
cursor: pointer;
|
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 {
|
.mx_TabCompleteBar_item img {
|
||||||
border-radius: 24px;
|
border-radius: 24px;
|
||||||
margin-right: 8px;
|
margin-right: 8px;
|
||||||
|
|
Loading…
Reference in New Issue