Matthew Hodgson
be79ccccf6
fix dark theme room join bar
2017-02-20 01:15:54 +02:00
Matthew Hodgson
aba121aab0
fix cursor
2017-02-19 04:13:29 +02:00
David Baker
75f2ba6b19
CSS for ban / kick reason prompt
...
For https://github.com/matrix-org/matrix-react-sdk/pull/710
2017-02-17 17:29:57 +00:00
Richard van der Hoff
75097471b6
Merge pull request #3227 from vector-im/dbkr/add_unban_button
...
CSS for un-ban button in RoomSettings
2017-02-17 12:46:13 +00:00
David Baker
8224d7fc60
Oops - remove empty CSS selector
2017-02-16 15:14:53 +00:00
Luke Barnard
fc0e460222
Remove z-index property on avatar initials
...
This seemingly doesn't do anything and upsets things when avatars overlap (i.e. for the new typing avatars).
See https://github.com/matrix-org/matrix-react-sdk/pull/699
2017-02-16 11:42:32 +00:00
Luke Barnard
827692b9b0
Merge pull request #3233 from vector-im/luke/css-status-bar-icon-positioning
...
Reposition certain icons in the status bar
2017-02-15 15:56:41 +00:00
Luke Barnard
bfad7612c6
Re-position certain icons in the status bar
...
Also, make sure the typing avatars line up with the arrow to jump to the bottom of the timeline.
Also, get rid of any height jumps when a call starts. border 1px hidden does not add any height to an element, it is effectively the same as none.
2017-02-15 15:45:24 +00:00
David Baker
f1f54c95ab
Copyright
2017-02-14 18:11:36 +00:00
David Baker
5ecf560675
CSS for un-ban button in RoomSettings
2017-02-14 17:56:42 +00:00
David Baker
324e596e28
CSS for kick/ban confirmation dialog
2017-02-14 13:42:06 +00:00
David Baker
c6ccfa0616
Copyright
2017-02-13 16:15:27 +00:00
David Baker
9e2793dfed
Style for split-out interactive auth
...
For https://github.com/matrix-org/matrix-react-sdk/pull/691
2017-02-13 16:10:43 +00:00
Luke Barnard
36b08fece7
Float the toggle in the top right of MELS
...
This is so that it stays put when the MELS is toggled.
Added style for a line that appears below "collapse" to indicate start of events.
Not possible to put "collapse" next to the expanded events because of read receipts.
2017-02-09 15:17:03 +00:00
Matthew Hodgson
f2a6d2cc5a
fix selector color
2017-02-09 12:01:00 +00:00
Matthew Hodgson
22b7b8efea
tweak sending color some more
2017-02-09 11:02:42 +00:00
Matthew Hodgson
e392d6c16b
fix CSS for import/export buttons
2017-02-09 02:00:23 +00:00
Matthew Hodgson
2eec9b10ef
fix dark skin event sending color
2017-02-09 01:42:36 +00:00
Matthew Hodgson
64f0beb1eb
fix https://github.com/vector-im/riot-web/issues/3136
2017-02-09 01:33:26 +00:00
Matthew Hodgson
f6b6673a41
fix selection text colour in dark theme
2017-02-09 01:20:30 +00:00
Matthew Hodgson
d8042b193b
be more specific on flex
2017-02-09 00:10:57 +00:00
Matthew Hodgson
5f745ff733
hopefully fix TopRight layout bug
2017-02-09 00:10:45 +00:00
Matthew Hodgson
caa30a742b
fix table visuals in dark skin
2017-02-08 23:19:05 +00:00
Luke Barnard
fa552ad5af
Merge branch 'develop' into luke/rts-welcome-pages
2017-02-07 12:41:52 +01:00
Luke Barnard
3f49f020cf
Copyright
2017-02-07 11:19:01 +00:00
Matthew Hodgson
654a025a9f
fix button width for unkdevdialog
2017-02-03 02:06:50 +00:00
Matthew Hodgson
4c3a723aa8
make TopRightMenu more intuitive
...
should fix https://github.com/vector-im/riot-web/issues/2827
2017-02-02 18:42:03 +00:00
Matthew Hodgson
c4a590f6af
CSS for empty timelinepanels
2017-02-02 16:18:20 +00:00
David Baker
00c26088b1
Merge pull request #3110 from vector-im/luke/css-reg-icons
...
Handle icons with width > height
2017-02-02 14:29:23 +00:00
Luke Barnard
e77709bc71
Merge branch 'develop' into luke/rts-welcome-pages
...
Conflicts:
src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss
2017-02-02 14:03:21 +00:00
Matthew Hodgson
c6def48fe0
try to make joining rooms more obvious
2017-02-02 13:32:36 +00:00
Luke Barnard
874e32699a
Handle icons with width > height
...
Icons with width > height will now only assume a max-height of 100% as opposed to a height of 100%. This is so they don't overflow the width of 300px.
2017-02-02 11:30:14 +00:00
Luke Barnard
4a34bee2dc
Use localStorage `mx_team_token` to decide welcome page
2017-02-02 11:12:43 +00:00
Matthew Hodgson
b137c82a7a
tweak CSS for UnknownDeviceDialog to support scrollable content
2017-02-02 00:25:18 +00:00
Matthew Hodgson
23060a6833
fix ugly blue border on roomtiles
2017-02-01 22:24:23 +00:00
Luke Barnard
1f3ab4425a
Merge branch 'develop' into matthew/homepages
...
Conflicts:
src/component-index.js
src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss
2017-02-01 11:34:24 +00:00
Matthew Hodgson
6369d76a74
poor man's dark theme for MD codeblocks
2017-01-27 18:18:23 +01:00
Luke Barnard
6374526f3c
Merge pull request #3081 from vector-im/luke/css-login-support
...
Add CSS for a support box in login
2017-01-27 16:36:53 +00:00
Luke Barnard
78105bb4db
Merge pull request #3082 from vector-im/luke/feature-optional-custom-login-logo
...
Allow a custom login logo to be displayed on login
2017-01-27 16:34:39 +00:00
Luke Barnard
87db89b67a
Replace inline styles for logos with css
...
Also, give .mx_Login_logo a height so that if the image has not loaded yet, it will not change height (thanks @dbkr)
2017-01-27 16:30:44 +00:00
Luke Barnard
029602fc73
Fix the width of input fields within login/reg box
...
This is so they do not expand outside of the login area. (280px = 300px - 2px - 18px, 2px for borders, 18px for padding)
2017-01-27 16:04:24 +00:00
Luke Barnard
5aa9592c71
Add CSS for a support box in login
...
This box can be used to provide useful hints during registration/login.
2017-01-27 16:02:33 +00:00
David Baker
bb70622b55
Merge pull request #3057 from vector-im/luke/fix-avatar-image-background-colour
...
Set BaseAvatar_image bg colour = #fff
2017-01-26 16:34:01 +00:00
David Baker
71b149de76
Merge pull request #3064 from vector-im/dbkr/invite_look_up_emails
...
CSS tweak for email address lookup
2017-01-26 11:34:51 +00:00
Matthew Hodgson
ba5e7d4013
fix event-encrypting-color in dark theme
2017-01-26 00:54:00 +01:00
David Baker
4e41accc56
CSS tweak for email address lookup
...
CSS tweak for https://github.com/matrix-org/matrix-react-sdk/pull/653
2017-01-25 18:52:21 +00:00
Luke Barnard
0021fb37f3
Set BaseAvatar_image bg colour = #fff
2017-01-25 14:27:25 +00:00
Kegsay
9a933e2ce5
Merge pull request #3045 from vector-im/kegan/rageshake-ui
...
Add css for bug report dialog
2017-01-24 15:47:49 +00:00
Kegan Dougal
efbea0e942
Add css for bug report dialog
2017-01-24 14:45:16 +00:00
Luke Barnard
307c4f3dd1
Increase the max-height of the expanded status bar
...
This will ensure that errors, unsent messages, etc. will be allowed enough height to display their contents from within the status bar without being chopped.
Fixes #3041
2017-01-24 14:02:44 +00:00
David Baker
6db5329d9c
Merge pull request #2971 from vector-im/dbkr/add_searching_known_users
...
CSS for 'searching known users'
2017-01-24 10:51:13 +00:00
Luke Barnard
b7204bf868
Use primary bg color on statusArea
2017-01-23 13:33:39 +00:00
Luke Barnard
c4d246cd72
Merge branch 'develop' into luke/feature-animated-status-bar
2017-01-23 13:31:48 +00:00
Luke Barnard
b582cf0a5f
Remove CSS for StatusBar mid-timeline
2017-01-23 13:30:39 +00:00
Luke Barnard
57126efe86
Reposition typing avatars relative to "is typing"
2017-01-23 10:24:23 +00:00
Matthew Hodgson
d907421ad4
crappy CSS for UnknownDeviceDialog
2017-01-22 01:25:32 +01:00
Matthew Hodgson
83272f5cc5
fix badge color again
2017-01-20 21:11:28 +00:00
Matthew Hodgson
5b1fea46cb
fix badge color
2017-01-20 21:09:49 +00:00
Matthew Hodgson
a9c575b4d0
fix a bunch of dark-theme buttons
2017-01-20 21:00:33 +00:00
Luke Barnard
a24b568b73
Merge pull request #2998 from vector-im/luke/css-typing-avatars
...
CSS for avatars that appear when users are typing
2017-01-20 17:43:36 +01:00
lukebarnard
afcf9de8d4
Handle avatars with initials
2017-01-20 17:35:01 +01:00
lukebarnard
9ffedf5e7d
space after colons
2017-01-20 17:00:59 +01:00
lukebarnard
956deca844
Add bg-color border to typing avatars
2017-01-20 16:59:41 +01:00
Matthew Hodgson
9b70e2e25f
fix RTE bg color
2017-01-20 02:34:45 +00:00
Matthew Hodgson
4d8f5d4df1
change selection color & fix MD bg
2017-01-20 02:29:56 +00:00
Matthew Hodgson
fa535996ae
fix textarea bg
2017-01-20 02:22:11 +00:00
Richard van der Hoff
8ad0ff24f8
Fix link to image for event options menu
...
This has to be relative, because we don't know if riot is going to be mounted
at the top-level of the domain or not (it's not, on riot.im).
Links are relative to the final location of the CSS, which is under
bundles/<hash>, so need ../..
2017-01-19 18:35:43 +00:00
Richard van der Hoff
36450764f3
rethemendex fixes
...
- set cwd before doing cwd-specific operations
- don't include 'themes' directory, otherwise it's a bit circular.
2017-01-19 17:02:57 +00:00
lukebarnard
789c7b60cc
CSS for avatars that appear when users are typing
2017-01-19 16:51:41 +01:00
lukebarnard
6b1d138918
Make scrolling to bottom whilst expanded seem less weird inertially
2017-01-19 12:45:26 +01:00
David Baker
5f8170f4cd
Merge remote-tracking branch 'origin/develop' into dbkr/add_searching_known_users
2017-01-19 11:12:49 +00:00
lukebarnard
e08f97a549
Reduce animation time to 200ms
2017-01-19 11:52:15 +01:00
Matthew Hodgson
5b95986705
fix various SCSS snafus
2017-01-18 20:05:18 +00:00
Matthew Hodgson
ec1a2f6abf
fix CSS regression in searchbox
2017-01-18 19:29:53 +00:00
lukebarnard
f10bc8eef1
Animate status bar max-height and margin-top
...
When collapsed, the max-height is set to 0px. When expanded, max-height is set to 50px, margin-top is set to 0px. When expanded and when the timeline is not scrolled down to the bottom, margin-top is set to -50px to offset the change in height, keeping it at the same scroll position.
Without the animation, there would be a jump when the user starts scrolling up from the bottom whilst the StatusBar is expanded.
2017-01-18 16:49:20 +01:00
Matthew Hodgson
14eec6d982
Merge branch 'develop' into matthew/postcss
2017-01-18 12:44:42 +00:00
Matthew Hodgson
69bedf0d37
review feedback
2017-01-18 12:42:48 +00:00
Matthew Hodgson
0cd895b417
kill the moofle
2017-01-17 19:19:30 +00:00
David Baker
323c5d0732
CSS for 'searching known users'
2017-01-17 14:54:55 +00:00
Matthew Hodgson
c9c58ab0ec
fix up the contextual menu button
2017-01-17 14:10:09 +00:00
Richard van der Hoff
4a1b04e57b
Add another layer of directory to webpack chunks
2017-01-17 12:00:20 +00:00
Richard van der Hoff
ef07a6035e
Fix links to fonts and images from CSS
...
https://github.com/vector-im/riot-web/pull/2961 put the CSS in a subdirectory,
which meant that links from CSS to images and fonts were broken. Fix them up.
2017-01-17 10:48:38 +00:00
Matthew Hodgson
4f8d3b0e2b
more factoring
2017-01-17 02:00:34 +00:00
Matthew Hodgson
87fd136e21
factor out remaining # colours
2017-01-16 23:13:47 +00:00
Matthew Hodgson
cab5bf8849
fix a lone lost opera vendor prefix
2017-01-16 19:00:44 +00:00
Matthew Hodgson
d74dfc9ee7
strip out unneeded -ms- prefixes
2017-01-16 18:58:37 +00:00
Matthew Hodgson
c305b72b91
strip out unneeded -moz- prefixes
2017-01-16 18:58:02 +00:00
Matthew Hodgson
dc1563d916
strip out unneeded webkit prefixes now we're using autoprefixer
2017-01-16 18:55:29 +00:00
Matthew Hodgson
002339fb86
factor out some more colours
2017-01-16 02:10:45 +00:00
Matthew Hodgson
c1d4a0dd28
postcss experiment
2017-01-10 11:06:45 +00:00
Matthew Hodgson
691fe611d6
experimental postcss
2017-01-10 11:06:09 +00:00
Matthew Hodgson
35b3013386
fix up a few more colours
2016-12-31 14:27:44 +00:00
Matthew Hodgson
c6beaa1631
initial stab at an official dark theme via the magic of SASS.
...
SVGs are all broken, and some of the more exotic colours haven't been updated. There's been no attempt to use SASS to remove duplication from the CSS yet.
no attempt to switch it at runtime yet.
2016-12-28 04:06:10 +00:00
Matthew Hodgson
33f0eaada0
autogen _components.css
2016-12-28 02:02:23 +00:00
Matthew Hodgson
c5fa84cd28
autogenerate the _components.scss index
2016-12-28 02:02:05 +00:00
Matthew Hodgson
bacb284415
basic jig for SASS-based themed CSS (one bundle per theme)
2016-12-28 02:01:28 +00:00
David Baker
d34cb80b68
CSS for the delete threepid button
2016-12-21 18:50:35 +00:00
Mark Haines
9026cc4977
Merge pull request #2659 from vector-im/markjh/attachment_iframe_css
...
Add css for the iframes for e2e attachments
2016-12-01 13:12:12 +00:00
Richard van der Hoff
f202197545
CSS updates for s/block/blacklist for e2e
...
CSS for https://github.com/matrix-org/matrix-react-sdk/pull/574
2016-11-29 18:49:23 +00:00
Mark Haines
be90badc8d
Add css for the iframes for e2e attachments
2016-11-17 11:36:46 +00:00
Matthew Hodgson
f911f0cfca
geektime verbiage tweaks
2016-11-13 20:18:19 +00:00
Matthew Hodgson
efabf35613
make room previews more obvious
2016-11-13 14:13:32 +00:00
Matthew Hodgson
3f640139d2
quick and dirty support for custom welcome pages, with an example for geektime techfest
2016-11-13 14:10:33 +00:00
Luke Barnard
4f944cf01c
Add CSS for mlist truncation
...
matrix-org/matrix-react-sdk#544
2016-11-10 17:15:30 +00:00
Luke Barnard
b30df2115c
Add some CSS for an error popup that appears next to the `Manage Integrations` button if there was a problem contacting Scalar
2016-11-08 10:54:03 +00:00
David Baker
8c3fed7559
CSS for changelogs
2016-11-02 17:48:47 +00:00
David Baker
61d7db6eb6
Correct text alignment on room directory search
...
Seemed to only be broken on firefox
2016-10-26 10:35:46 +01:00
Richard van der Hoff
97cedfc712
Centre images in dialog buttons
...
Some dialogs put a spinner in the button... need to line them up.
2016-10-11 17:50:49 +01:00
Matthew Hodgson
60adbffacf
try to fix the create room label
2016-10-10 02:38:38 +01:00
Richard van der Hoff
56deea9f10
Merge pull request #2382 from vector-im/dbkr/networkdropdown_size_jump
...
Prevent network dropdown resizing slightly
2016-09-30 10:59:15 +01:00
Matthew Hodgson
5b3524f174
better wordwrap on RightPanels
2016-09-29 17:41:34 +01:00
David Baker
b652ea5024
Prevent network dropdown resizing slightly
...
Dropdown resized by 2px when opened
2016-09-29 16:49:44 +01:00
David Baker
85ea45a64a
Room dir: New filtering & 3rd party networks
...
Changes filtering on 3rd party networks to divide into portal / non portal rooms and not show portal rooms by default. Adds a special '_matrix' network for all rooms that aren't portal rooms.
Also adds ability to query 3rd party directory servers.
2016-09-27 19:39:20 +01:00
David Baker
3938abc5dd
add webkit vendor prefixed properties
...
for mavericks safari
2016-09-23 17:18:52 +01:00
David Baker
4961a97ed4
More css:
...
* Make join button more buttony
* Fix size of dropdown, allow search box to expand
* Use flexbox within search box to input can fill the rest of the space
2016-09-23 16:33:28 +01:00
David Baker
fb477fad1e
Less hardcoded CSS
2016-09-23 15:58:28 +01:00
David Baker
a070bccffb
Hacky hardcoded css for join button
2016-09-23 15:26:08 +01:00
David Baker
2e77b0a3c7
Use directory search box component
2016-09-23 13:48:44 +01:00
Matthew Hodgson
f19044fef2
re-apply new scalar CSS
2016-09-19 06:59:24 -04:00
Kegsay
e2fc2b1b09
Revert "improve lipstick and support scalar logout"
2016-09-19 10:16:50 +01:00
Matthew Hodgson
af230b5fa8
improve lipstick and support scalar logout
2016-09-18 02:57:15 +01:00
David Baker
a11516a984
Make publicrooms use the new paginating API
...
Also do filtering on the server
WIP: This breaks the network dropdown
2016-09-16 17:33:28 +01:00
David Baker
135c22c99d
Merge pull request #2219 from vector-im/dbkr/directory_network_selector
...
Directory network selector
2016-09-16 17:09:23 +01:00
Matthew Hodgson
6e2a371017
fix MemberInfo layout
2016-09-16 14:36:26 +01:00
Matthew Hodgson
de26d1a8ce
Merge pull request #2235 from vector-im/wmwragg/two-state-sublist-headers
...
Wmwragg/two state sublist headers
2016-09-16 14:08:00 +01:00
wmwragg
7af765976b
Notification counts now done correctly, as well as highlights
2016-09-16 13:25:39 +01:00
wmwragg
72e108c4f9
More robust badge positioning
2016-09-16 11:34:16 +01:00
wmwragg
e2b695827e
Refactor to reuse RoomSubList chevron styling
2016-09-16 11:02:09 +01:00
wmwragg
4b50a8a56e
Refactored so the RoomSubList overflow element use RoomSubList CSS
2016-09-16 10:57:55 +01:00
wmwragg
737d1d8843
Changed the overflow tile styling, but there is no collpased state or mention count yet
2016-09-16 10:48:52 +01:00
wmwragg
24d0b95cb2
Corrected the tooltip text colour to match the design
2016-09-16 08:15:27 +01:00
wmwragg
77085882fa
quick tidy of CSS
2016-09-16 08:08:31 +01:00
wmwragg
9375ebfb75
Fixed broken tooltip positioning again
2016-09-16 08:06:17 +01:00
Matthew Hodgson
e2f94c8722
improve scroll cosmetics
2016-09-16 03:26:59 +01:00
Matthew Hodgson
b0fd65f442
fix ff rhs scroll
2016-09-16 03:26:45 +01:00
Matthew Hodgson
f56a6039e8
fix droptarget margins
2016-09-16 02:54:03 +01:00
Matthew Hodgson
c44994c0ee
fix tinter for LeftPanel
2016-09-16 02:53:57 +01:00
Matthew Hodgson
eeb91374cf
highlight my device
2016-09-15 19:42:36 +01:00
David Baker
f3cbb9fe90
Make the network dropdown work
2016-09-15 15:18:12 +01:00
wmwragg
3907da064e
Removed no longer used MultiInviteDialog, as it's now been replaced with the ChatInviteDialog
2016-09-15 11:46:35 +01:00
wmwragg
f43530e1ef
Tweaked font size to match the design spec
2016-09-15 11:39:21 +01:00
wmwragg
a1e3ec1d19
Added query to CSS and removed nolonger used SearchableEntityList
2016-09-15 11:30:46 +01:00
David Baker
43b87e1f82
Add network selector that doesn't do anything yet
2016-09-15 11:29:27 +01:00
Matthew Hodgson
2a85b2271c
tweak MemberInfo CSS
2016-09-15 02:44:34 +01:00
Matthew Hodgson
cb2c2c1b36
basic verification UI
2016-09-15 01:55:59 +01:00
wmwragg
66ef5213b8
Increased hitbox area to the whole invite section, not just the icon
2016-09-14 14:32:30 +01:00
wmwragg
370612135f
The scrollbars are nolonger always visible for the AddressSelector and ChatInviteDialog invite list
2016-09-14 13:55:10 +01:00
Matthew Hodgson
ec05d1b9bd
improve e2e and scalar settings UI
2016-09-14 02:07:23 +01:00
Matthew Hodgson
c6a9614372
Merge pull request #2181 from vector-im/wmwragg/chat-multi-invite
...
Wmwragg/chat multi invite
2016-09-13 19:31:05 +01:00
wmwragg
56606c01a0
Added valid but unknown mx user
2016-09-13 17:09:01 +01:00
wmwragg
3fe8b503e5
Fixed over collapse on Safari, and now hide the RHS footer Invite when collapsed
2016-09-13 14:57:58 +01:00
wmwragg
bdee2d3b28
Shifting icon to center of collapsed section
2016-09-13 14:44:54 +01:00
wmwragg
15ee2578c5
Tweak to font colour
2016-09-13 14:36:13 +01:00
wmwragg
768f11fe58
Added new Invite button in the RHS footer
2016-09-13 14:27:23 +01:00
wmwragg
acdcb21830
Fixed weird margin bug when LHS panel is collapsed
2016-09-13 13:32:50 +01:00
wmwragg
1530568354
Merge branch 'develop' into wmwragg/chat-multi-invite
2016-09-13 12:38:45 +01:00
Aviral Dasgupta
cbab2c142b
Autocomplete restyling
2016-09-13 15:43:59 +05:30
wmwragg
f59dbe40ec
Added error checking, and UI
2016-09-13 11:03:27 +01:00
Matthew Hodgson
f119a57952
dedicated dialog box for E2E messages
2016-09-12 23:42:43 +01:00
Matthew Hodgson
c6fa1e2e21
show e2e icon by default
2016-09-12 20:02:22 +01:00
Matthew Hodgson
0bdc026b05
E2E CSS
2016-09-12 18:50:32 +01:00
Matthew Hodgson
20eb28f052
fix e2e icon placement
2016-09-12 17:38:27 +01:00
wmwragg
bfd3ef0e44
Limit the invite area in height
2016-09-12 17:31:49 +01:00
wmwragg
abda8c77ad
Added styling for unknown addresses
2016-09-12 17:25:38 +01:00
wmwragg
906be376c9
Refactored AddressTile to use string address rather than user object, so it can user email as well mx userId
2016-09-12 16:51:42 +01:00
wmwragg
2bf177dbcc
Refactored the queryList into seperate AddressSelector component
2016-09-12 13:01:08 +01:00
Matthew Hodgson
5775552bab
css for e2e look & feel
2016-09-12 01:38:03 +01:00
Matthew Hodgson
dd4617a7c6
bring back small avatars for info msgs otherwise the design breaks
2016-09-11 23:01:28 +01:00
Matthew Hodgson
64dedef2c7
fix wordwrap on new panels
2016-09-11 21:55:57 +01:00
Matthew Hodgson
89f8ff4988
Merge branch 'develop' into matthew/notif-panel
2016-09-11 02:37:30 +01:00
Matthew Hodgson
3a8c94de5a
CSS for notif & file panel
2016-09-11 02:15:03 +01:00
Matthew Hodgson
dd39813cc2
show context menus on hoverover
2016-09-11 02:14:52 +01:00
David Baker
e1c32536ff
Cursor: pointer on member info create room button
2016-09-09 19:23:12 +01:00
David Baker
ab9786cc02
Merge remote-tracking branch 'origin/develop' into dbkr/memberinfo_list_rooms
2016-09-09 16:27:00 +01:00
David Baker
57804f4e02
Support for common rooms in MemberInfo
...
Renames RoomDNDView to DNDRoomTile which now provides a separate DNDRoomTile component rather than
clobberring RoomTile, so we can use a draggable one where we want a draggable one and a non-draggable
one where we don't want it to be draggable. RoomTile main is still polluted with DND stuff, but is
now optional.
Remove BottomLeftMenuTile because it was no longer used in the bottom left menu. Just include
the equivalent markup directly in the one place we now use it (in MemberTile in react-sdk).
2016-09-09 16:15:45 +01:00
Matthew Hodgson
c4421f6bc7
Merge pull request #2139 from vector-im/wmwragg/one-to-one-indicators
...
Wmwragg/one to one indicators
2016-09-09 15:08:20 +01:00
wmwragg
965d9aaf47
Lowered the Avatar menu background, so the Direct Message indicator is in front of it
2016-09-09 14:56:20 +01:00
wmwragg
2476f87e1d
Positional tweaks for the new Direct Message indicator
2016-09-09 14:47:26 +01:00
wmwragg
cd36800426
New direct message indicator CSS
2016-09-09 14:42:11 +01:00
wmwragg
18eb9d9330
Made sure the z-index was correct for the new little green men
2016-09-09 14:36:21 +01:00
Matthew Hodgson
7e379e9877
Merge pull request #2136 from vector-im/wmwragg/room-directory-back
...
Added back the Directory listing button, with new tootlip
2016-09-09 14:08:19 +01:00
wmwragg
09ce3a79ec
Added back the Directory listing button, with new tootlip
2016-09-09 12:23:50 +01:00
wmwragg
bfa59c6c04
Increased the width of the query list container to take account of scrollbars
2016-09-09 11:42:57 +01:00
Matthew Hodgson
e75148e799
Merge branch 'develop' into matthew/notif-panel
2016-09-09 11:20:10 +01:00
Matthew Hodgson
8376f0d75a
Merge pull request #2110 from vector-im/wmwragg/one-to-one-chat
...
Wmwragg/one to one chat
2016-09-09 10:46:01 +01:00
wmwragg
ac365622b8
Align the RoomTile tooltips with the BottomLeftMenu tooltips
2016-09-09 07:10:12 +01:00
wmwragg
7cb48e0d2d
Refactor so that the tooltip positional tweaks can be done in CSS rather than passed in as parameters
2016-09-09 06:56:54 +01:00
wmwragg
38ac520e1e
Fixed name vertical overflow
2016-09-08 17:19:59 +01:00
Matthew Hodgson
6182ce48c9
fix (c)
2016-09-08 15:27:55 +01:00
Matthew Hodgson
8860c9c7fd
Merge pull request #2082 from aviraldg/feature-rte-formatbar
...
Formatting toolbar for RTE message composer.
2016-09-08 13:54:39 +01:00
Matthew Hodgson
a8d7d23dd6
implement NotifPanel css
2016-09-08 03:03:10 +01:00
Aviral Dasgupta
d833c7632d
Add strikethrough and <hr> styles
2016-09-08 02:47:31 +05:30
Aviral Dasgupta
22bf6e7969
RTE format bar enhancements
2016-09-07 22:52:37 +05:30
wmwragg
1d32dd72ed
Fixed typing error
2016-09-07 17:30:53 +01:00
wmwragg
761552430c
Dialog buttons have a pointer cursor now
2016-09-07 17:14:27 +01:00
wmwragg
cc720b9797
Design tweaks for alignment
2016-09-07 17:08:24 +01:00
wmwragg
75c81b369f
Mouse actions on the queryList added, as well as better queryListElement styling
2016-09-07 16:19:30 +01:00
wmwragg
48501d91d2
Added justification for the AddressTile, when requested
2016-09-07 10:55:31 +01:00
Matthew Hodgson
aefef2ba56
FilePanel css
2016-09-07 02:16:09 +01:00
wmwragg
ace0e01d86
Tweak on the textarea to prevent the input area jumping a couple of pixels in size between textarea and AddressTile
2016-09-06 17:21:28 +01:00