imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
David Baker 2017-08-22 11:08:58 +01:00
commit bbe00b2f54
37 changed files with 2222 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
View file

@ -76,6 +76,10 @@ limitations under the License.
flex: 0 0 auto;
}
.mx_RoomView_auxPanel_apps {
max-width: 1920px ! important;
}
.mx_RoomView_topUnreadMessagesBar {
order: 3;
}

5
src/skins/vector/css/matrix-react-sdk/views/elements/_RichText.scss
View file

@ -11,6 +11,11 @@
padding-left: 5px;
}
.mx_EventTile_body .mx_UserPill,
.mx_EventTile_body .mx_RoomPill {
cursor: pointer;
}
/* More specific to override `.markdown-body a` color */
.mx_EventTile_content .markdown-body a.mx_UserPill,
.mx_UserPill {

13
src/skins/vector/css/matrix-react-sdk/views/rooms/_AppsDrawer.scss
View file

@ -15,12 +15,14 @@ limitations under the License.
*/
.mx_AppsDrawer {
margin-bottom: 3px;
}
.mx_AppsContainer {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
}
.mx_AddWidget_button {
@ -28,11 +30,15 @@ limitations under the License.
cursor: pointer;
padding-right: 12px;
padding: 0;
margin: 0 0 5px 0;
margin: 5px auto 5px auto;
color: $accent-color;
font-size: 12px;
}
.mx_AddWidget_button_full_width {
max-width: 960px;
}
.mx_SetAppURLDialog_input {
border-radius: 3px;
border: 1px solid $input-border-color;
@ -43,6 +49,7 @@ limitations under the License.
}
.mx_AppTile {
max-width: 960px;
width: 50%;
margin: 0 5px 2px 0;
border: 1px solid $primary-hairline-color;
@ -52,6 +59,7 @@ limitations under the License.
}
.mx_AppTileFullWidth {
max-width: 960px;
width: 100%;
margin: 0;
padding: 0;
@ -66,7 +74,7 @@ limitations under the License.
margin: 0;
padding: 2px 10px;
// background-color: $e2e-verified-color;
border-bottom: 1px solid $primary-hairline-color;
// border-bottom: 1px solid $primary-hairline-color;
font-size: 10px;
}
@ -94,6 +102,7 @@ limitations under the License.
.mx_AppTileBody{
height: 350px;
width: 100%;
overflow: hidden;
}