Commit graph

5705 commits

Author SHA1 Message Date
Richard Lewis
351f9b32ea Remove broken transitions. 2018-03-08 23:54:44 +00:00
Richard Lewis
38efebb8d3 Split out sticker CSS 2018-03-08 12:31:23 +00:00
Richard Lewis
fe3f0be920 Ignore local config. 2018-03-07 12:03:28 +00:00
Richard Lewis
6785d75ad2 Remove logging. 2018-03-06 14:46:40 +00:00
Richard Lewis
78ae1ada3c Fix tooltip vertical positioning. 2018-03-06 14:21:31 +00:00
Richard Lewis
d77ab891a0 Update tooltip position on scroll. 2018-03-06 11:25:15 +00:00
Richard Lewis
9fc7435ea2 Correctly position tooltips relative to parent element. 2018-03-06 10:47:53 +00:00
Richard Lewis
c198dd381f Pull in changes from develop 2018-02-23 17:31:24 +00:00
Matthew Hodgson
3bf04095b1
Merge pull request #6223 from vector-im/luke/fix-tag-tile-context-tinting
Fix un-tinted "View Community" icon in TagTile context menu
2018-02-23 16:42:55 +00:00
Matthew Hodgson
93c2462089
Merge pull request #6160 from vector-im/luke/fix-room-list-drop-target-bg
Fix RoomDropTarget and emptySubListTip to have containers
2018-02-23 16:36:14 +00:00
Matthew Hodgson
15b7af9a84
Merge pull request #6154 from rugk/patch-2
Fix syntax error of wrong use of self-closing HTML tag
2018-02-23 16:28:28 +00:00
Matthew Hodgson
c315a59717
remove doubly-closed tag 2018-02-23 16:27:34 +00:00
Matthew Hodgson
d3fe023ec4
Merge pull request #6227 from vector-im/luke/fix-room-list-tinting-css
Use translucent black for RoomSubList bg to fix tinting
2018-02-22 14:50:43 +00:00
Luke Barnard
1139a3fa89 Simplify roomsublist bg colour
This should not have a noticeable effect on the end result.
2018-02-22 11:49:29 +00:00
Luke Barnard
f67b4570a8 Use translucent black for RoomSubList bg to fix tinting
The alternative is to specify yet another colour that we have to
worry about when applying tinting, which is currently quite
fragile and requires changes to many parts of the app, including
all themes that don't require the colour to be tinted.

By using translucent black, we effectively take the secondary
accent colour of the LeftPanel and make it more black.

Note: This does not preserve the previous colour we were using,
although the alternative above does allow for this.
2018-02-22 11:48:48 +00:00
lukebarnard
c0055ebbeb Fix un-tinted "View Community" icon in TagTile context menu 2018-02-21 21:27:02 +00:00
Matthew Hodgson
d806707de0
Merge pull request #6216 from vector-im/luke/feature-tag-panel-global-filter-cross
CSS for changing "R" to "X" for clearing group filter
2018-02-21 18:05:53 +00:00
Luke Barnard
15d8878ac0 Rename TagPanel_logo to TagPanel_clearButton 2018-02-21 17:14:25 +00:00
Luke Barnard
2deb07a25b CSS for changing "R" to "X" for clearing group filter 2018-02-21 15:05:51 +00:00
Matthew Hodgson
bc5129f839 actually, simpler globe 2018-02-20 17:15:17 +00:00
Matthew Hodgson
fb5369f7d2 globe icon 2018-02-20 17:15:17 +00:00
Luke Barnard
e3e60bd372
Merge pull request #6187 from vector-im/luke/feature-tag-panel-global-filter
CSS for new global TagPanel filter
2018-02-19 09:59:25 +00:00
Matthew Hodgson
c3e34e5f05
Merge pull request #6194 from turt2live/patch-1
Separate the middle panel from the room list
2018-02-16 22:22:32 +00:00
Travis Ralston
514e042eec
Separate the middle panel from the room list
Signed-off-by: Travis Ralston <travpc@gmail.com>
2018-02-16 14:53:52 -07:00
Luke Barnard
86d554b1dc CSS for new global TagPanel filter 2018-02-16 17:44:27 +00:00
Luke Barnard
fc4da3e3bf
Merge pull request #6176 from vector-im/luke/fix-invites-not-appearing
Only use DNDRoomTile for editable sub lists
2018-02-16 11:53:30 +00:00
Luke Barnard
0605d96014 Only use DNDRoomTile for editable sub lists
Otherwise, the DND tile will expect to be within a Droppable,
which is not supported by react-beautiful-dnd. This was causing
errors when receiving an invite.

