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

Merge branch 'develop' into feature-autocomplete

Browse Source
This commit is contained in:
Aviral Dasgupta
2016-06-21 04:09:23 +05:30
parent 034c045b37 9556795611
commit 510bb5785e
9 changed files with 87 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css
View File

@@ -17,7 +17,7 @@ limitations under the License.
.mx_EventTile {
max-width: 100%;
clear: both;
margin-top: 24px;
padding-top: 24px;
margin-left: 65px;
}
@@ -33,7 +33,7 @@ limitations under the License.
}
.mx_EventTile_continuation {
margin-top: 8px ! important;
padding-top: 8px ! important;
}
.mx_EventTile_verified {

9
src/skins/vector/css/matrix-react-sdk/views/rooms/MemberDeviceInfo.css
View File

@@ -26,7 +26,6 @@ limitations under the License.
.mx_MemberDeviceInfo_textButton {
color: #fff;
background-color: #76cfa6;
height: 20px;
border-radius: 20px;
text-align: center;
@@ -35,3 +34,11 @@ limitations under the License.
cursor: pointer;
}
.mx_MemberDeviceInfo_verify {
background-color: #76cfa6;
}
.mx_MemberDeviceInfo_unverify {
background-color: #e55e5e;
}