wmwragg
3cfcc13387
Initial fix for Dialog Spinners
2016-07-17 21:20:11 +01:00
wmwragg
953bb64e0b
Some quick initial tweaks to the badge icon
2016-07-17 21:18:47 +01:00
Matthew Hodgson
54f4443428
fix single emoji sizing
2016-07-17 18:30:06 +01:00
Matthew Hodgson
1e963a6c3a
Revert "Presentation for inline link"
2016-07-15 16:54:27 +01:00
Matthew Hodgson
348f133e77
add mx_EventTile_body class for the body span in events, and fix the naming scheme of '.emoji-body'
2016-07-15 15:03:42 +01:00
Matthew Hodgson
cd865bbe8f
Merge pull request #1806 from vector-im/wmwragg/modal-restyle
...
Wmwragg/modal restyle
2016-07-15 15:01:01 +01:00
wmwragg
e668d7685d
Fixed light box colour, reset back to black.
2016-07-15 14:54:15 +01:00
Matthew Hodgson
6607bee91a
Merge pull request #1799 from ribot/feature-inline-link-preview
...
Presentation for inline link
2016-07-15 13:51:54 +01:00
wmwragg
3a89a5af0b
Increasing the specificity of the CSS so that primary input submit buttons are styled correctly
2016-07-15 12:33:56 +01:00
Stefan Pearson
35e3621ae7
removes overflow comments
2016-07-15 12:21:05 +01:00
wmwragg
040ef73886
Simple refactor of the primary indicator, now it's a class. Also added a global selector to remove the ugly firefox dotted line highlight
2016-07-15 11:22:10 +01:00
wmwragg
adbad509f4
Updated to highlight the primary button in the dialog, i.e. the first one
2016-07-14 17:59:06 +01:00
David Baker
15a97a653f
CSS for offline user colours
2016-07-14 17:43:43 +01:00
Stefan Pearson
9fb97a6b10
presentation for inline link
2016-07-14 17:08:25 +01:00
wmwragg
579f210cfc
Initial Modal dialog restyling
2016-07-14 16:55:41 +01:00
wmwragg
2fb1e156ed
Modal background restyled
2016-07-14 15:41:23 +01:00
wmwragg
09e861637f
Simplification of the css
2016-07-14 12:04:31 +01:00
wmwragg
1f43f904d5
Search icon updated in header, and all icons spacing and positioning teaked
2016-07-14 11:33:07 +01:00
wmwragg
0a4af647c8
Header and footer buttons updated to new versions
2016-07-13 17:46:07 +01:00
wmwragg
503bf541c7
Tweak to the close button css to keep the close button inline with the search box
2016-07-13 14:34:20 +01:00
wmwragg
1fbc249de5
Updated Filter room icon
2016-07-13 14:23:46 +01:00
wmwragg
ef4f2f10d9
Updated that RightPanel members icon, highlight and numbers
2016-07-13 13:56:59 +01:00
Aviral Dasgupta
74f459f8a4
feat: bump emoji-body font-size down to 48px
2016-07-12 20:37:51 +05:30
Aviral Dasgupta
49dd93ffab
feat: large emoji support
2016-07-05 04:04:34 +05:30
David Baker
7174879ac9
Merge pull request #1717 from aviraldg/feature-autocomplete
...
Autocomplete
2016-07-04 18:16:22 +01:00
Matthew Hodgson
486adb717b
Merge pull request #1670 from Half-Shot/patch-1
...
#1664 Set a maximum height for codeblocks
2016-06-24 19:16:50 +01:00
Richard van der Hoff
2ca9d87b95
CSS for device blocking
...
A bunch of updates to the device info:
* format as a table
* make the buttons green, because the old way was super confusing
* instead make the status indicator red/orange/green.
2016-06-23 17:32:33 +01:00
Matthew Hodgson
eca453ee5a
reposition Login spinner
2016-06-21 19:49:55 +01:00
Aviral Dasgupta
dc840fdf48
updated selection styling
2016-06-21 19:02:18 +05:30
Aviral Dasgupta
510bb5785e
Merge branch 'develop' into feature-autocomplete
2016-06-21 04:09:23 +05:30
Aviral Dasgupta
034c045b37
Styling for autocomplete
2016-06-20 13:53:18 +05:30
Matthew Hodgson
4dfb0e9a90
Merge branch 'develop' into matthew/scalar
2016-06-19 22:40:58 +01:00
Will Hunt
c7d0214aaa
#1664 Set a maximum height for codeblocks
2016-06-18 12:21:34 +01:00
David Baker
895fb63d5d
Merge pull request #1661 from vector-im/rav/unverify_device
...
CSS for unverify button
2016-06-17 17:00:26 +01:00
Richard van der Hoff
95a0bc92d6
CSS for unverify button
...
(supports change in react-sdk)
2016-06-17 16:25:39 +01:00
Matthew Hodgson
a90492e393
fix CSS
2016-06-17 16:14:14 +01:00
Aviral Dasgupta
ec7067e7bd
Autocomplete style
2016-06-17 04:58:39 +05:30
Pedro Ferreira
eb37032d8a
Markdown: styles for bold/italics
2016-06-12 01:04:22 +02:00
Aviral Dasgupta
f6ed21559a
RTE mode switch styling & cleanup
2016-06-11 15:54:43 +05:30
Aviral Dasgupta
b2459b2dc6
Merge branch 'develop' of github.com:vector-im/vector-web into feature-rte
2016-06-10 04:43:06 +05:30
Aviral Dasgupta
819e06e2cd
MessageComposer styling for Draft
2016-06-10 04:41:59 +05:30
Richard van der Hoff
5f29729e82
Make unverified encrypted events red and verified ones green
2016-06-08 17:03:54 +01:00
Richard van der Hoff
e24851456a
CSS for the MemberDeviceInfo view
2016-06-08 17:03:28 +01:00
Matthew Hodgson
a2e73cceee
Merge branch 'develop' into matthew/scalar
2016-06-06 10:24:39 +01:00
Aviral Dasgupta
12157edd62
Style selection color
2016-05-28 12:20:21 +05:30
Matthew Hodgson
bede9a814b
remove spurious top border; fix #1472
2016-05-24 00:30:36 +01:00
Matthew Hodgson
d70842c3c7
fix padding of badges
2016-05-24 00:29:48 +01:00
Matthew Hodgson
a288c5b85d
fix padding of badges
2016-05-20 12:21:45 +01:00
Matthew Hodgson
c4d408d095
CSS for IntegrationsManager
2016-05-18 17:02:39 +01:00
Matthew Hodgson
ac24d6707f
Add integs mgt
2016-05-18 15:02:03 +01:00
Matthew Hodgson
d8c32db14b
typos
2016-05-17 20:24:01 +01:00
Matthew Hodgson
2b3606d44d
switch to lozenges, and improve overlap behaviour
2016-05-17 19:52:56 +01:00
Matthew Hodgson
5feb31911a
better collapsed look & feel
2016-05-17 11:19:04 +01:00
Matthew Hodgson
9483e42508
switch from dots to per-room badges
2016-05-17 11:14:30 +01:00
Matthew Hodgson
e640f65640
add close button to room search filter
2016-05-16 23:36:52 +01:00
Matthew Hodgson
c64f71a3cb
refine memberlist cosmetics
2016-05-05 00:35:47 +01:00
Matthew Hodgson
974a187e74
fix annoying bug where URL previews with very long lines (e.g. vector permalinks) would get clipped
2016-05-03 17:49:42 +01:00
Matthew Hodgson
58c431abc2
fix spinner layout bouncing when changing notifs
...
all-important s/done/then/ on pushRulesPromise to ensure that the refresh completes before relaying-out the page
s/Loud/Highlight & sound/
2016-04-17 14:00:20 +01:00
Matthew Hodgson
65d9333104
pointer on roomsublist
2016-04-16 23:49:21 +01:00
Matthew Hodgson
fbd974df55
fix bottomleft bug in chrome canary
2016-04-16 23:49:16 +01:00
Matthew Hodgson
fdf83a5ad5
fix tooltip offset
2016-04-15 22:24:20 +01:00
Matthew Hodgson
c98e06e1aa
add cancelButton to simpleHeader
2016-04-15 22:16:06 +01:00
Matthew Hodgson
37fbad0dbe
fix LeftPanel width in FF
2016-04-15 21:37:52 +01:00
Matthew Hodgson
756da03b9a
fix wrapping of RoomTile when selected
2016-04-15 20:50:22 +01:00
Matthew Hodgson
c606912a8d
fix topic font size
2016-04-15 18:45:52 +01:00
Matthew Hodgson
c7d717f0a4
fix RightPanel
2016-04-15 18:29:49 +01:00
Matthew Hodgson
cf3cdaccf3
fix up UserSettings a bit
2016-04-15 18:23:47 +01:00
Matthew Hodgson
d0d4760ddc
align highlight with droptarget RHS
2016-04-15 18:09:10 +01:00
Matthew Hodgson
51bc18aef0
prettier icon
2016-04-15 18:05:57 +01:00
Matthew Hodgson
26d12bebe4
wire up searchbox filtering, and some minor overall tweaks
2016-04-15 17:54:48 +01:00
Matthew Hodgson
90ae024a4e
tidy up rightpanel and searchbox
2016-04-15 15:53:27 +01:00
Matthew Hodgson
72745b05dc
forgotten CSS
2016-04-15 10:49:25 +01:00
Matthew Hodgson
f8d5101dbc
add lost SVGs and implement SearchBox skeleton
2016-04-15 02:23:12 +01:00
Matthew Hodgson
cc1e30c963
dinkier topic
2016-04-15 01:42:44 +01:00
Matthew Hodgson
25b5c14527
fix new bottomleft menu
2016-04-14 22:26:48 +01:00
Matthew Hodgson
6bc4c87ce4
update to new bottomleftmenu. update header and composer heights
2016-04-14 21:43:49 +01:00
Matthew Hodgson
96c4a24d3d
skin RoomSubList chevrons, horizontal rules and selected room
2016-04-14 21:10:55 +01:00
Matthew Hodgson
8557a3b70e
fix vertical alignment within status bar
2016-04-14 19:15:35 +01:00
Matthew Hodgson
8b6cf1fc41
change badge look & feel; change status bar sizing
2016-04-14 19:11:58 +01:00
Matthew Hodgson
4d221c6099
spell out that images are clickable
2016-04-14 18:15:51 +01:00
Matthew Hodgson
b5248c06a7
fix https://github.com/vector-im/vector-web/issues/987 for once and for all
2016-04-13 00:34:32 +01:00
Matthew Hodgson
18bd1058d3
Merge pull request #1376 from vector-im/matthew/fadable
...
make the UI fadable to help with decluttering
2016-04-12 18:04:47 +01:00
Matthew Hodgson
b18fcf7f9e
spinner on saving room settings
2016-04-12 18:02:31 +01:00
Matthew Hodgson
05e963d1e2
make the UI fadable to help with decluttering
2016-04-12 17:17:08 +01:00
David Baker
be55882f46
Merge pull request #1374 from vector-im/dbkr/get_pushers
...
Get and display a user's pushers in settings
2016-04-12 14:41:45 +01:00
David Baker
356a4a4392
Typo and use CSS rather than <i>
2016-04-12 14:10:17 +01:00
Matthew Hodgson
34bdd40953
timestamps are permalinks
2016-04-12 13:34:10 +01:00
David Baker
cff1c3010b
Get & display pushers in settings
...
Really this is so (in a subsequent PR) we can show whether a user has an email pusher, but we can basically display the list of pushers for free, so adding this too.
2016-04-12 13:18:57 +01:00
Matthew Hodgson
b1ba69fd00
fix lightbox overscroll
2016-04-12 00:35:00 +01:00
Matthew Hodgson
8c619fedeb
Merge pull request #1343 from vector-im/matthew/preview_urls
...
URL previewing support
2016-04-11 23:55:18 +01:00
Matthew Hodgson
a1b78f93fe
Fix wrap on view source
2016-04-10 14:18:57 +01:00
Matthew Hodgson
41373f30f7
oops, name LinkPreviewWidget correctly
2016-04-04 00:33:15 +01:00
Matthew Hodgson
ff2885087d
support cancelling and uncancelling previews
2016-04-03 02:50:51 +01:00
Matthew Hodgson
a5258978d6
Merge branch 'develop' into matthew/preview_urls
2016-04-03 02:07:03 +01:00
Matthew Hodgson
8c0a23dd8b
fix widget layout
2016-04-03 02:06:24 +01:00
Matthew Hodgson
d434ea55a8
Merge pull request #1332 from aviraldg/feature-emoji
...
😄 Emoji autocomplete and unicode emoji to image conversion using emojione.
2016-04-02 23:21:31 +01:00
Aviral Dasgupta
cf17ea6254
Show full-size avatar on MemberInfo avatar click
...
fixes vector-im/vector-web#65
2016-04-03 00:53:17 +05:30
Matthew Hodgson
8247bb4a76
match style for markdown quotes
2016-04-02 00:36:53 +01:00
Matthew Hodgson
08a41bf093
improve layout for LinkPreviewWidget
2016-04-01 02:16:29 +01:00
Aviral Dasgupta
d7157696f4
styling for emojione emojis 😄
2016-04-01 06:22:13 +05:30
Matthew Hodgson
512a9125bf
fix zalgos in SenderProfile again, whilst maintaining limited-width name via inline-block. and without doubling emote vertical space...
2016-03-30 19:47:06 +01:00
Matthew Hodgson
bdf8f655fb
tweak animation and comment it out for now as it maxes out a whole core on my top-of-the-line MBP...
2016-03-30 01:36:44 +01:00
Matthew Hodgson
8603dd4bb4
Merge pull request #1292 from aviraldg/feature-pretty-placeholder
...
Prettier, animated placeholder :D
2016-03-30 01:28:34 +01:00
Matthew Hodgson
0ddb2cf183
fix action vertical spacing
2016-03-29 17:10:11 +01:00
Aviral Dasgupta
6c5b4a298b
Prettier, animated placeholder :D
2016-03-28 19:32:04 +05:30
Richard van der Hoff
b6e4c59877
Merge pull request #1249 from vector-im/dbkr/disable_composer_if_no_permission
...
CSS for https://github.com/matrix-org/matrix-react-sdk/pull/247
2016-03-24 11:44:16 +00:00
Matthew Hodgson
0bc1624d4e
make senderprofile smaller
2016-03-24 01:19:55 +00:00
Matthew Hodgson
f81f7db6cd
fix layout problems exposed by #cats
2016-03-24 01:12:27 +00:00
Matthew Hodgson
9e95d2e4ac
make image event bodies display as blocks to avoid auto sizing, so we can measure their width to explicitly set their height
2016-03-24 00:13:03 +00:00
David Baker
cfcb050822
Add composer controls wrapper to set correct width on the composer controls wrapper div
2016-03-23 15:21:37 +00:00
David Baker
66e36e9d40
CSS for https://github.com/matrix-org/matrix-react-sdk/pull/247
2016-03-23 15:15:38 +00:00
Matthew Hodgson
a3a4ff569e
stop scrollbars overlaying on the count
2016-03-23 13:51:38 +00:00
Matthew Hodgson
490cbbd05f
fix horiz pre scrollbars https://github.com/vector-im/vector-web/issues/754
2016-03-22 15:13:36 +00:00
Matthew Hodgson
e4aa43944f
crude lipstick for warnings
2016-03-22 12:11:19 +00:00
Matthew Hodgson
827f891ae7
warning prompt for roomsettings
2016-03-22 00:56:38 +00:00
Matthew Hodgson
54c34ab8d5
improve previewbar look & feel
2016-03-21 22:06:06 +00:00
Matthew Hodgson
a1e3cf76e1
top-align search results
2016-03-18 16:24:48 +00:00
Matthew Hodgson
866bd55bc3
give notif bar a pointer cursor
2016-03-18 16:16:13 +00:00
Matthew Hodgson
92e187da64
fix ugly spinner on MemberList
2016-03-17 18:44:53 +00:00
Matthew Hodgson
f950b675bd
workaround to avoid accidental click-throughs on narrow vertical scrollbars
2016-03-17 18:26:00 +00:00
Matthew Hodgson
d7a851a353
make senderprofiles clickable
2016-03-17 16:28:49 +00:00
Matthew Hodgson
4164688c24
add pointer to EventTile
2016-03-17 13:09:28 +00:00
Matthew Hodgson
f8fb3a7fe1
fix aspect ratio of roomavatar preview
2016-03-16 20:00:50 +00:00
Mark Haines
31915db6f6
Remove trailing whitespace
2016-03-15 18:38:24 +00:00
Matthew Hodgson
2a8afd49fb
mx_Login_fieldLabel CSS
2016-03-15 18:09:54 +00:00
Matthew Hodgson
c2049e991b
padding for radio buttons on login pages
2016-03-15 13:37:07 +00:00
Matthew Hodgson
cfc4b89225
fix https://github.com/vector-im/vector-web/issues/1154
2016-03-15 10:56:54 +00:00
Richard van der Hoff
e777db3fc4
Add setting for audio notifications
...
Expose the enableAudioNotifications setting in the user settings panel.
2016-03-10 11:01:29 +00:00
Matthew Hodgson
622a4b0e4c
improve cosmetics of login prompts slightly
2016-03-06 13:46:27 -05:00
Matthew Hodgson
7433f50c8c
make settings button always visible
2016-03-04 23:16:36 +00:00
Matthew Hodgson
516647ad04
fix placeholder opacity on moz
2016-03-03 15:31:02 +00:00
Matthew Hodgson
52f259ccfa
explicit fg color for MessageComposer
2016-03-03 15:08:13 +00:00
Matthew Hodgson
f89fe4fff8
when we set an explicit form foreground colour, set an explicit background one too to prevent system-level dark themes on Linux etc making the foreground text unreadable
2016-03-03 14:37:11 +00:00
Richard van der Hoff
72393bf75f
Merge branch 'rav/read_marker' into develop
2016-02-23 17:57:50 +00:00
Matthew Hodgson
2ca5529faa
support hyperlinked topics
2016-02-20 23:54:47 +00:00
Matthew Hodgson
e33e9b5d4a
upgrade OpenSans and add semibold
2016-02-20 13:36:33 +00:00
Matthew Hodgson
f538a0d5de
scale local video feed to fit on the page properly
2016-02-19 01:16:55 +00:00
Matthew Hodgson
4e5b971d3a
accomodate 800px wide thumbs
2016-02-18 19:09:32 +00:00
Matthew Hodgson
ffb1584e10
horizontally scale images properly
2016-02-18 18:59:45 +00:00
Matthew Hodgson
dbf3439e35
fix statusbar layout some more
2016-02-18 18:13:23 +00:00
Matthew Hodgson
11ac6defed
tint searchbar
2016-02-18 17:32:15 +00:00
Matthew Hodgson
27222a54c7
somewhat cryptic hack to make empty RoomStatusBars not take up 41px rather than 36px of height
2016-02-17 18:54:46 +00:00
Matthew Hodgson
3263076ea6
Merge branch 'develop' into rav/update_status_bar
2016-02-17 18:37:40 +00:00
Matthew Hodgson
3c659dcf57
experimental fix for https://github.com/vector-im/vector-web/issues/947 and https://github.com/vector-im/vector-web/issues/946 . may well introduce more problems
2016-02-17 12:43:42 +00:00
Matthew Hodgson
2cd3150c56
tart up mx_EventTile_selected
2016-02-15 20:22:45 +00:00
Matthew Hodgson
cdc1447804
fix search highlight css
2016-02-15 20:19:30 +00:00
Matthew Hodgson
11c9aff69a
fix radiobutton css
2016-02-15 22:06:16 +02:00
Matthew Hodgson
58959d014a
show vaguely accurate default avatar
2016-02-15 22:01:30 +02:00
Richard van der Hoff
1a9125a886
Fix horizontal alignment of top unread-messages bar
2016-02-15 18:10:11 +00:00
Matthew Hodgson
8e008572e5
CSS for setting display name prompt
2016-02-15 19:37:19 +02:00
Richard van der Hoff
18c6aa38e4
Styling and imgs to support new read_marker semantics
...
Support for adding a new 'Scroll up' bar in react-sdk
2016-02-15 17:22:55 +00:00
Matthew Hodgson
177fba360d
shrink 3pid invite placeholder text
2016-02-15 11:13:24 +02:00
Matthew Hodgson
ad9935739c
proper fix for https://github.com/vector-im/vector-web/issues/917 and resolve https://github.com/vector-im/vector-web/issues/928
2016-02-15 09:56:52 +02:00
Matthew Hodgson
a2193d61b0
show the leave button by default for now as it causes too much pain otherwise
2016-02-14 21:34:32 +02:00
Matthew Hodgson
0ca6efdfca
fix the nightmarish https://github.com/vector-im/vector-web/issues/917
2016-02-14 21:28:01 +02:00
Richard van der Hoff
bab9de1899
CSS fixes to match matrix-org/matrix-react-sdk#30b4b91.
...
This mostly works, but there is some weirdness with the status bar being too
high by default, and getting smaller when it has content in it.
2016-02-09 14:44:59 +00:00
David Baker
c0c7ae1596
Style submit input controls in dialogs the way we style buttons.
2016-02-04 11:50:29 +00:00
Richard van der Hoff
f94272c539
Add some crude CSS for highlighting the selected event
...
(To be useful, this needs functionality which hasn't yet landed in react-sdk).
2016-01-30 00:43:47 +00:00
David Baker
3b18b9b54b
Fix connection lost bar CSS
2016-01-29 10:07:22 +00:00
David Baker
6a36b022e4
New style guest warning bar
2016-01-28 13:00:44 +00:00
David Baker
35600f11ad
CSS that changes the connection lost bar into a more general 'warning bar' so we can use it for a guest access warning
2016-01-28 09:19:28 +00:00
Matthew Hodgson
75886c4143
make badges scale with size of RoomTile
2016-01-24 14:50:24 -05:00
Matthew Hodgson
cd853ab5b4
try for a simpler invite placeholder look & feel
2016-01-24 19:02:49 +00:00
Matthew Hodgson
292af1e59c
improve settings layout and fix FF bugs
2016-01-24 18:14:52 +00:00
Matthew Hodgson
d3bc0feb83
fix ugly wrapping bug
2016-01-24 17:54:01 +00:00
Matthew Hodgson
19bfd829d0
add scrollToBottomBar and fix spacing for status bars in general
2016-01-24 01:52:21 +00:00
Matthew Hodgson
759b318bb5
fix safari
2016-01-23 01:24:04 +00:00
Matthew Hodgson
dd19d2aaee
red bar for highlights even if there's a unreadNotify too
2016-01-22 18:04:54 +00:00
Matthew Hodgson
e0ecde6760
put a black badge on unread notifications, and a red one for unread highlights
2016-01-22 17:23:04 +00:00
Matthew Hodgson
0ee1892a0b
truncate room list
2016-01-22 15:31:42 +00:00
Matthew Hodgson
a76167d175
correct layout for truncated lists
2016-01-21 17:38:46 +00:00
Matthew Hodgson
bd75234a2f
make CSS work on FF
2016-01-21 00:39:26 +00:00
Matthew Hodgson
6573ba8c20
fix up Start Chat behaviour as per Amandine's feedback
2016-01-21 00:16:26 +00:00
Matthew Hodgson
6117e09a3f
implement the correct design for memberlist
2016-01-20 22:04:32 +00:00
Matthew Hodgson
1fd60f1e44
revert read marker css
2016-01-20 17:23:33 +00:00
Matthew Hodgson
48052415b7
usersettings button layout
2016-01-20 17:09:53 +00:00
Matthew Hodgson
e87e22a438
rhsbutton
2016-01-20 17:06:13 +00:00
Matthew Hodgson
5b2f921190
Fix bold avatar letters
2016-01-20 17:01:19 +00:00
Matthew Hodgson
b830f43371
remove RoomAvatar; stale border-radius; fix aliases table
2016-01-20 16:59:53 +00:00
Matthew Hodgson
6332e3908e
roomsettings css fixes
2016-01-20 16:39:14 +00:00
Matthew Hodgson
82742f9f13
oops, fix tinted read up to marker correctly
2016-01-20 16:06:35 +00:00
Matthew Hodgson
60d2d45255
readd in the .mx_EntityTile_power class. don't understand why it was killed :'(
2016-01-20 15:39:42 +00:00
Matthew Hodgson
6ecdb02e81
sanitize avatar border radii
2016-01-20 15:26:48 +00:00
Matthew Hodgson
4d3918109a
skin new invite UI CSS
2016-01-20 14:58:27 +00:00
Matthew Hodgson
9a9db53e0a
fix tinting of read marker again
2016-01-20 14:58:17 +00:00
Matthew Hodgson
3e8c6a42d3
roomsettings layout tweaks
2016-01-18 19:58:02 +00:00
Matthew Hodgson
3b8e5073b5
improve layout
2016-01-18 19:57:32 +00:00
Matthew Hodgson
d5c291ae62
Merge branch 'kegan/invite-search' into matthew/roompreview
2016-01-18 18:00:58 +00:00
Matthew Hodgson
d6f6f32c74
WIP to support non-guest peeking, and slightly improve roomdirectory look & feel for now
2016-01-18 17:37:13 +00:00
Kegan Dougal
317e1fb9cd
Merge branch 'develop' into kegan/invite-search
2016-01-18 17:33:26 +00:00
Kegan Dougal
ac4b221690
More CSS fun for border bottom
2016-01-18 17:22:02 +00:00
manuroe
fdf5b0a4fc
Merge branch 'develop' into push-rules-settings
...
# Conflicts:
# src/skins/vector/css/matrix-react-sdk/structures/UserSettings.css
2016-01-18 18:14:20 +01:00
Kegan Dougal
fef02f2fd1
s/MemberTile/EntityTile/
2016-01-18 16:43:00 +00:00
Matthew Hodgson
0ef03c5ca4
Merge pull request #653 from vector-im/matthew/roomsettings2
...
Finish off RoomSettings (part 2)
2016-01-18 13:39:55 +00:00
Matthew Hodgson
5a1b0a1dab
Merge pull request #657 from vector-im/matthew/memberlist
...
Fix up MemberList and MemberInfo cosmetics a bit
2016-01-18 13:39:42 +00:00
Kegan Dougal
77621fe035
Add missing CSS from #638
2016-01-18 12:06:46 +00:00
Matthew Hodgson
8792be4db2
moar space
2016-01-18 01:25:57 +00:00
Matthew Hodgson
1fef91b82c
MemberInfo lipstick
2016-01-18 01:18:11 +00:00
Matthew Hodgson
b2a1c89e83
bring back power badges
2016-01-18 00:16:04 +00:00
Matthew Hodgson
40d2018c17
fix checkbox css
2016-01-17 12:26:54 +00:00