Matthew Hodgson
d4128af224
Merge remote-tracking branch 'origin/develop' into matthew/status
2017-11-08 04:29:44 -08:00
Luke Barnard
3ee45b21b8
Merge pull request #5543 from vector-im/luke/groups-inviter-profile
...
Adjust CSS for GroupView
2017-11-08 10:23:57 +00:00
Luke Barnard
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
Matthew Hodgson
c7dba61d92
Merge pull request #5511 from turt2live/travis/more-pinned-css
...
CSS for pinned indicators
2017-11-07 18:52:39 +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
Travis Ralston
beddf3a2cb
Get rid of accidental merge stuff
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-07 11:05:29 -07:00
Travis Ralston
144cbd144e
Merge branch 'develop' into travis/more-pinned-css
2017-11-07 11:04:22 -07:00
Luke Barnard
1bdc666197
Adjust CSS for GroupView
...
Part of showing the group inviter profile: https://github.com/matrix-org/matrix-react-sdk/pull/1585
2017-11-07 16:43:02 +00:00
Luke Barnard
f280fe3c66
Merge pull request #5540 from vector-im/luke/group-rooms-tooltip
...
Implement general-purpose tooltip "(?)"-style
2017-11-07 15:54:46 +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
Matthew Hodgson
9ff1fe8a72
Merge pull request #5535 from vector-im/luke/groups-new-group-settings
...
CSS for improving group creation UX, namely setting long description
2017-11-07 10:43:59 +00:00
Luke Barnard
aa4feb0563
Info plinth CSS variables
2017-11-06 18:57:08 +00:00
Luke Barnard
d87d6cbc64
CSS for improving group creation UX, namely setting long description
2017-11-06 18:38:47 +00:00
Luke Barnard
a8bdde9f55
Merge pull request #5531 from vector-im/dbkr/composer_at_room_pills
...
CSS for room notif pills in composer
2017-11-06 15:49:41 +00:00
David Baker
e1eba559fe
CSS for room notif pills in composer
2017-11-06 15:12:28 +00:00
David Baker
a1512af9f9
Merge pull request #5520 from vector-im/luke/right-panel-no-group
...
Do not init a group store when no groupId specified
2017-11-06 14:10:27 +00:00
Luke Barnard
cd26f63315
Do not init a group store when no groupId specified
...
(in RightPanel), otherwise the store will happily send requests to the server for the `undefined` group.
2017-11-06 10:16:03 +00:00
Matthew Hodgson
d14285eb08
fix secondary accent color tinting
2017-11-05 02:20:12 +00:00
Matthew Hodgson
555847e5e9
make default theme actually work
2017-11-05 00:40:13 +00:00
Matthew Hodgson
816042d3a8
Merge branch 'develop' into matthew/status
2017-11-04 23:51:20 +00:00
Matthew Hodgson
9a0bbfb871
tint the colours in the theme rather than hardcode vector green
2017-11-04 23:43:34 +00:00
Matthew Hodgson
adedf23cfb
remove unnamespaced CSS fail
2017-11-04 22:19:06 +00:00
Travis Ralston
5a1498dec3
CSS for pinned indicators
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-03 20:01:54 -06:00
Matthew Hodgson
31c5122fa6
Merge pull request #5293 from turt2live/travis/pinned-led-css
...
CSS for new pinned events indicator
2017-11-03 23:10:31 +00:00
Matthew Hodgson
c0b343c89f
Merge pull request #5471 from vector-im/t3chguy/devtools-1
...
T3chguy/devtools 1
2017-11-03 23:10:00 +00:00
Matthew Hodgson
c90834114b
Merge pull request #5498 from vector-im/luke/css-use-margin-in-room-dir-perms
...
Use margin to separate "perms" in the room directory
2017-11-03 22:44:41 +00:00
Luke Barnard
5d9a1b42a6
Merge pull request #5505 from vector-im/luke/groups-add-style-to-create-group-dialog
...
Add CSS for CreateGroupDialog to give group ID input suffix and prefix style
2017-11-03 16:14:54 +00:00
Luke Barnard
290a501523
Use prefixed class names to avoid collisions with other libraries
2017-11-03 16:02:25 +00:00
Luke Barnard
67bc346ebb
Add CSS for CreateGroupDialog to give group ID input suffix and prefix style
2017-11-03 15:39:24 +00:00
Matthew Hodgson
923295973b
Merge branch 'develop' into matthew/status
2017-11-03 15:11:23 +00:00
Luke Barnard
04c866ce9c
Fix #5359 - unbreakable topics not breaking
...
The room directory CSS has `word-break: break-word` applied to the entire mx_RoomDirectory, which is questionable. For now, add the same rule to RoomDetailList
2017-11-03 14:39:24 +00:00
Luke Barnard
3192c345be
rethemedex
...
Needed, having removed _GroupInviteTile.scss
2017-11-03 14:11:07 +00:00
Luke Barnard
22b82182a7
Merge pull request #5504 from vector-im/luke/fix-groups-invites-appearance
...
Fix group invites such that they look similar to room invites
2017-11-03 13:53:56 +00:00
Luke Barnard
c60ff5d283
Fix group invites such that they look similar to room invites
...
- Remove CSS for GroupInviteTile - the component should be using RoomTile CSS
- Added extra tiles to roomCount of RoomSubList header
Part of fixing https://github.com/vector-im/riot-web/issues/5226
2017-11-03 12:17:49 +00:00
Luke Barnard
2c4c6e82bb
Merge pull request #5501 from vector-im/luke/groups-fix-my-groups-layout
...
CSS for Your Communities scrollbar
2017-11-03 12:03:10 +00:00
Luke Barnard
4d11e739b5
Comment 0px height and margin on joinBox
2017-11-03 11:42:06 +00:00
Luke Barnard
f6974407e3
CSS for Your Communities scrollbar
...
and also attempt to fix GroupTile flex weirdness.
2017-11-03 11:22:29 +00:00
David Baker
69a82f7859
Merge pull request #5497 from vector-im/luke/groups-room-info
...
Add toggle to alter visibility of room-group association
2017-11-02 15:37:52 +00:00
Luke Barnard
ee71c72685
Use margin to separate "perms" in the room directory
...
instead of a space.
2017-11-02 15:13:55 +00:00
Luke Barnard
06ce467876
Add CSS for group room visibility label alignment
2017-11-02 15:05:08 +00:00
Luke Barnard
c01ea56676
Add toggle to alter visibility of room-group association
2017-11-02 13:40:07 +00:00
Luke Barnard
fb8e41a9c1
Merge pull request #5494 from vector-im/dbkr/pillify_at_room
...
CSS for room notification pills
2017-11-02 12:53:29 +00:00
David Baker
2e8f960ee3
Merge pull request #5493 from vector-im/luke/groups-room-info
...
Implement simple GroupRoomInfo
2017-11-02 11:07:00 +00:00
David Baker
65ea7a8460
Use more spercific selector instead of !important
2017-11-02 10:37:25 +00:00
David Baker
cd84d86fd1
CSS for room notification pills
2017-11-01 19:45:59 +00:00
Luke Barnard
2163a54617
Implement simple GroupRoomInfo
...
See matrix-org/matrix-react-sdk#1563
2017-11-01 17:32:01 +00:00
Matthew Hodgson
8ef3811f28
Merge branch 'develop' into matthew/status
2017-11-01 15:25:50 +00:00
Matthew Hodgson
8f289519e1
fix chevron cosmetics
2017-11-01 15:25:23 +00:00
Matthew Hodgson
df58bdd529
use absolute url for og:image
2017-10-31 22:56:57 +00:00
