experiments in dharma

This commit is contained in:
Matthew Hodgson 2018-05-25 03:17:29 +01:00
parent 693ccf69c7
commit 3bf28a08ec
30 changed files with 454 additions and 72 deletions

View file

@ -15,7 +15,6 @@ limitations under the License.
*/
.mx_MessageComposer_wrapper {
max-width: 960px;
vertical-align: middle;
margin: auto;
border-top: 1px solid $primary-hairline-color;
@ -196,7 +195,6 @@ limitations under the License.
.mx_MessageComposer_formatbar {
margin: auto;
max-width: 960px;
display: flex;
height: 30px;

View file

@ -20,15 +20,15 @@ limitations under the License.
}
.mx_RoomHeader_wrapper {
max-width: 960px;
margin: auto;
height: 70px;
height: 52px;
align-items: center;
display: flex;
}
.mx_RoomHeader_leftRow {
margin-left: -2px;
display: flex;
margin-left: 15px;
order: 1;
flex: 1;
overflow: hidden;
@ -72,15 +72,15 @@ limitations under the License.
}
.mx_RoomHeader_info {
display: table-cell;
width: 100%;
vertical-align: middle;
display: flex;
flex: 1;
align-items: center;
}
.mx_RoomHeader_simpleHeader {
line-height: 70px;
color: $primary-fg-color;
font-size: 22px;
line-height: 52px;
color: $roomheader-color;
font-size: 18px;
font-weight: bold;
overflow: hidden;
margin-left: 63px;
@ -99,15 +99,12 @@ limitations under the License.
}
.mx_RoomHeader_name {
vertical-align: middle;
width: 100%;
height: 31px;
overflow: hidden;
color: $primary-fg-color;
color: $roomheader-color;
font-weight: bold;
font-size: 22px;
padding-left: 19px;
padding-right: 16px;
font-size: 18px;
padding-left: 15px;
padding-right: 15px;
/* why isn't text-overflow working? */
text-overflow: ellipsis;
border-bottom: 1px solid transparent;
@ -166,25 +163,20 @@ limitations under the License.
}
.mx_RoomHeader_topic {
vertical-align: bottom;
float: left;
max-height: 38px;
color: $settings-grey-fg-color;
font-weight: 300;
color: $roomtopic-color;
font-weight: 400;
font-size: 13px;
margin-left: 19px;
margin-right: 16px;
margin-right: 13px;
overflow: hidden;
text-overflow: ellipsis;
border-bottom: 1px solid transparent;
column-width: 960px;
}
.mx_RoomHeader_avatar {
display: table-cell;
width: 48px;
height: 50px;
vertical-align: middle;
flex: 0;
width: 28px;
height: 28px;
}
.mx_RoomHeader_avatar .mx_BaseAvatar_image {

View file

@ -17,9 +17,10 @@ limitations under the License.
.mx_RoomTile {
position: relative;
cursor: pointer;
font-size: 13px;
font-size: 14px;
display: block;
height: 34px;
height: 40px;
margin: 0px 9px 0px 9px;
background-color: $secondary-accent-color;
}
@ -44,12 +45,12 @@ limitations under the License.
.mx_RoomTile_avatar {
display: inline-block;
padding-top: 5px;
padding-bottom: 5px;
padding-left: 16px;
padding-right: 6px;
width: 24px;
height: 24px;
padding-top: 4px;
padding-bottom: 4px;
padding-left: 14px;
padding-right: 12px;
width: 32px;
height: 32px;
vertical-align: middle;
}
@ -154,9 +155,14 @@ limitations under the License.
}
.mx_RoomTile_selected {
border-radius: 4px;
background-color: $roomtile-selected-bg-color;
}
.mx_RoomTile_selected .mx_RoomTile_name {
color: $roomtile-selected-color;
}
.mx_DNDRoomTile {
transform: none;
transition: transform 0.2s;