Commit graph

620 commits

Author SHA1 Message Date
Matthew Hodgson
292af1e59c improve settings layout and fix FF bugs 2016-01-24 18:14:52 +00:00
Matthew Hodgson
d3bc0feb83 fix ugly wrapping bug 2016-01-24 17:54:01 +00:00
Matthew Hodgson
19bfd829d0 add scrollToBottomBar and fix spacing for status bars in general 2016-01-24 01:52:21 +00:00
Matthew Hodgson
759b318bb5 fix safari 2016-01-23 01:24:04 +00:00
Matthew Hodgson
dd19d2aaee red bar for highlights even if there's a unreadNotify too 2016-01-22 18:04:54 +00:00
Matthew Hodgson
e0ecde6760 put a black badge on unread notifications, and a red one for unread highlights 2016-01-22 17:23:04 +00:00
Matthew Hodgson
0ee1892a0b truncate room list 2016-01-22 15:31:42 +00:00
Matthew Hodgson
a76167d175 correct layout for truncated lists 2016-01-21 17:38:46 +00:00
Matthew Hodgson
bd75234a2f make CSS work on FF 2016-01-21 00:39:26 +00:00
Matthew Hodgson
6573ba8c20 fix up Start Chat behaviour as per Amandine's feedback 2016-01-21 00:16:26 +00:00
Matthew Hodgson
6117e09a3f implement the correct design for memberlist 2016-01-20 22:04:32 +00:00
Matthew Hodgson
1fd60f1e44 revert read marker css 2016-01-20 17:23:33 +00:00
Matthew Hodgson
48052415b7 usersettings button layout 2016-01-20 17:09:53 +00:00
Matthew Hodgson
e87e22a438 rhsbutton 2016-01-20 17:06:13 +00:00
Matthew Hodgson
5b2f921190 Fix bold avatar letters 2016-01-20 17:01:19 +00:00
Matthew Hodgson
b830f43371 remove RoomAvatar; stale border-radius; fix aliases table 2016-01-20 16:59:53 +00:00
Matthew Hodgson
6332e3908e roomsettings css fixes 2016-01-20 16:39:14 +00:00
Matthew Hodgson
82742f9f13 oops, fix tinted read up to marker correctly 2016-01-20 16:06:35 +00:00
Matthew Hodgson
60d2d45255 readd in the .mx_EntityTile_power class. don't understand why it was killed :'( 2016-01-20 15:39:42 +00:00
Matthew Hodgson
6ecdb02e81 sanitize avatar border radii 2016-01-20 15:26:48 +00:00
Matthew Hodgson
4d3918109a skin new invite UI CSS 2016-01-20 14:58:27 +00:00
Matthew Hodgson
9a9db53e0a fix tinting of read marker again 2016-01-20 14:58:17 +00:00
Matthew Hodgson
3e8c6a42d3 roomsettings layout tweaks 2016-01-18 19:58:02 +00:00
Matthew Hodgson
3b8e5073b5 improve layout 2016-01-18 19:57:32 +00:00
Matthew Hodgson
d5c291ae62 Merge branch 'kegan/invite-search' into matthew/roompreview 2016-01-18 18:00:58 +00:00
Matthew Hodgson
d6f6f32c74 WIP to support non-guest peeking, and slightly improve roomdirectory look & feel for now 2016-01-18 17:37:13 +00:00
Kegan Dougal
317e1fb9cd Merge branch 'develop' into kegan/invite-search 2016-01-18 17:33:26 +00:00
Kegan Dougal
ac4b221690 More CSS fun for border bottom 2016-01-18 17:22:02 +00:00
manuroe
fdf5b0a4fc Merge branch 'develop' into push-rules-settings
# Conflicts:
#	src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css
2016-01-18 18:14:20 +01:00
Kegan Dougal
fef02f2fd1 s/MemberTile/EntityTile/ 2016-01-18 16:43:00 +00:00
Matthew Hodgson
0ef03c5ca4 Merge pull request #653 from vector-im/matthew/roomsettings2
Finish off RoomSettings (part 2)
2016-01-18 13:39:55 +00:00
Matthew Hodgson
5a1b0a1dab Merge pull request #657 from vector-im/matthew/memberlist
Fix up MemberList and MemberInfo cosmetics a bit
2016-01-18 13:39:42 +00:00
Kegan Dougal
77621fe035 Add missing CSS from #638 2016-01-18 12:06:46 +00:00
Matthew Hodgson
8792be4db2 moar space 2016-01-18 01:25:57 +00:00
Matthew Hodgson
1fef91b82c MemberInfo lipstick 2016-01-18 01:18:11 +00:00
Matthew Hodgson
b2a1c89e83 bring back power badges 2016-01-18 00:16:04 +00:00
Matthew Hodgson
40d2018c17 fix checkbox css 2016-01-17 12:26:54 +00:00
Matthew Hodgson
a61afa0f31 fix css thinko 2016-01-17 02:46:22 +00:00
Matthew Hodgson
4e7c58e242 fix broken icon 2016-01-17 02:46:15 +00:00
Matthew Hodgson
8771369937 more layout 2016-01-15 20:29:44 +00:00
Matthew Hodgson
394fb2373b more layout tweaks for RoomSettings 2016-01-15 16:50:12 +00:00
Matthew Hodgson
eb8064f961 fix cursors for changeavatar 2016-01-15 16:32:39 +00:00
Matthew Hodgson
531aa153bb no more textarea in roomsettings 2016-01-15 16:32:23 +00:00
Kegan Dougal
17489ae350 s/MemberAvatar/BaseAvatar/ and rename classes 2016-01-15 16:12:28 +00:00
Matthew Hodgson
762dd69f0a more bottom margin on editable roomheader 2016-01-15 15:48:29 +00:00
manuroe
cb8b052dc0 PushRules settings: Show unmanaged rules into an "advanced section" 2016-01-15 16:45:27 +01:00
Matthew Hodgson
1fcb4ba94f droptarget and usersettings and roomsettings layout tweaks 2016-01-15 15:26:00 +00:00
Matthew Hodgson
41ae851df4 fix up user settings CSS somewhat 2016-01-15 12:34:01 +00:00
Matthew Hodgson
d1f26e3911 camera icon 2016-01-14 17:26:16 +00:00
Matthew Hodgson
c1aac1aaca roomsetting icons 2016-01-14 17:25:21 +00:00
Matthew Hodgson
f2fa9fe398 Merge branch 'develop' into matthew/roomsettings2 2016-01-14 16:49:48 +00:00
David Baker
a65a15e9bb Shift read marker down by 5px 2016-01-14 16:45:13 +00:00
Matthew Hodgson
9ada5f7ddd CSS for tab complete slashcommands 2016-01-14 16:29:03 +00:00
Matthew Hodgson
17e540d372 fix line wrapping of code blocks in multiline msgs 2016-01-14 11:57:07 +00:00
Kegsay
db2d7fdbff Merge pull request #622 from vector-im/kegan/3pid-invite-memberlist
CSS for email invite memberlist fix
2016-01-14 10:45:50 +00:00
Kegan Dougal
927ac5fe64 2016 only 2016-01-14 10:45:38 +00:00
Matthew Hodgson
56718650b9 fix comedy double-margin caused by killing off MessageTiles 2016-01-13 17:39:57 +00:00
Matthew Hodgson
e3eef45684 fix comedy double-margin caused by killing off MessageTiles 2016-01-13 17:39:49 +00:00
Matthew Hodgson
68f846e129 Merge branch 'develop' into matthew/roomsettings2 2016-01-13 17:33:32 +00:00
Matthew Hodgson
f2171c11f0 uncommitted WIP roomsetting CSS 2016-01-13 17:33:03 +00:00
Kegan Dougal
1d5e661bd0 Split out css for new PresenceLabel 2016-01-13 15:56:44 +00:00
manuroe
7fc5ab3c6e PushRules settings: Use the new TextInputDialog to display keywords list. We earn the focus at the end of the keywords list and the management of enter and esc keys 2016-01-13 16:36:57 +01:00
Kegsay
7232659195 Merge pull request #612 from vector-im/kegan/guest-peek-then-join
Add css for room preview bar.
2016-01-13 10:37:13 +00:00
manuroe
10d3076d6b PushRules settings: Display keywords modal dialog 2016-01-13 09:11:56 +01:00
David Baker
cae3ab410f Merge pull request #603 from vector-im/read_marker_animate
New CSS for read markers
2016-01-12 17:58:36 +00:00
Kegan Dougal
2bada93fdc CSS for forgot password link 2016-01-12 16:39:29 +00:00
David Baker
977b223929 Hopefully working CSS that doesn't cause the messages to jump about when a read marker disappears. 2016-01-12 14:20:05 +00:00
Kegan Dougal
f706f75a6e Add css for room preview bar. 2016-01-12 14:11:00 +00:00
manuroe
6d510db2db PPushRules settings: Fixed React warnings 2016-01-11 17:32:37 +01:00
manuroe
ee13dd7b6c PushRules settings: Added a dedicated component to display them 2016-01-11 17:24:04 +01:00
David Baker
6cd0aeb607 Revert 4px offset: it ends up in the middle of the line above 2016-01-11 10:56:08 +00:00
David Baker
1e57aa8c78 Make read up to line 2px and position relative so we can shift it up a little 2016-01-11 10:52:29 +00:00
Matthew Hodgson
93c4fc8785 switch EditableText to contentEditable; fix auxPanel layout bug in the general case (not just for video) 2016-01-10 13:04:15 +00:00
Matthew Hodgson
d49f8721ce fix leave.svg so that it can be tinted 2016-01-09 00:56:10 +00:00
David Baker
c02d9890c5 New CSS for read markers 2016-01-09 00:09:11 +00:00
Matthew Hodgson
ccd518cc4c CSS and imagery for fixed up RoomSettings 2016-01-08 03:26:07 +00:00
Matthew Hodgson
d2635373f0 Merge pull request #585 from vector-im/matthew/dynamic-svg
Make SVGs and CSS dynamically recolourable
2016-01-07 11:41:46 +00:00
David Baker
36e5ac3d7f Add CSS for the green read-up-to marker. 2016-01-07 11:22:41 +00:00
Matthew Hodgson
df111223fc copyrights for 2016 2016-01-07 04:17:56 +00:00
Matthew Hodgson
bb313d1f3c vertical-align room messages to the bottom of the page 2016-01-05 18:49:47 +00:00
Matthew Hodgson
a1bdfaa8a2 vertical-align room messages to the bottom of the page 2016-01-05 18:49:21 +00:00
Matthew Hodgson
1df4f2d556 fix hyperlink position for image downloads 2016-01-05 03:38:53 +00:00
Matthew Hodgson
b996022db2 fix up dynamically loaded svgs, and fix bottomleftmenu 2016-01-05 03:34:25 +00:00
Matthew Hodgson
bbf08d99cc tinterize more svg 2016-01-05 00:47:26 +00:00
Matthew Hodgson
3abdcbf806 switch SVGs from imgs to objects, fixing CSS to make onClicks work 2016-01-03 22:30:14 +00:00
Matthew Hodgson
b9a0b82537 shuffle around all the CSS to de-atomify it and make it match the react components 2016-01-03 00:10:17 +00:00
Matthew Hodgson
fa4bd09f0c fix room header height 2015-12-28 02:27:47 +00:00
Matthew Hodgson
8dd90980d8 add cancel button for lightbox and pare down pointer-events stuff a bit 2015-12-28 02:15:23 +00:00
Matthew Hodgson
e9db7b1dcc doh 2015-12-28 01:41:51 +00:00
Matthew Hodgson
388eb1ff4c use Open Sans, and fix duplication 2015-12-28 01:38:14 +00:00
Matthew Hodgson
0ab8466a3b make tabcomplete items clickable 2015-12-24 15:12:24 +00:00
Kegan Dougal
94609db3a6 Wrangle CSS to get avatar on UserSettings in the right place 2015-12-24 09:21:02 +00:00
Kegan Dougal
f9f85ec542 More user settings CSS 2015-12-23 16:53:19 +00:00
Kegan Dougal
d3938220cf Duplicate css for applying to mx_EditableText classes so it works with ChangeDisplayName 2015-12-23 14:13:24 +00:00
Kegsay
73d9ef54c3 Merge pull request #384 from vector-im/matthew/settings
WIP experiment of turning UserSettings into a controller-less component
2015-12-23 10:23:39 +00:00
Matthew Hodgson
f681ce5cdb add CSS for TabCompleteBar 2015-12-22 00:47:33 +00:00
Matthew Hodgson
ceadfef942 fix missing webkit prefixes for flexbox 2015-12-21 23:20:44 +00:00
Matthew Hodgson
f665848c5e speed up search anim 2015-12-21 23:20:10 +00:00
Matthew Hodgson
031b048c07 fix missing webkit prefixes for flexbox 2015-12-21 23:19:53 +00:00
Matthew Hodgson
d82c4c5ef3 fix safari flexbox bug 2015-12-21 23:16:44 +00:00
Matthew Hodgson
ae02d8d30a Merge branch 'develop' into matthew/settings 2015-12-21 13:10:34 +00:00
Matthew Hodgson
50aa988a34 fix layout 2015-12-21 12:37:50 +00:00
Matthew Hodgson
fdc94ccf98 ensure even hyperlinks are highlighted 2015-12-21 12:37:50 +00:00
Kegan Dougal
dcea0dd601 Move min-height to RoomList; remove bottommost prop 2015-12-18 17:13:57 +00:00
Matthew Hodgson
a7b9e54594 Merge branch 'develop' into matthew/settings 2015-12-18 00:36:46 +00:00
Matthew Hodgson
1a90a2c426 position the inbound call box correctly, and fix various issues with when the video preview and callview are shown 2015-12-17 02:53:53 +00:00
Matthew Hodgson
d945050de6 fix typing notifs 2015-12-15 15:59:40 +00:00
Matthew Hodgson
d3ecce2d2e add fullscreen button 2015-12-15 00:01:32 +00:00
Matthew Hodgson
a495aecdd8 assets for VoIP and DnD file upload 2015-12-14 23:38:24 +00:00
Matthew Hodgson
c553258aff add dedicated leave button to header 2015-12-13 13:49:54 +00:00
Matthew Hodgson
9c8984b308 fix vertical alignment of voip buttons 2015-12-13 04:14:20 +00:00
Matthew Hodgson
c2061ed439 revert dd08f53756 - do this in JS instead 2015-12-13 04:08:35 +00:00
Matthew Hodgson
96cddc5ca8 fix layout for long room names & topics 2015-12-12 17:30:08 +00:00
Matthew Hodgson
dd08f53756 don't let auxpanel push out the height of the roomview 2015-12-12 17:15:45 +00:00
Matthew Hodgson
056017007a improve look and feel of upload cancel 2015-12-12 16:41:32 +00:00
Richard van der Hoff
c36d1df417 Add a 'muted' icon for voip calls
... because even a crappy one is better than nothing
2015-12-11 15:00:25 +00:00
Matthew Hodgson
762281cd96 fix vertical spacing of roomheader 2015-12-11 03:39:13 +00:00
Matthew Hodgson
898cb399a3 show results 2015-12-11 02:58:47 +00:00
Matthew Hodgson
fea3fed460 animate the search button whilst searching 2015-12-11 02:24:58 +00:00
Matthew Hodgson
4c82d86092 nice green highlights 2015-12-11 01:35:05 +00:00
Matthew Hodgson
1c9d61d731 dedicated search button 2015-12-11 01:19:48 +00:00
Matthew Hodgson
7b702c4594 don't grey out invites randomly 2015-12-11 00:40:40 +00:00
Matthew Hodgson
d6bcf80431 make the settings button more discoverable by having the whole leftRow be a hover target 2015-12-10 19:48:05 +00:00
Matthew Hodgson
4b8d7a612a make the mx_RoomView_statusAreaBox_line full width as per the ribot design 2015-12-08 19:45:30 +00:00
Matthew Hodgson
b532fd046a actually use SVGs - oops 2015-12-08 10:28:00 +00:00
Kegan Dougal
1af1297afc Allow queued events to be cancelled. Make not sent events appear differently to sending events. 2015-12-07 11:38:34 +00:00
Matthew Hodgson
da5c687320 svgize coloured icons 2015-12-06 22:06:21 +00:00
David Baker
db5d9e2f6e Merge pull request #465 from vector-im/file_uploads
Move upload bar CSS to new classes
2015-12-03 10:58:03 +00:00
David Baker
547f59b1bc Oops, don't re-add these. 2015-12-03 10:00:29 +00:00
David Baker
2d2386ace5 Move upload bar CSS to new classes, and move into new, temporary place (since there is no new-style structure yet). 2015-12-02 18:19:03 +00:00
Matthew Hodgson
c603c1e37f dezalgo typing notigs on chrome 2015-12-02 17:37:19 +00:00
David Baker
939733b736 Merge branch 'develop' into require-css 2015-12-02 10:26:26 +00:00
Matthew Hodgson
349a88d640 stop clobbering our font colours 2015-12-01 21:44:22 +00:00
David Baker
d2c6e2195e Merge pull request #447 from vector-im/skindex-nextgen
Update skindexing for new world order
2015-12-01 18:12:47 +00:00
David Baker
a63bf7cb35 Merge branch 'develop' into skindex-nextgen 2015-12-01 18:10:57 +00:00
David Baker
7ff5e42f3e Run the CSS through webpack so we can pull in CSS files from modules with require rather than symlinking into the node_module directory which is breaking people on different npm versions. 2015-12-01 18:05:43 +00:00
Matthew Hodgson
2c12b9128b highlight binged rooms more clearly 2015-12-01 16:57:49 +00:00
David Baker
c281fe785a Merge branch 'develop' into skindex-nextgen 2015-12-01 15:53:11 +00:00
Kegan Dougal
8083e7f118 Move vector-only components to src/components. 2015-12-01 15:45:38 +00:00
David Baker
5098c7d16f Merge branch 'develop' into skindex-nextgen 2015-12-01 15:44:45 +00:00
Kegan Dougal
e07c03a7bb Merge branch 'develop' into kegan/vector-components 2015-12-01 15:39:02 +00:00
Kegsay
e7f6e09def Merge pull request #448 from vector-im/kegan/controller-merging4
Phase 4 controller merging
2015-12-01 15:34:25 +00:00
Matthew Hodgson
075d2b508d fix highlights on markdown 2015-12-01 13:13:51 +00:00
Kegan Dougal
e55e2bdd0d Remove unused class 2015-12-01 11:22:19 +00:00
Kegan Dougal
2a025201b1 Move remaining vector molecules to be components in vector (for now) 2015-12-01 11:19:54 +00:00
Matthew Hodgson
f89dcacf07 fix bottomleftmenu layout a bit 2015-12-01 11:11:32 +00:00
Matthew Hodgson
99f47b8601 match design spacing correctly 2015-12-01 11:07:12 +00:00
Matthew Hodgson
1896ab67d1 fix room avatar offset 2015-12-01 11:05:11 +00:00
Kegan Dougal
8f5f71ec80 Move MatrixChat to react-sdk. Move all login stuff to react SDK.
Removed Modulator stuff.
2015-11-30 18:10:09 +00:00
David Baker
021056cfd1 Move copyright header 2015-11-30 18:00:54 +00:00