Travis Ralston
2fe2e76fa5
Merge pull request #2398 from matrix-org/travis/back-out-bad-merge
...
Part 1 of 3: Back out bad merge for develop->experimental
2019-01-03 15:48:42 -07:00
David Baker
f928be6f59
Revert "Merge pull request #2395 from matrix-org/dbkr/merge_develop_experimental"
...
This reverts commit ad47144355
2019-01-03 15:37:03 -07:00
Travis Ralston
d111fe27bb
Revert "Merge pull request #2396 from matrix-org/travis/room-list-hover"
...
This reverts commit 5098b28672
2019-01-03 15:36:56 -07:00
Travis Ralston
0978687c65
Revert "Merge pull request #2383 from matrix-org/travis/back-button"
...
This reverts commit 78592286bd
2019-01-03 15:36:51 -07:00
Travis Ralston
78592286bd
Merge pull request #2383 from matrix-org/travis/back-button
...
Fix browser navigation not working between /home, /login, /register, etc
2019-01-03 14:37:04 -07:00
Travis Ralston
5098b28672
Merge pull request #2396 from matrix-org/travis/room-list-hover
...
Don't re-sort the room list if the user is hovering over it
2019-01-03 14:34:18 -07:00
Travis Ralston
e5192811a1
Add a comment explaining the reason for setting the LOGGED_IN view
2019-01-03 14:23:27 -07:00
Travis Ralston
4c264b87fa
Add missing stopPropagation
2019-01-03 14:23:26 -07:00
Travis Ralston
7904b91b58
Use the safer way to set the logged in view state
2019-01-03 14:23:26 -07:00
Travis Ralston
223a49d81f
Don't re-sort the room list if the user is hovering over it
...
Fixes vector-im/riot-web#5624
2019-01-03 13:57:20 -07:00
Travis Ralston
35c9dce241
Fix browser navigation not working between /home, /login, /register, etc
...
All of the anchors were pointed at `#` which, when clicked, would trigger a hash change in the browser. This change races the change made by the screen handling where the screen handling ends up losing. Because the hash is then tracked as empty rather than `#/login` (for example), the state machine considers future changes as no-ops and doesn't do anything with them.
By using `preventDefault` and `stopPropagation` on the anchor click events, we prevent the browser from automatically going to an empty hash, which then means the screen handling isn't racing the browser, and the hash change state machine doesn't no-op.
After applying that fix, going between pages worked great unless you were going from /login to /home. This is because the MatrixChat state machine was now out of sync (a `view` of `LOGIN` but a `page` of `HomePage` - an invalid state). All we have to do here is ensure the right view is used when navigating to the homepage.
Fixes https://github.com/vector-im/riot-web/issues/4061
Note: the concerns in 4061 about logging out upon entering the view appear to have been solved. Navigating to the login page doesn't obliterate your session, at least in my testing.
2019-01-03 12:13:41 -07:00
David Baker
ad47144355
Merge pull request #2395 from matrix-org/dbkr/merge_develop_experimental
...
Merge develop into experimental
2019-01-03 18:55:56 +00:00
David Baker
982e037822
Fix merge
2019-01-03 18:05:38 +00:00
David Baker
7d161de35b
Partial merge of develop to experimental
...
Does not include #2336 as the file has been moved out from underneath it:
will do this separately
2019-01-03 15:02:58 +00:00
J. Ryan Stinnett
00405e7f22
Use Nunito font from the server only
...
There are various versions of Nunito in circulation, and some have errors in
their metrics or smaller supported character sets. To ensure all users get the
expected experience, don't allow local copies of Nunito to be used.
Fixes vector-im/riot-web#7959 .
2018-12-31 12:26:35 -06:00
J. Ryan Stinnett
097d6fdede
Update room filter focus handling to avoid infinite loop
...
The classes on the search box input were changed without updating the focusing
loop in the room filter which used one of these classes as a boundary condition.
This led to a case that could loop forever.
Regressed by #2267 .
Fixes vector-im/riot-web#7926 .
2018-12-20 23:09:28 +00:00
J. Ryan Stinnett
7affd5fcff
Try fetching more branches for PRs
...
Attempt both the PR author's branch and the PR's target branch. This resolves
issues on experimental where we need riot-web to also be experimental.
2018-12-20 22:58:09 +00:00
Nad Chishtie
418bfbb3dc
Merge pull request #2379 from matrix-org/nadonomy/accent
...
Added colour var to all themes
2018-12-20 17:25:53 +00:00
Nad Chishtie
5723ae6040
Defined $accent-color-alt in all themes
2018-12-20 16:06:02 +00:00
J. Ryan Stinnett
95c739be11
Merge pull request #2378 from matrix-org/nadonomy/colours-and-contrast
...
Colour, contrast & legibility improvements
2018-12-20 14:22:04 +00:00
Nad Chishtie
09bf68b1bd
Improved colours.
2018-12-20 12:46:43 +00:00
Nad Chishtie
42c8d43065
Lint.
2018-12-20 11:35:58 +00:00
Nad Chishtie
9b8f07c19f
Don't override text colour of selected room in room list.
2018-12-20 11:35:43 +00:00
Nad Chishtie
d7473c4f4d
Various colour, contrast and legibility improvements.
2018-12-20 11:35:21 +00:00
Nad Chishtie
6c2d2f60cf
Polished left left panel.
2018-12-20 11:34:20 +00:00
Nad Chishtie
b61aa33e99
Tint input icon.
2018-12-20 11:33:53 +00:00
Bruno Windels
ad4991cd8b
Merge pull request #2376 from matrix-org/bwindels/redesignfeedbackdialog
...
Redesign: add feedback dialog & button in tag panel
2018-12-19 12:37:00 +00:00
Bruno Windels
f7ed1ff046
avoid buttons being deformed in collapsed state
...
unsure what this was doing before,
I suspect the BottomLeftMenu which is gone now.
2018-12-19 12:59:03 +01:00
Bruno Windels
b3a12867a6
remove extra blank lines
2018-12-19 12:56:08 +01:00
Bruno Windels
b826b0d998
Add redesign feedback dialog + button in tag panel
2018-12-19 12:27:05 +01:00
Bruno Windels
8b406eab3b
Merge pull request #2371 from matrix-org/bwindels/rmdot
...
Redesign: add badge with dot to rm button, to see it catches your eye better
2018-12-19 09:49:19 +00:00
Bruno Windels
c75c482cd0
Merge pull request #2374 from matrix-org/nadonomy/add-icon-fix
...
Fix misaligned (+) icon
2018-12-19 09:34:19 +00:00
Nad Chishtie
e09121556d
Use a more sane SVG.
2018-12-19 09:28:33 +00:00
Bruno Windels
e9ebc05eee
Merge pull request #2373 from matrix-org/nadonomy/gradient-fix
...
Avoid 'transparent black' gradients in left panel
2018-12-18 19:03:35 +00:00
Nad Chishtie
a829bc901c
Updated CSS syntax to avoid 'transparent black'.
2018-12-18 17:59:46 +00:00
Bruno Windels
fc516cac76
Merge pull request #2370 from matrix-org/nadonomy/icons
...
Normalised icons
2018-12-18 17:33:49 +00:00
Bruno Windels
1d43712a8f
Merge branch 'experimental' into nadonomy/icons
2018-12-18 18:22:24 +01:00
Bruno Windels
2ad9f45655
add badge with dot to rm button, so it catches your eye better
2018-12-18 17:56:05 +01:00
Nad Chishtie
074c96cd3e
First pass of normalising icons.
2018-12-18 16:48:20 +00:00
Bruno Windels
8df139bfab
Merge pull request #2369 from matrix-org/bwindels/rhsdefaultsize
...
Redesign: give right panel default width
2018-12-18 16:20:51 +00:00
Bruno Windels
6653236543
Merge pull request #2368 from matrix-org/bwindels/fixloginfield
...
Redesign: Fix login field looking inline
2018-12-18 16:19:52 +00:00
Bruno Windels
23f24a987c
Merge pull request #2367 from matrix-org/bwindels/selectqueryonclick
...
Redesign: select search query on focus
2018-12-18 16:19:24 +00:00
Bruno Windels
5e2ee883aa
Merge pull request #2366 from matrix-org/bwindels/fixrhscollapse
...
Redesign: fix remaining right panel collapse issues.
2018-12-18 16:19:02 +00:00
Bruno Windels
fd5ad56886
give right panel default width of 350px
2018-12-18 17:12:32 +01:00
Bruno Windels
c917b4038b
scope default input style rules to MatrixChat
2018-12-18 17:02:48 +01:00
Bruno Windels
dd6dd7a4fc
select search query on focus
2018-12-18 16:37:37 +01:00
Bruno Windels
4b788fcb7e
fix lint
2018-12-18 16:29:31 +01:00
Bruno Windels
c0ab74d5f1
reemit view_right_panel_phase when showing rhs, so right tab is active
2018-12-18 16:27:17 +01:00
Bruno Windels
92c598dbcf
remove group header expand right panel button
2018-12-18 15:38:15 +01:00
Bruno Windels
dafc54c434
don't highlight room header buttons when right panel is collapsed
2018-12-18 15:36:54 +01:00