Fixes #6144
2018-02-16 11:02:52 +00:00
Luke Barnard
332640c4ba
Merge pull request #6131 from vector-im/luke/fix-scrollbars-on-jump-to-first
Adjust CSS to prevent scrollbars on message panel spinner
2018-02-15 14:51:06 +00:00
Luke Barnard
5c354dda23 Fix messagePanelSpinner flex order in RightPanel 2018-02-15 14:34:44 +00:00
Luke Barnard
9e1e7e0dbe Fix RoomDropTarget and emptySubListTip to have containers
so that the correct background colour can be used to surround both.
2018-02-15 14:09:38 +00:00
rugk
e3dcaebe9b
Merge branch 'develop' into patch-2 2018-02-15 13:16:34 +01:00
Luke Barnard
f6255906d8
Merge pull request #6143 from vector-im/luke/dnd-group-view-tag-panel
Implement riot-web side of dragging GroupTile avatars to TagPanel
2018-02-15 11:05:25 +00:00
Luke Barnard
f64fefa9ae Use grab as some browsers e.g. firefox support it 2018-02-15 10:52:10 +00:00
rugk
ba7991deba
Fix syntax error of wrong use of self-closing HTML tag
Firefox complaint about this in the source code view:
2018-02-15 02:36:05 +01:00
Luke Barnard
594d510f4f Simplify MyGroups hierachy 2018-02-14 17:54:29 +00:00
Luke Barnard
453b7d1007 Implement riot-web side of dragging GroupTile avatars to TagPanel
for adding groups to the TagPanel.
2018-02-14 16:37:32 +00:00
Luke Barnard
7ac350ea36 Give mx_RoomView_messageListWrapper its min-height: 100% back
because the spinner now exists separately to it
(as mx_RoomView_messagePanelSpinner) so their CSS is disentangled.
2018-02-14 11:17:21 +00:00
Luke Barnard
b3bb2d2aa5 Merge branch 'develop' into luke/fix-scrollbars-on-jump-to-first 2018-02-14 10:51:20 +00:00
Luke Barnard
8c1d2a4555
Merge pull request #6140 from vector-im/luke/fix-tag-panel-css
Fix LeftPanel size being incorrect when TagPanel disabled
2018-02-14 10:42:49 +00:00
Luke Barnard
009e01c1b0 Fix LeftPanel size being incorrect when TagPanel disabled
A previous PR (#6134) assumed that the TagPanel feature
would always be enabled, leading to strangeness when it
wasn't: #6136.

(FTR the original layout bug was #6133)
2018-02-14 10:18:12 +00:00
Matthew Hodgson
7aea7f9400
Merge pull request #6134 from vector-im/luke/fix-tag-panel-collapse
Fix TagPanel from collapsing to < 60px when LP collapsed
2018-02-13 22:02:58 +00:00
Matthew Hodgson
9abda76d9e
Merge branch 'develop' into luke/fix-tag-panel-collapse 2018-02-13 22:02:49 +00:00
Richard Lewis
a966cc7dec
Merge pull request #6138 from vector-im/rxl881/llpFix
Temporary hack to constrain LLP container size.
2018-02-13 20:45:39 +00:00
Richard Lewis
55cacfba82 Temporary hack to constrain LLP container size. 2018-02-13 20:42:46 +00:00
Matthew Hodgson
0b5fe1232f
Merge pull request #6137 from rbozhkova/patch-1
Fix typo
2018-02-13 17:32:50 +00:00
Luke Barnard
3a808411f5
Merge pull request #6127 from vector-im/luke/feature-tag-panel-tile-context-menu
Add context menu to TagPanel
2018-02-13 17:28:47 +00:00
rbozhkova
db5f4193ec
Fix typo 2018-02-13 18:22:01 +01:00
Luke Barnard
11b0cc8211 Merge branch 'develop' into luke/feature-tag-panel-tile-context-menu 2018-02-13 17:00:19 +00:00
Luke Barnard
285c4f91d3 Fix TagPanel from collapsing to < 60px when LP collapsed
Fixes https://github.com/vector-im/riot-web/issues/6133
2018-02-13 15:17:51 +00:00
David Baker
e67147213b
Merge pull request #6096 from vector-im/luke/room-list-flux
Make room tagging flux-y
2018-02-13 14:18:50 +00:00