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

Merge branch 'develop' into matthew/status

Browse source
This commit is contained in:
Matthew Hodgson 2017-10-26 01:46:06 +01:00
commit 225c7ee621
37 changed files with 9612 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/skins/vector/css/matrix-react-sdk/structures/_MyGroups.scss
View file

@ -24,14 +24,38 @@ limitations under the License.
margin-left: 0px;
}
.mx_MyGroups_joinCreateBox {
display: table;
margin-bottom: 30px;
.mx_MyGroups_header {
/* Keep mid-point of create button aligned with icon in page header */
margin-left: 2px;
display: flex;
flex-wrap: wrap;
}
.mx_MyGroups_createBox, .mx_MyGroups_joinBox {
display: table-cell;
width: 40%;
.mx_MyGroups_headerCard {
flex: 1 0 50%;
margin-bottom: 30px;
min-width: 400px;
display: flex;
align-items: center;
}
.mx_MyGroups_headerCard .mx_MyGroups_headerCard_button {
margin-right: 13px;
height: 50px;
}
.mx_MyGroups_headerCard_button object {
/* Otherwise the SVG object absorbs clicks and the button doesn't work */
pointer-events: none;
}
.mx_MyGroups_headerCard_header {
font-weight: bold;
margin-bottom: 10px;
}
.mx_MyGroups_headerCard_content {
padding-right: 15px;
}
/* Until the button is wired up */
@ -39,23 +63,16 @@ limitations under the License.
visibility: hidden;
}
.mx_MyGroups_joinCreateHeader {
font-weight: bold;
margin-bottom: 10px;
}
.mx_MyGroups_joinCreateButton {
float: left;
margin: 10px;
}
.mx_MyGroups_joinCreateButton object {
/* Otherwise the SVG object absorbs clicks and the button doesn't work */
pointer-events: none;
}
.mx_MyGroups_content {
clear: left;
margin-left: 2px;
}
.mx_MyGroups_placeholder {
background-color: $group-my-groups-placeholder-bg;
color: $group-my-groups-placeholder-fg;
line-height: 400px;
border-radius: 10px;
text-align: center;
}
.mx_MyGroups_joinedGroups {
@ -66,7 +83,8 @@ limitations under the License.
}
.mx_MyGroups_joinedGroups .mx_GroupTile {
width: 300px;
min-width: 300px;
flex: 1 0 25%;
height: 75px;
margin-bottom: 15px;
margin-right: 10px;

3
src/skins/vector/css/matrix-react-sdk/views/rooms/_EventTile.scss
View file

@ -67,8 +67,9 @@ limitations under the License.
}
.mx_EventTile .mx_SenderProfile .mx_Flair img {
vertical-align: -3px;
vertical-align: -2px;
margin-right: 2px;
border-radius: 8px;
}
.mx_EventTile .mx_MessageTimestamp {

10
src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomHeader.scss
View file

@ -137,8 +137,8 @@ limitations under the License.
.mx_RoomHeader_avatarPicker_remove {
position: absolute;
top: 10px;
left: 45px;
top: -11px;
right: -9px;
}
.mx_RoomHeader_name:hover div:not(.mx_RoomHeader_editable) {
@ -186,8 +186,12 @@ limitations under the License.
object-fit: cover;
}
.mx_RoomHeader_avatarPicker {
margin-top: 23px;
position: relative;
}
.mx_RoomHeader_avatarPicker_edit {
position: absolute;
margin-left: 16px;
margin-top: 4px;
}

3
src/skins/vector/css/themes/_base.scss
View file

@ -28,7 +28,10 @@ $warning-color: #ff0064;
$mention-user-pill-bg-color: #ff0064;
$other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
// groups
$group-alert-color: #774f7e;
$group-my-groups-placeholder-bg: #f7f7f7;
$group-my-groups-placeholder-fg: #888;
$preview-bar-bg-color: #f7f7f7;

3
src/skins/vector/css/themes/_dark.scss
View file

@ -20,6 +20,9 @@ $focus-brightness: 200%;
// red warning colour
$warning-color: #ff0064;
// groups
$group-my-groups-placeholder-bg: #454545;
$other-user-pill-bg-color: rgba(255, 255, 255, 0.1);
$preview-bar-bg-color: #333;