Commit Graph
75 Commits
Author SHA1 Message Date
Travis Ralston 5845a1ec7a Merge branch 'develop' into travis/remove-presence 2018-04-11 15:18:30 -06:00
Richard Lewis 38efebb8d3 Split out sticker CSS 2018-03-08 12:31:23 +00:00
Richard Lewis c198dd381f Pull in changes from develop 2018-02-23 17:31:24 +00:00
Luke Barnard d47c9d8b6e Add context menu to TagPanel
See https://github.com/matrix-org/matrix-react-sdk/pull/1743
2018-02-12 18:02:55 +00:00
Michael Telatynski 00b7cc512b Split MImageBody into MImageBody,MFileBody to match react-sdk
and having the classnames match their components.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-05 13:25:09 +00:00
Michael Telatynski c2aa8137bb sort components scss
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-23 20:02:47 +00:00
Michael Telatynski f5fc86258f s/Highlight/SyntaxHighlight/
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-22 18:59:18 +00:00
Richard Lewis c340032bd1 Move sticker related CSS to its own file. 2018-01-17 15:49:03 +00:00
Michael Telatynski 670f02acf8 Merge branches 'develop' and 't3chguy/highlight_things' of github.com:vector-im/riot-web into t3chguy/highlight_things 2018-01-16 18:04:08 +00:00
Travis Ralston 504a575feb Revert "Merge pull request #5286 from turt2live/travis/presence"
This reverts commit 3e72d8d969.
2017-12-25 14:29:50 -07:00
Michael Telatynski 8a7477f50c Highlight ViewSource and Devtools ViewSource
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-20 20:40:41 +00:00
Michael Telatynski 9c38794ad5 Style datesep inside Quote
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-15 18:37:44 +00:00
Michael Telatynski 4bc99b7f01 move QuotePreview CSS out to own file
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-12 23:40:54 +00:00
Luke Barnard 0c43edb629 CSS for new TagPanel 2017-11-29 16:41:00 +00:00
Luke Barnard 6fc173eaa9 CSS required for moving group publication toggles to UserSettings
See https://github.com/matrix-org/matrix-react-sdk/pull/1634
2017-11-27 18:59:33 +00:00
Matthew HodgsonandGitHub 3e72d8d969 Merge pull request #5286 from turt2live/travis/presence
CSS/components for custom presence controls
2017-11-14 23:53:26 +00:00
Luke BarnardandGitHub 60de1dbffb Merge pull request #5546 from vector-im/luke/groups-add-rooms-with-visibility
CSS for adding rooms to a group with visibility
2017-11-08 10:04:38 +00:00
Luke Barnard 26d9677bbe CSS for adding rooms to a group with visibility
Also, make chat invite error looks slightly more normal
2017-11-07 18:49:28 +00:00
Luke Barnard 4c0e956cc1 Name things in a sane way 2017-11-07 15:13:17 +00:00
Luke Barnard e1d16acddb Implement general-purpose tooltip "(?)"-style 2017-11-07 14:09:04 +00:00
Luke Barnard 3192c345be rethemedex
Needed, having removed _GroupInviteTile.scss
2017-11-03 14:11:07 +00:00
Luke Barnard c01ea56676 Add toggle to alter visibility of room-group association 2017-11-02 13:40:07 +00:00
Travis Ralston deb50b2d43 Add presence context menu and styling
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 23:15:26 -06:00
Travis Ralston e2b02ad60d Merge branch 'develop' into travis/presence 2017-10-14 21:45:59 -06:00
Travis Ralston 3e066d3aef Merge branch 'develop' into travis/pinned_messages 2017-10-14 16:11:17 -06:00
Travis Ralston 9d17ed7407 CSS for presence member avatar
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 14:33:55 -06:00
Michael Telatynski bf6a3470b4 Merge branch 'develop' of github.com:vector-im/riot-web into set_default_federate_by_settings 2017-10-04 22:35:58 +01:00
Luke Barnard a9d308004e Factor out EditableItemList component from AliasSettings 2017-10-04 10:30:09 +01:00
Luke Barnard 195395e7ee Adjust CSS for groupRoomTile and add QuestionDialog right padding
(The confirmation dialog for removing a room needed padding)
2017-10-03 11:14:43 +01:00
Travis Ralston 2d153a72c1 Split up CSS; use .catch instead of .then
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 13:33:14 -06:00
Travis Ralston 078ee54edf Move the PinnedEventsPanel to the react-sdk
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 13:15:21 -06:00
Luke Barnard 014464d82b CSS for "remove" button on GroupRoomTile 2017-09-29 17:58:42 +01:00
Travis Ralston 5daa16ab53 Add panel for pinned messages.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-29 10:42:58 -06:00
Luke BarnardandGitHub fbcccd8be0 Merge pull request #4830 from vector-im/dbkr/group_userlist
Group Membership UI
2017-09-19 13:26:02 +01:00
Michael Telatynski b84f258f87 add bottom margin to navigation buttons of room state explorer
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-31 13:49:52 +01:00
David Baker 07b6e215a1 CSS for group invite tiles 2017-08-18 11:24:52 +01:00
Michael Telatynski f0967d4f18 split css out as the modal is no longer generic
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-17 13:31:09 +01:00
Luke Barnard d901515059 rethemedex 2017-07-13 10:16:23 +01:00
David Baker 43bdc04637 Merge remote-tracking branch 'origin/develop' into dbkr/my_groups 2017-07-07 10:47:41 +01:00
David Baker 2ccd36d09e Merge remote-tracking branch 'origin/develop' into erikj/group_server 2017-07-05 10:13:53 +01:00
David Baker 796b51113f CSS for Create Group dialog 2017-06-29 16:59:26 +01:00
David Baker 105c54a1f1 CSS for Groups page 2017-06-28 13:57:20 +01:00
Richard Lewis 83353e9419 Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/apps 2017-06-27 12:40:32 +01:00
David Baker f6627937fa CSS for GroupView 2017-06-27 11:52:46 +01:00
David Baker 2c186aafae Fix h2 in markdown being weird
Date separator style was just define don any h2 in the message
list, so got picked up by any h2s in markdown too. Give date
separators their own class.

Fixes https://github.com/vector-im/riot-web/issues/4328
2017-06-16 11:36:24 +01:00
Luke Barnard 4f55f810af Ask for email address after setting password for the first time
This is so that the user can reset their password.
2017-06-14 09:30:08 +01:00
Richard Lewis 152e3c6258 Merge branch 'master' of https://github.com/vector-im/riot-web into rxl881/apps 2017-06-13 11:40:23 +01:00
David Baker e30fcdba4c Merge branch 'develop' into new-guest-access 2017-06-06 11:39:47 +01:00
Matthew Hodgson e825a66e1f add CSS for RoomAvatarEvent and always make AccessibleButtons have a cursor pointer 2017-06-01 13:09:23 +01:00
Matthew Hodgson 1f4f86b5f8 rework tom's welcome page to fit in slightly better with riot's UI/UX
* moves login button to top-left
* switches from iframe to a request() to load the welcome page to inherit CSS (probably breaks RTS :/)
* namespace CSS
* change the layout a bit.
2017-05-30 03:58:45 +01:00