PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #603 from vector-im/read_marker_animate

Browse source 
New CSS for read markers
This commit is contained in:
David Baker 2016-01-12 17:58:36 +00:00
commit cae3ab410f
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.json
View file

@ -1,4 +1,4 @@
{ {
"default_hs_url": "https://matrix.org", "default_hs_url": "http://localhost:8008",
"default_is_url": "https://vector.im" "default_is_url": "https://vector.im"
} }

10
src/skins/vector/css/matrix-react-sdk/structures/RoomView.css
View file

@ -164,9 +164,17 @@ limitations under the License.
margin-bottom: 12px; margin-bottom: 12px;
} }
li.mx_RoomView_myReadMarker_container {
height: 0px;
margin: 0px;
padding: 0px;
border: 0px;
}
hr.mx_RoomView_myReadMarker { hr.mx_RoomView_myReadMarker {
border-top: solid 1px #76cfa6; border-top: solid 1px #76cfa6;
border-bottom: none; border-bottom: solid 1px #76cfa6;
margin-top: 0px;
} }
.mx_RoomView_statusArea { .mx_RoomView_statusArea {

2
src/skins/vector/css/matrix-react-sdk/views/rooms/EventTile.css
View file

@ -135,8 +135,8 @@ limitations under the License.
z-index: 1; z-index: 1;
position: relative; position: relative;
width: 90px; width: 90px;
height: 1px; /* Hack to stop the height of this pushing the messages apart. Replaces marigin-top: -6px. This interacts better with a read marker being in between. Content overflows. */
margin-right: 10px; margin-right: 10px;
margin-top: -6px;
} }
.mx_EventTile .mx_MessageTimestamp { .mx_EventTile .mx_MessageTimestamp {