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

Merge branch 'develop' into luke/merge-RoomTile-context-menus

Browse Source 
Conflicts:
	src/components/views/context_menus/RoomTagContextMenu.js
This commit is contained in:
Luke Barnard
2017-03-14 14:01:47 +00:00
parent 3dc45886f7 4e6541b404
commit e4c155a881
13 changed files with 135 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/skins/vector/css/matrix-react-sdk/views/dialogs/_ChatCreateOrReuseChatDialog.scss Normal file
View File

@@ -0,0 +1,27 @@
/*
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_ChatCreateOrReuseDialog .mx_ChatCreateOrReuseDialog_tiles {
margin-top: 24px;
}
.mx_ChatCreateOrReuseDialog .mx_Dialog_content {
margin-bottom: 24px;
}
.mx_ChatCreateOrReuseDialog .mx_RoomTile_badge {
display: none;
}

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

@@ -14,22 +14,39 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
.mx_ConfirmUserActionDialog .mx_Dialog_content {
min-height: 48px;
margin-bottom: 24px;
}
.mx_ConfirmUserActionDialog_avatar {
float: left;
margin-right: 20px;
margin-top: -2px;
}
.mx_ConfirmUserActionDialog_name {
font-size: 150%;
font-size: 18px;
}
.mx_ConfirmUserActionDialog_userId {
font-style: italic;
font-size: 13px;
}
.mx_ConfirmUserActionDialog_reasonField {
margin-bottom: 40px;
font-family: 'Open Sans', Arial, Helvetica, Sans-Serif;
font-size: 14px;
color: $primary-fg-color;
border-radius: 3px;
border: solid 1px $input-border-color;
line-height: 36px;
padding-left: 16px;
padding-right: 16px;
padding-top: 1px;
padding-bottom: 1px;
margin-bottom: 24px;
width: 90%;
font-size: 120%;
height: 35px;
}

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

@@ -130,6 +130,16 @@ limitations under the License.
color: $event-notsent-color;
}
.mx_EventTile_redacted {
padding-top: 0px;
}
.mx_EventTile_redacted .mx_EventTile_line,
.mx_EventTile_redacted:hover .mx_EventTile_line,
.mx_EventTile_redacted.menu .mx_EventTile_line {
background-color: $primary-fg-color;
}
.mx_EventTile_highlight,
.mx_EventTile_highlight .markdown-body
{