Commit Graph

4258 Commits (317ff8c6af40bd93a474f188d177878b89082c4c)

Author SHA1 Message Date
Richard Lewis 317ff8c6af Beta tag styling 2017-07-27 23:02:19 +01:00
Richard Lewis 50f5abf535 Permissions button cursor. 2017-07-27 20:19:08 +01:00
Richard Lewis c1fe3533c4 Add red cancel icon and styling. 2017-07-27 18:10:56 +01:00
Richard Lewis 0bee03e86f Fix App body height.
App warning colours.
App loading styling.
2017-07-27 16:40:33 +01:00
Richard Lewis ff2554c8a6 App permission component styling. 2017-07-26 16:48:24 +01:00
David Baker ec6efd2488 Merge pull request #4608 from vector-im/dbkr/groupview_edit
CSS for group edit UI
2017-07-25 10:21:51 +01:00
Matthew Hodgson bcedc206e1 seems folk prefer darker pills 2017-07-25 09:55:34 +01:00
Matthew Hodgson dbeeacf11c tweak pill colours some more 2017-07-24 22:13:29 +01:00
Richard van der Hoff 7dbb4bba09 Merge pull request #4671 from vector-im/rav/promise_fail_fails
Fix a couple of minor errors in the room list
2017-07-24 21:22:45 +01:00
Richard van der Hoff bc2f639aae Fix a couple of minor errors in the room list
bluebird promises don't support .fail, so some operations didn't work quite
right. We should use .catch instead.
2017-07-24 17:19:46 +01:00
Luke Barnard e923847dac Make user mentions more pill-like
By adding subtle background-colors
2017-07-24 14:49:43 +01:00
David Baker d2f02e8e99 Swap classes instead of using 0 height elements 2017-07-21 14:14:27 +01:00
David Baker 5ba3453dcc cursor: pointer on avatar picker 2017-07-21 11:12:46 +01:00
Richard Lewis 55084d3aca Merge pull request #4584 from vector-im/rxl881/beta
Styling for beta testing icon.
2017-07-20 14:05:06 +01:00
Richard van der Hoff 7e00a86048 Merge pull request #4650 from vector-im/rav/bump_indexeddb_timeot
Increase the timeout for clearing indexeddbs
2017-07-20 11:50:23 +01:00
Kegan Dougal 62579ed6b0 Add tracebacks to deploy exceptions 2017-07-20 11:25:19 +01:00
Luke Barnard 01eef7eb41 Merge branch 'develop' of github.com:vector-im/riot-web into develop 2017-07-20 11:16:26 +01:00
Luke Barnard ccf5d6fc90 Adjust pill CSS
-Remove space after mentions without pill background colour
-Increase space between pill avatar and first letter of the pill by 1px
2017-07-20 11:14:54 +01:00
Kegsay 9864ce5bb2 Support multiple config.json symlinks in redeploy.py (#4644)
* Support multiple config.json symlinks in redeploy.py

* Review comments
2017-07-20 11:02:10 +01:00
Richard van der Hoff 238afde00a Increase the timeout for clearing indexeddbs
Chrome seems to take ages (like, 1500ms regularly) to clear out the indexeddbs,
and that's causing test timeouts. Bump the timeout to hack around it.

Also: clear both dbs in parallel (can't hurt, right?) and improve diagnostics
on the process.
2017-07-20 11:01:27 +01:00
Luke Barnard f7d282fc8e Merge pull request #4597 from vector-im/luke/css-matrixto-timeline-pills
Make some adjustments to mx_UserPill and mx_RoomPill
2017-07-19 17:26:13 +01:00
Luke Barnard 3544c2b0c8 Merge pull request #4639 from vector-im/luke/css-rte-pre
Apply CSS to <pre> tags to distinguish them from each other
2017-07-19 17:16:02 +01:00
Luke Barnard 0c253e2437 Merge pull request #4643 from vector-im/luke/fix-room-tile-dnd
Use `catch` instead of `fail` to handle room tag error
2017-07-19 14:27:37 +01:00
Luke Barnard 53ae42ed68 Use `catch` instead of `fail` to handle room tag error
Because bluebird doesn't support fail
2017-07-19 14:11:22 +01:00
Luke Barnard 871c9e6d3e Add bing mention pill CSS
Useful with https://github.com/matrix-org/matrix-react-sdk/pull/1234
2017-07-19 11:02:51 +01:00
Luke Barnard ccc30fb52e Apply CSS to <pre> tags to distinguish them from each other 2017-07-19 09:25:53 +01:00
Matthew Hodgson bd693768cc deliberately de-theme pre tags 2017-07-18 17:45:17 +01:00
Matthew Hodgson b45108d80d ooooops, fix dark theme code blocks correctly 2017-07-18 15:50:28 +01:00
Matthew Hodgson e7ba618bbe fix text in code blocks on dark theme 2017-07-18 15:33:41 +01:00
David Baker fc470cd20d Merge remote-tracking branch 'origin/develop' into dbkr/groupview_edit 2017-07-18 11:14:27 +01:00
David Baker cd418a5525 Retest 2017-07-17 18:16:50 +01:00
David Baker 65b9086f18 Add group header button css 2017-07-17 17:20:11 +01:00
Luke Barnard 0e71ea7a5a Make some adjustments to mx_UserPill and mx_RoomPill
So that they can appear correctly in the body of a text message.
2017-07-17 14:52:08 +01:00
Richard Lewis f272961fbd Styling for beta testing icon. 2017-07-14 23:30:47 +01:00
Luke Barnard cb4f57eb4a Merge pull request #4583 from vector-im/luke/feature-rte-pills
CSS for decorated matrix.to links in the composer
2017-07-14 18:04:05 +01:00
Luke Barnard a1b4b9992e Use $accent-fg-color instead of #fff 2017-07-14 17:59:53 +01:00
Luke Barnard 18a6ee5a52 white -> #fff 2017-07-14 17:52:11 +01:00
Luke Barnard de0fd588b6 Add $rte-room-pill-color: #aaa 2017-07-14 17:51:25 +01:00
David Baker 54f44af494 Make editing prettier 2017-07-14 17:23:44 +01:00
Luke Barnard 38899c6011 CSS for decorated matrix.to links in the composer 2017-07-14 17:23:16 +01:00
David Baker 1690f875ca Merge pull request #4579 from vector-im/rav/wait_longer_for_client
Deflake the joining test
2017-07-14 16:43:13 +01:00
Richard van der Hoff 66ddf25977 Deflake the joining test
Just give the client longer to get started (it seems to be taking a long time
to get started talking to indexeddb)
2017-07-14 16:14:42 +01:00
Richard van der Hoff 0c31c62a62 build fix: bump to mock-request 1.1
This should have happened with 32ef273f: now that we are using
flushAllExpected, we nee matrix-mock-request 1.1.0
2017-07-14 15:41:13 +01:00
David Baker 8c9afc2dfd Make GroupView more consistent with RoomView 2017-07-14 15:39:46 +01:00
Kegsay 40a47f8c7a Allow Riot to load up different configs depending on the domain (#4575)
Initially try to load `config.$domain.json` and only if that fails, load
`config.json`. Configs are not muxxed in any way, it either entirely uses
the domain config, or entirely uses `config.json`.
2017-07-14 15:05:07 +01:00
David Baker caa5751d50 Merge pull request #4577 from vector-im/rav/bump_react_versions
Bump react to 15.6 to fix build problems
2017-07-14 14:55:21 +01:00
Richard van der Hoff 01d954e4ab Bump react to 15.6 to fix build problems
matrix-react-test-tools requires react 15.6 or later, so make sure we require
it in riot-web too.
2017-07-14 14:45:44 +01:00
Richard Lewis c0830b48d0 Merge pull request #4567 from vector-im/rxl881/widgetButtons
Improve AppTile menu bar button styling.
2017-07-13 18:46:53 +01:00
David Baker e60bf48134 CSS for start of group edit support 2017-07-13 18:42:14 +01:00
Luke Barnard 5e259ec176 Merge pull request #4572 from vector-im/rav/async_to_bluebird
Transform `async` functions to bluebird promises
2017-07-13 17:46:12 +01:00