OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
31,702 Commits
211 Branches
549 Tags
658 MiB
Commit Graph

860 Commits (1d1263c39a6b261bb5c6fde9a244377e16b4a1e5)

Author SHA1 Message Date
Bruno Windels b7768f34f2 Add legend and style it 2019-09-02 16:15:18 +02:00
Sorunome fe9ae46ffb
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into soru/spoilers 2019-08-28 20:23:24 +02:00
Bruno Windels eddaece43e add visual bell color to theme + choose better value for dark mode 2019-08-28 18:00:57 +02:00
Bruno Windels 85efb71a23 add visual bell when no replacements are available 
also add try/catch in _tabCompleteName so errors don't get swallowed
 2019-08-28 15:53:16 +02:00
Bruno Windels 4a27abb131 fix css lint 2019-08-22 15:11:31 +01:00
Bruno Windels 71286b5610 restore reply_to_event action 2019-08-22 13:33:20 +01:00
Bruno Windels d4ca087abe fix styling issues 
- grow/shrink between min and max height correctly
 - don't grow wider than available space
 - some space between editor and buttons
 2019-08-22 13:33:20 +01:00
Bruno Windels 33c6945fc4 align autocomplete at top of composer 2019-08-22 13:33:20 +01:00
Bruno Windels 64e83a8111 font-size 2019-08-22 13:33:20 +01:00
Bruno Windels f9992a1fc6 implement editor placeholder 2019-08-22 13:33:20 +01:00
Bruno Windels cfbd2e9cc8 support basic sending with new main composer 
this removes all formatting options, as the new editor doesn't
have any.
 2019-08-22 13:33:20 +01:00
Bruno Windels 92d7263046 move editor padding to edit specific style file 
as it will be different for the main composer
 2019-08-22 13:33:20 +01:00
Bruno Windels 505846ce53 split up css, update class names 2019-08-22 13:33:20 +01:00
Anton Zuenko a3eb45e0b9 Fix waste of space of collapsed left panel 
Signed-off-by: Anton Zuenko <anton@zuenko.ru>
 2019-08-05 18:03:20 +02:00
J. Ryan Stinnett 2d4264c39d Keep widget URL in permission screen to one line 
This keeps the widget URL to one line max, so that the allow button will always
be visible. The full URL can be viewed by hovering.

Fixes https://github.com/vector-im/riot-web/issues/10402
 2019-07-23 18:06:37 +01:00
J. Ryan Stinnett ca1e5bb3ae Comment disabled rules 2019-07-11 09:30:01 +01:00
J. Ryan Stinnett 38d6953bf6 Manually fix remaining stylelint issues 2019-07-10 16:56:40 +01:00
J. Ryan Stinnett dd2079bffc Auto-fix stylelint issues 
These `stylelint` issues were autofixed by the tool itself and look sane to me.
 2019-07-10 16:56:40 +01:00
Bruno Windels 353f5a205c
Merge pull request #3170 from matrix-org/bwindels/handle-associated-failures 
Handle associated event send failures
 2019-07-03 09:02:58 +00:00
Bruno Windels fc3c4fccc2 set background on highlighted messages 2019-07-02 18:31:11 +02:00
Bruno Windels 1af8da4a4a change lozenge color of unsent redacted events to red 
use css vars so we don't have to repeat the whole lozenge style
 2019-07-01 11:06:55 +02:00
Michael Telatynski 49b89217a3 MemberInfo wrap Device Name/ID 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-30 19:21:19 +01:00
Travis Ralston 7f2ab39609
Merge pull request #3142 from matrix-org/travis/preview-loading 
Show a loading state for slow peeks
 2019-06-27 09:24:25 -06:00
Bruno Windels 15d286ed93
Merge pull request #3144 from matrix-org/bwindels/edit-history 
Edit history dialog
 2019-06-26 14:38:53 +00:00
Bruno Windels 498db2597d show hand on hovering (edited) marker 2019-06-26 12:15:13 +02:00
Bruno Windels c9aa7efe54 don't require EventTile for default timestamp style 2019-06-26 11:59:56 +02:00
Travis Ralston ca6ddf324f Show a loading state for slow peeks 2019-06-25 20:56:33 -06:00
Travis Ralston 0701d89bbe Fix upgrade warning being chopped off 
The flex box was behaving a bit strange, so we just wrap the content and change `height: 235px` to `max-height: 235px` to get scrollbars.
 2019-06-25 15:40:22 -06:00
Bruno Windels f9188bca92 reduced opacity for pending redactions 2019-06-18 13:48:51 +02:00
Michael Telatynski 4fda6c21de Use overflow on MemberInfo name/mxid so that the back button stays 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-12 21:58:10 +01:00
Sorunome eddac4b188
blur spoilers 2019-06-11 21:08:45 +02:00
Hubert Chathi 4ab491f823 truncate long display names in timeline headings 
partial fix for vector-im/riot-web#5739
 2019-06-06 22:41:10 -04:00
J. Ryan Stinnett 4b18bb17fe Show read receipts on top of message 
This allows you to view a long expanded set of read receipts even while hovering
a message.

Fixes https://github.com/vector-im/riot-web/issues/7608
 2019-06-06 14:02:35 +01:00
J. Ryan Stinnett 2be00ee0e0 Native emoji require extra line-height 
Increase line-height so that native emoji aren't cut off when we fall back to
them.

Fixes https://github.com/vector-im/riot-web/issues/9898
 2019-05-30 10:26:12 +01:00
Sorunome d8f4512439
add basic spoiler support 2019-05-22 20:41:27 +02:00
Bruno Windels 2d4d608ed6
Merge pull request #2997 from matrix-org/bwindels/pill-avatars 
Message editing: render avatars for pills in the editor
 2019-05-21 12:11:06 +00:00
Bruno Windels e48e72c162 pr feedback 2019-05-21 13:50:27 +02:00
Bruno Windels 7c03d71607 give continued events a little bit of top padding 
this way, the background isn't clipped at the top
 2019-05-21 12:20:58 +02:00
Matthew Hodgson d3f06763b3
Merge branch 'develop' into matthew/twemoji 2019-05-20 16:38:44 +01:00
Bruno Windels 1368a5eb80
Merge pull request #2996 from matrix-org/bwindels/composerdesign 
Message editing: apply design
 2019-05-20 08:42:41 +00:00
Matthew Hodgson e48cc44cba apply monospace font correctly 2019-05-19 17:41:18 +01:00
Matthew Hodgson 069a5a9546 remove obsolete emojione css 2019-05-19 17:11:41 +01:00
Matthew Hodgson 24b03374ac moar lineheight needed for big twemoji 2019-05-19 16:48:29 +01:00
Bruno Windels f9462d1012 hide timestamp while editing 2019-05-17 16:01:52 +01:00
Bruno Windels ddefeae136 update design of editor to look as close to original tile (and design) 
the buttons below the composer are overlayed onto the previous event.
In case of the last event, for now we make them not overflow, but make the
tile grow. The design says it should overlay on the main composer for the last
event tile, postponing that for a bit though as not sure what is the best way
to do that.
 2019-05-17 15:33:11 +01:00
J. Ryan Stinnett 43c9e6d942 Reactions / editing tooltip tweaks 2019-05-17 15:10:35 +01:00
J. Ryan Stinnett 603e6b7055 Adjust edited tooltip to use shared styles 2019-05-17 12:19:02 +01:00
Bruno Windels 4a6725d4c2 Message editing: show (edited) marker on edited messages, with tooltip 2019-05-17 11:36:36 +01:00
Michael Telatynski fd07b5c476 use scss variable for grey 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-05-14 23:03:02 +01:00
Michael Telatynski 3cd9c152c2 Check permission to invite before showing invite buttons/disable them 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-05-11 19:45:24 +01:00
J. Ryan Stinnett ed8bbc7082 Extract message options button to action bar 
This adds a new action bar component to hold multiple per-message actions. This
existing options button has moved to this new component, and is currently the
only action.
 2019-04-29 15:20:50 +01:00
J. Ryan Stinnett 530c92e03d Rename event edit button to options button 
This naming is clearer as it doesn't really edit at all (it shows a context
menu). This should also be less confusing with actual editing when it arrives.
 2019-04-29 15:20:50 +01:00
Luca Weiss 12f92c49a6
Mark a few CSS classes as not selectable 
Should be enough to make copy-pasting not a nightmare.

For vector-im/riot-web#7460

Also remove an instance where the vendor prefixes were used, but a build
step adds those automatically

Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
 2019-04-23 19:52:48 +02:00
Bruno Windels 1100320351 make non-member inviter name also bold 2019-04-17 11:02:58 +02:00
Bruno Windels 86620839ae make username clickable 2019-04-17 10:57:45 +02:00
Bruno Windels 8a371080d7 colored inviter name and layout 2019-04-17 10:22:35 +02:00
Bruno Windels e40757a801 make sure long subtitles dont overflow 2019-04-16 16:19:50 +02:00
Bruno Windels c1ff5f2fba implement style 2019-04-15 17:11:26 +02:00
Bruno Windels 01e9de9a3a differentiate style based on preview or not 2019-04-12 12:54:13 +02:00
Bruno Windels 0553a6f1d6 some style changes 2019-04-11 13:07:54 +02:00
Travis Ralston 223498a979
Merge pull request #2874 from matrix-org/travis/breadcrumbs/dms 
Add an indicator to show a room is a direct chat in breadcrumbs
 2019-04-05 08:15:12 -06:00
Travis Ralston b7e557e49a Autohide the scrollbar on breadcrumbs 
Fixes https://github.com/vector-im/riot-web/issues/9349
 2019-04-04 16:27:00 -06:00
Travis Ralston 095e6a3ba6 Add an indicator to show a room is a direct chat 
Fixes https://github.com/vector-im/riot-web/issues/8797
 2019-04-04 14:31:23 -06:00
Travis Ralston f5600fd4d7 Add badges to breadcrumb rooms 
Fixes https://github.com/vector-im/riot-web/issues/8606
 2019-04-03 15:29:15 -06:00
Travis Ralston 7e2291592c Apply 50% opacity to left breadcrumbs 
Fixes https://github.com/vector-im/riot-web/issues/8564

We listen for membership changes to make sure the state is kept up to date.
 2019-04-01 11:59:39 -06:00
Bruno Windels a326c83016
Merge pull request #2842 from matrix-org/bwindels/bacat-scrolling-merged-develop 
BACAT Scrolling
 2019-03-29 14:02:15 +00:00
Travis Ralston 9b64dd0cd7 Support horizontal scrolling on breadcrumbs 
Fixes https://github.com/vector-im/riot-web/issues/8714
Fixes https://github.com/vector-im/riot-web/issues/8890
Fixes https://github.com/vector-im/riot-web/issues/9034
Fixes https://github.com/vector-im/riot-web/issues/8954

This turned out to be much more complicated than it needed to be. We use an IndicatorScrollbar to do all the math for us and some minor changes have been made so it can flag left/right overflow. The complicated part is the css changes which make the gradients work: unlike the RoomSubList, we have to calculate the offset of the indicators (gradients) on our own because position:sticky doesn't work horizontally.

The changes to the css (well, mostly pointer-events:none) make it so the gradient doesn't interfere with the room avatars. 

9034 and 8954 are fixed by this because they represent an overflow-x:none style breakage where browsers won't let you scroll without a scrollbar. The gradient offset problem is also demonstrated in 8954.
 2019-03-27 17:52:05 -06:00
Bruno Windels 494779393f Merge branch 'develop' into bwindels/bacat-scrolling 2019-03-21 13:50:32 +01:00
Travis Ralston f6e3437944 Update text in RoomUpgradeWarningBar to match suggestions 2019-03-15 16:08:35 -06:00
Travis Ralston 5cea8e846c
Merge pull request #2794 from matrix-org/travis/offline-members 
Fix CSS syntax errors preventing offline member opacity from working
 2019-03-15 08:46:56 -06:00
Bruno Windels dad382a4b7 use AutoHideScrollbar in memberlist 2019-03-15 10:16:21 +01:00
Travis Ralston e4181c4e3e Make the EntityTile chevron a masked SVG for theming 
Fixes https://github.com/vector-im/riot-web/issues/7320
 2019-03-14 15:59:00 -06:00
Travis Ralston 56620286b5 Fix CSS syntax errors preventing offline member opacity from working 
Fixes https://github.com/vector-im/riot-web/issues/9178
 2019-03-14 15:13:35 -06:00
J. Ryan Stinnett 45063cad4a
Merge pull request #2780 from jryans/auth-validation 
Initial portions of support for Field validation
 2019-03-14 10:19:21 +00:00
J. Ryan Stinnett a719839d9f Use a distinct color for selected autocomplete items 
This restores the ability to see which autocomplete item is selected (which
seems to have gotten lost during redesign).

Fixes https://github.com/vector-im/riot-web/issues/9134
 2019-03-12 14:51:37 +00:00
Matthew Hodgson 40f16fa310 adds validation for fields. 
* renames RoomTooltip to be a generic Tooltip (which it is)
 * hooks it into Field to show validation results
 * adds onValidate to Field to let Field instances call an arbitrary validation function

Rebased from @ara4n's https://github.com/matrix-org/matrix-react-sdk/pull/2550
by @jryans. Subsequent commits revise and adapt this work.
 2019-03-12 14:02:54 +00:00
Travis Ralston 241309ab83 Use CSS for hovering the tile 2019-03-07 14:55:17 -07:00
Bruno Windels 18d897298d ensure flair is 16px high 
so it doesn't push the message down
 2019-03-05 14:49:07 +01:00
Bruno Windels 69016e32a4 fix margin on e2e icon in member panel 2019-02-28 15:39:10 +01:00
J. Ryan Stinnett 4b340450b9 Rename Feather icon directory to `feather-customised` 
These icons are based on Feather as the original source, but they have various
tweaks applied, such as stroke width, color, etc. Hopefully the tweaked name
makes this more obvious in the future.
 2019-02-27 10:42:10 +00:00
J. Ryan Stinnett 3b3f0ea957 Move E2E icons out of feather dir 
They appear to all be created by Nad, according to
https://github.com/matrix-org/matrix-react-sdk/pull/2557.
 2019-02-26 20:31:32 +00:00
Nad Chishtie 88dfd3287f Normalise room list font weight and make bold when there are unreads. 2019-02-25 11:02:27 -07:00
Michael Telatynski fa5f1df194 Fix z ordering of the overflow tile 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-02-24 03:18:21 +00:00
Bruno Windels f11505a9de bring back user page 
Adds a UserView that contains a MainSplit with an empty div
and a RightPanel, preset to the given member.

UserView fetches the profile and creates a fake member, which
it passed on to the RightPanel.

this doesn't use the view_user action on purpose, to avoid any
interference of the UserView when trying to view a room member.
 2019-02-20 12:45:55 +01:00
J. Ryan Stinnett edf10dbdde
Merge pull request #2659 from jryans/dark-theme-more-2 
Dark theme follow ups round 2
 2019-02-19 17:51:29 +00:00
J. Ryan Stinnett e7a84b33e8
Merge pull request #2653 from matrix-org/benp/prevent-accidental-username-clicking 
make mx_SenderProfile inline-block, reduces clickable area around usernames
 2019-02-19 12:26:27 +00:00
J. Ryan Stinnett 5fb990eb5f Convert Markdown button to SVG mask 
This makes it easier to theme via CSS, which helps with the dark theme.
 2019-02-18 18:26:52 +00:00
J. Ryan Stinnett 09ed795c79 Allow theming member info minimise button 2019-02-18 16:02:10 +00:00
Travis Ralston 25525f93d2
Merge pull request #2655 from aaronraimist/fix-pre-dark 
Make pre use the same text color as code
 2019-02-16 11:36:26 -07:00
Aaron Raimist 9bc0ae7fc5
Add comment 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-02-16 12:28:42 -06:00
Travis Ralston b27f3688f1
Merge pull request #2649 from AndrewJDR/reinstate_lowered_opacity_for_offline_avatars 
Bring back the lowered opacity for offline/unavailable avatars.
 2019-02-15 22:42:25 -07:00
Aaron Raimist eb908dbd0d
Make pre use the same text color as code 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-02-15 21:38:49 -06:00
Ben Parsons 3f8ff77b7e make mx_SenderProfile inline-block, stops accidental name inserting 2019-02-15 15:55:16 +00:00
Bruno Windels d40da42268
Merge pull request #2647 from matrix-org/bwindels/e2eiconwholeeventhover 
highlight e2e icon on event when hovering whole event
 2019-02-15 15:26:20 +01:00
Bruno Windels c39c0e4834 fix for the ... button not being aligned for group invite tiles 2019-02-15 13:07:33 +01:00
Andrew Johnson 85930fca70 Bring back the lowered opacity for offline/unavailable avatars. 
At some point during the riot redesign, the bit of css that lowered the opacity for offline/unavailable contacts
was removed. This makes it impossible to discern presence for a contact unless you hover your cursor over their
avatar.

It's very handy to be able to see presence at a glance without any hovering, so this PR reintroduces the lowered opacity.
I've also slightly decreased the opacity level from 0.66 to 0.5 to make it slightly more noticable.
 2019-02-15 03:31:55 -08:00
Bruno Windels 840f3cede8 highlight e2e icon on event when hovering whole event 2019-02-14 18:04:15 +01:00
Bruno Windels 84b53faf9e make e2e icons on message transparent 2019-02-14 17:00:47 +01:00
J. Ryan Stinnett 5f6907c85e Improve gradients for Safari 2019-02-13 15:06:40 +00:00
J. Ryan Stinnett fb4fd54f6f Stop gradients at panel bg color 2019-02-13 13:48:56 +00:00
Matthew Hodgson 4c56b45a9f back out bold unread 2019-02-13 12:46:08 +00:00
Matthew Hodgson 8464155663 fix topic & room name alignment in header 2019-02-13 12:16:09 +00:00
J. Ryan Stinnett e6f9b7a109
Merge pull request #2619 from matrix-org/jryans/dark-theme-redesign 
Add redesigned dark theme
 2019-02-13 11:45:30 +00:00
Will Hunt c9e11050f2
Merge pull request #2610 from matrix-org/hs/weighting-for-rooname 
Fix mx_RoomTile_name weighting
 2019-02-13 11:24:05 +00:00
J. Ryan Stinnett 6c954dadc8 Allow theming message composer buttons 2019-02-13 10:47:04 +00:00
J. Ryan Stinnett 8652a094f3 Allow theming room header buttons 2019-02-13 10:47:04 +00:00
Bruno Windels 875f792728
Merge pull request #2620 from matrix-org/bwindels/e2eiconsanddialog 
Fixes and styling related to e2e icons and dialogs
 2019-02-13 09:18:58 +01:00
Bruno Windels 12b6383831
Merge pull request #2618 from matrix-org/bwindels/fixstickers 
Fix: stickers layout
 2019-02-13 09:17:21 +01:00
Will Hunt e2cecad535
Update _RoomTile.scss 2019-02-12 19:21:31 +00:00
Bruno Windels 4d3cc0a53f fix e2e icon top offset in compact mode 2019-02-12 19:14:46 +01:00
Bruno Windels 92668628ec fix sticker layout 2019-02-12 16:55:37 +01:00
Will Hunt 946a910692
Probably could reduce it to this? 2019-02-12 12:06:53 +00:00
Will Hunt 56bb6c870a
You are no longer needed 2019-02-12 12:06:23 +00:00
Bruno Windels 24cb46a991 should be on the left with animations so the animate class can clear it 2019-02-12 12:22:50 +01:00
Bruno Windels 229d905835 copyright 2019-02-12 12:21:40 +01:00
Bruno Windels 2315e4bfb4 add animation when adding a room 2019-02-12 12:16:56 +01:00
Bruno Windels 5efd92f3ec make rooms come in from left rather than the right 2019-02-12 11:26:46 +01:00
Bruno Windels aaea40a93d add breadcrumbs component 2019-02-12 11:04:25 +01:00
Will Hunt 4a46a3e4e0
Fix mx_RoomTile_name weighting 2019-02-11 13:54:52 +00:00
Will Hunt 119806bdbd
!important shouldn't have a space 
I wonder if this is making SCSS choke.
 2019-02-11 13:31:06 +00:00
David Baker 9b4a6cf442 Make prettier 2019-02-08 16:27:25 +00:00
Travis Ralston eac50aa800 Remove old user and room settings 
This takes out the old user and room settings, replacing the paths with the new dialog editions. The labs setting has been removed in order to support this change.

In addition to removing the old components outright, some older components which were only used by the settings pages have been removed. The exception is the ColorSettings component as it has a high chance of sticking around in the future.

Styles that were shared by the settings components have been broken out to dedicated sections, making it easier to remove the old styles entirely.

Some stability testing of the app has been performed to ensure the app still works, however given the scope of this change there is a possibility of some broken functionality.
 2019-02-04 13:40:21 -07:00
Bruno Windels 7ccc694eea minimal theming on app permission in widget 2019-02-01 23:24:56 +01:00
Bruno Windels e2ce12f5c1 wip 2019-02-01 23:15:14 +01:00
Bruno Windels ce5e56aaac update icons in member info device section 2019-02-01 17:32:46 +01:00
Bruno Windels 21fe266394 add icon to member info to indicate all devices of a user are trusted 2019-02-01 17:08:09 +01:00
Bruno Windels 88ad780b6b update message e2e icons 
also remove encrypted icon as header/composer already indicate encryption
 2019-02-01 16:43:12 +01:00
Bruno Windels 09c3391dd8 replace existing icon in composer with the new one 2019-02-01 13:40:42 +01:00
Bruno Windels f2928c184d create warning/verified icon to use in header/composer/member info 2019-02-01 13:39:56 +01:00
Bruno Windels f60cfe5cb2
Merge pull request #2545 from matrix-org/bwindels/missingavatarlayout 
layout composer independent of avatar being present
 2019-01-31 14:41:44 +00:00
Bruno Windels afed1b725d layout composer independent of avatar being present 2019-01-31 15:13:18 +01:00
Matthew Hodgson f658288f2b
Merge pull request #2543 from matrix-org/matthew/cyrillic 
Matthew/cyrillic
 2019-01-31 13:11:14 +01:00
Matthew Hodgson 47f775f579 apply correct weight on unread roomtiles 2019-01-31 13:10:11 +01:00
Matthew Hodgson 2fc6f89953 remove italics CSS skew 2019-01-31 11:51:26 +01:00
Bruno Windels c9900deebe center invite button caption 2019-01-30 16:24:25 +01:00
Bruno Windels 3a8e0aec48
Merge pull request #2533 from matrix-org/bwindels/avoidcomposerhscroll 
avoid horizontal scrollbar in composer when placeholder doesn't fit
 2019-01-30 12:35:10 +00:00
Bruno Windels 13b97ee332 avoid horizontal scrollbar in composer when placeholder doesn't fit 2019-01-30 12:53:15 +01:00
Bruno Windels 3f7f984536 also don't stretch buttons when text is larger 2019-01-30 11:23:31 +01:00
Bruno Windels 015c14237d stretch device label in member info if content doesn't fill it 2019-01-30 11:20:20 +01:00
Bruno Windels 7d6f551841 small makeover of member info panel 
this removes the style sharing between the verify buttons in the memberinfo panel and
and the encrypted event dialog because the diverge too much now.
 2019-01-29 21:14:16 +01:00
David Baker 2d61a2508d
Merge pull request #2514 from matrix-org/bwindels/roomlistjslayout-bis 
Redesign: new roomlist layout fixes
 2019-01-28 15:53:28 +00:00
Bruno Windels 79a44b1bfb always hide overflow on RoomList in case Layout screws up 2019-01-28 16:03:49 +01:00
Bruno Windels 55e0838c82
Merge pull request #2507 from matrix-org/bwindels/roomlistjslayout 
Redesign: new layout algorithm for room sublists.
 2019-01-28 14:55:31 +00:00
Bruno Windels a5297303b0 remove flexbox layout 2019-01-24 15:44:16 +01:00
Christopher Medlin be94e1aebc Fix integrations error popup 
Signed-off-by: Christopher Medlin <christopherjmedlin@protonmail.com>
 2019-01-22 11:44:55 -08:00
Bruno Windels 5dd5f4f1dc add JumpToBottomButtom component 2019-01-22 14:49:04 +01:00
J. Ryan Stinnett 20e296b20e Convert image URLs in React to `require` calls 
This allows Webpack to insert the proper image URL after builds steps like
adding a hash and so on. The path you supply to `require` is relative to the JS
source file, just like any other would be.
 2019-01-17 22:06:49 -06:00
J. Ryan Stinnett b2387f4cff Define SCSS variable for resource dir 
Adds a `$res` SCSS variable set to the path from the root SCSS file to the `res`
directory.

This is a different base path than previously used in CSS URLs (it goes up 3
directories instead of 2), because Webpack will now be resolving images relative
to the root SCSS file, so the path corresponds to a source tree location,
instead of a path in the build output tree.

Defining this variable has two main goals:

* URLs are a bit easier to read
* The path can be overridden, which is needed for external (riot-web) themes
 2019-01-17 22:06:49 -06:00
Bruno Windels 921906897f css url paths are relative to location of compiled file, not project structure 2019-01-17 13:49:52 +01:00
Bruno Windels 89b576936b
Merge pull request #2448 from matrix-org/bwindels/searchmakeover 
Redesign: search makeover
 2019-01-17 12:12:26 +00:00
Bruno Windels 8c30d05eb8 Revert "Merge pull request #2348 from matrix-org/bwindels/roomgridview-experimental" 
This reverts commit ece5cb1fcc, reversing
changes made to 64a3d2521c.
 2019-01-17 10:29:37 +01:00
Matthew Hodgson 1082f548d3 hack nunito italics for now with CSS skew 
fixes https://github.com/google/fonts/issues/1726
 2019-01-16 12:53:46 +00:00
Bruno Windels 899ee265e3 Merge branch 'experimental' into bwindels/searchmakeover 2019-01-16 11:17:38 +01:00
Bruno Windels b14d436e98 make cancel button icon slightly larger 2019-01-16 11:14:19 +01:00
J. Ryan Stinnett eae1e4c9aa Tweak custom status avatar ring 
Adjusts the appearance of the avatar ring to match the latest comps.

In addition, we now always render the surrounding button element, which
simplifies styling since the same size is now occupied both with and without the
feature.

This improves alignment between text in the composer and text in the message
history (https://github.com/vector-im/riot-web/issues/8111).
 2019-01-15 10:54:29 -06:00
J. Ryan Stinnett 7d6b996952 Tweak composer button padding so it won't affect status 2019-01-15 10:54:29 -06:00
Bruno Windels 77a62b9174 style search bar 2019-01-15 16:20:04 +01:00
Erik Johnston cbf9ff6aee Merge branch 'experimental' of github.com:matrix-org/matrix-react-sdk into erikj/state_counters 2019-01-10 16:56:47 +00:00
Bruno Windels ece5cb1fcc
Merge pull request #2348 from matrix-org/bwindels/roomgridview-experimental 
Tiled room UI
 2019-01-09 17:25:08 +00:00
J. Ryan Stinnett f60a865727 Restore room name ellipsis on overflow 
Fixes vector-im/riot-web#8037.
 2019-01-07 14:12:32 -06:00
Erik Johnston 9a5f17d0b1 Change CSS to match experimental 2019-01-07 15:21:00 +00:00
Erik Johnston 8a6e7382ae Missing newline 2019-01-07 13:52:13 +00:00
Erik Johnston 712241d710 Add simple state counters to room heading 2019-01-07 13:52:13 +00:00
Bruno Windels 290dc9d8fb Merge branch 'experimental' into bwindels/roomgridview-experimental 2019-01-07 14:17:57 +01:00
J. Ryan Stinnett a7c9d4ea1f Use same link style in HTML messages 
Links in HTML messages were missing the usual underline style, making them
look different from links in text messages (which already do this).

Fixes vector-im/riot-web#4655.
 2019-01-04 18:32:43 -06:00
Travis Ralston 93ea9d3617 Condense .mx_RoomTile_avatar properties 
Looks like the develop->experimental merge duplicated the definition. We'll take the best of both and make it work.
 2019-01-03 18:07:34 -07:00
Travis Ralston 51dc1fe9bf Fix badges on room tiles not being right aligned 
Thanks to Ryan for fixing this!

Problem: https://t2l.io/_matrix/media/v1/download/t2l.io/da6fccb60969da1c455630faae990881
 2019-01-03 18:05:59 -07:00
J. Ryan Stinnett 920911c0a1 Room list fixes for custom status 2019-01-03 18:49:15 -06:00
Travis Ralston 8017f0a4a1 Merge remote-tracking branch 'origin/experimental' into travis/develop-for-real 2019-01-03 16:00:23 -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
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
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
Travis Ralston a1347add95 Merge branch 'develop' into travis/custom-status 2018-12-19 10:33:34 -07: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
Travis Ralston ef60a34180 Clean up and follow code style 2018-12-18 10:53:37 -07: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 0496ed535c have a bit more space between rooms 2018-12-17 14:35:11 +01:00
Bruno Windels 242b0c21ac make avatar 24px and tile height 32px 2018-12-17 14:03:48 +01:00
Bruno Windels 6c1639b2ce dont hardcode avatar container dimensions 2018-12-17 14:03:28 +01:00
Bruno Windels 2afdb04db5 prevent jumping on when hovering over invited section 2018-12-14 17:05:01 +01:00
J. Ryan Stinnett 15366fbb0a Change room recovery reminder button style 
Change the button to a transparent background so that it's less prominent and
you focus on the primary button instead.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
 2018-12-13 16:36:55 +00:00
Bruno Windels f593bff3c3 show right panel tabs inside panel instead of room header in grid mode 2018-12-13 13:01:59 +01:00
Travis Ralston cd9ea2b2d7 Fix alignment of avatars and status messages 
also introduce the status message to the MemberInfo pane

Part of https://github.com/vector-im/riot-web/issues/1528
 2018-12-12 12:57:48 -07:00
Bruno Windels 9f5a0250bf
Merge pull request #2345 from matrix-org/bwindels/jumptofirstunread-rebased 
Redesign: restyle jump to first unread message & rework read marker logic (rebased)
 2018-12-12 10:13:51 +00:00
Travis Ralston ce7969e3d5 Display custom status messages in the UI 
Part of https://github.com/vector-im/riot-web/issues/1528
 2018-12-11 21:40:11 -07:00
Bruno Windels ac9902e52a apply redesign to topunreadmessagebar 
with placeholder for message count
 2018-12-11 15:43:00 +01:00
Bruno Windels d3f655a064 fix avatar in edit mode 2018-12-11 13:11:26 +01:00
Bruno Windels 93767fa5f1 fix invite button layout 2018-12-10 17:46:22 +01:00
J. Ryan Stinnett a92d2902c4 Add an in-room reminder to set up key recovery 
This adds an in-room reminder above the message timeline to set up Secure
Message Recovery so that your keys will be backed up. If you try to ignore it,
an additional dialog is shown to confirm.

Fixes vector-im/riot-web#7783.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
 2018-12-07 14:13:02 -06:00
Bruno Windels 8f4292399b
Merge pull request #2297 from matrix-org/bwindels/roomlistsizingimprovements 
Redesign: improve room sub list sizing & persist sizes
 2018-11-27 13:40:48 +00:00
Bruno Windels 887defda9c temp solution to make room settings usable 
make mx_fadable not do anything anymore, and make room settings
full size.

Room settings haven't been designed yet, so all of this will
have a full pass when we have a go at it.
 2018-11-26 17:58:51 +01:00
Bruno Windels 257bac2b09 unrelated fix for searchbox being squashed by other roomlist content 2018-11-26 14:50:53 +01:00
Bruno Windels 67e0030ccd Merge branch 'develop' into experimental 2018-11-26 13:10:29 +01:00
Bruno Windels 36bc83ce03 copyright 2018-11-14 10:05:53 +01:00
Bruno Windels 741e106565 update animation image and location 2018-11-13 18:30:14 +01:00
Bruno Windels ffc73c59b4 make padding and DOM more like event tile 2018-11-13 09:15:43 +01:00
Bruno Windels 20b8994714 simplify DOM and style to design 2018-11-12 18:19:18 +01:00
Bruno Windels 7df47cbc87 move typing notifications to WhoIsTypingTile, shown in ScrollPanel 2018-11-12 16:09:51 +01:00
J. Ryan Stinnett 13039b05b9 Align buttons in encrypted event dialog 
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
 2018-11-08 17:17:57 +01:00
Bruno Windels 883126a528 Merge branch 'experimental' into bwindels/memberqueryfield 2018-11-07 13:29:28 +01:00
Bruno Windels 9e95a1402c
Merge pull request #2269 from matrix-org/bwindels/roomlistpolish 
Redesign: room list visual polish
 2018-11-07 11:44:47 +00:00
Bruno Windels 4e773c2665 Make right panel a dark-panel instead of every descendant. 
Also move bg color central.
 2018-11-06 14:47:58 +01:00
Bruno Windels 92e43ea181 move filter member field to bottom of memberlist 
reorganize styles as well
 2018-11-06 14:47:11 +01:00
Bruno Windels 3ce52d104c align collapsed roomtile with design 2018-11-06 14:02:43 +01:00
Bruno Windels c9dc273cb0 better native scrollbar width compensation for FF 
instead of having to offset the padding of children of the
autohiding scrollbar container, which gets fiddly quickly,
add a new child to the scrollbar container that gets a negative
margin of the scrollbar width when needed
(on hover and overflowing when overlay is not supported).

This needs an extra DOM element, but as it doesn't do anything weird
layout-wise (like set position), it shouldn't affect styling at all.

It also makes the auto hide scrollbar workarounds completely transparent
to the rest of the code.
 2018-11-06 11:37:49 +01:00
Bruno Windels 3c70c2b82f not needed 2018-11-05 17:43:16 +01:00
Bruno Windels fd0b33edaf margin adjusment of room tile according to design 2018-11-05 17:42:59 +01:00
Bruno Windels ef26189add add dedicated menu button to room tile with new design 2018-11-05 17:42:25 +01:00
Bruno Windels c0becc7664 fix roomtile badge 
only put it in the dom if it has
anything to show as it has a border now in collapsed mode
 2018-11-05 14:24:12 +01:00
Bruno Windels 010f077092 align badges with design 2018-11-05 10:35:38 +01:00
Bruno Windels 064662380f support search icon in mx_textinput, use in memberlist 2018-11-05 09:35:27 +01:00
Bruno Windels 06cc7a493d
Merge pull request #2262 from matrix-org/bwindels/biggerresizehandles 
Redesign: increase interaction rectangle of resize handles
 2018-11-02 14:12:49 +00:00
Bruno Windels 9546df609e
Merge pull request #2260 from matrix-org/bwindels/rightpanelbelowheader 
Redesign: move right panel below room/group header
 2018-11-02 14:12:24 +00:00
Bruno Windels 3e02f247c8 use AutoHideScrollbar in RoomSubList 2018-11-01 17:33:21 +01:00
Bruno Windels 24d9e8e168 use padding and negative margin for all resize handles 
this way they only take 1px for layout but have a interaction
target of 11px wide
 2018-10-31 16:52:36 +01:00
Bruno Windels b4dd739771 Merge branch 'experimental' into bwindels/rightpanelbelowheader 2018-10-31 14:57:16 +01:00
Bruno Windels ba83166661 Merge branch 'develop' into experimental 2018-10-31 14:54:22 +01:00
Bruno Windels a40f1933f2 put RightPanel as sibling of .mx_RoomView_body instead of RoomView 2018-10-30 18:13:17 +01:00
Bruno Windels e80a1c5051 move room/group panel header buttons into room/group header 2018-10-30 17:15:19 +01:00
Bruno Windels 4972b1ba7c move aux panel into room body 
to put a resize handle between the body and the right panel later on
 2018-10-30 13:25:06 +01:00
Michael Telatynski d54bf13fab Hide all the time travel. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-10-27 11:06:52 +01:00
Bruno Windels 2c039483c6 Merge branch 'develop' into experimental 2018-10-26 15:33:39 +02:00
David Baker adee0fdcef
Merge pull request #2248 from matrix-org/bwindels/memberpanel 
Redesign: basic makeover of member info panel
 2018-10-25 14:52:54 +01:00
Bruno Windels 3096bf42ef fix css in chrome 2018-10-25 15:20:51 +02:00
Will Hunt 44a41b589d Comma on strings and styling button 2018-10-24 17:50:27 +01:00
Bruno Windels e4dfb90b85 basic makeover of member panel with big avatar 2018-10-24 18:23:34 +02:00
Bruno Windels 873ff7fc29 make EntityTile responsive 2018-10-24 18:22:57 +02:00
Bruno Windels 302b3ad0e9 disable presence opacity 2018-10-24 14:56:21 +02:00
Bruno Windels 25b55b2801
Merge pull request #2245 from matrix-org/bwindels/memberlistmakeover 
Redesign: memberlist basic makeover
 2018-10-24 12:23:30 +00:00
Bruno Windels fed72c2368
Merge pull request #2246 from matrix-org/bwindels/roomlistfontsizes 
Redesign: tweak room list font sizes
 2018-10-24 12:23:18 +00:00
Bruno Windels 0038d6d219
Merge pull request #2234 from matrix-org/bwindels/roomsectionfixcollapsedsize 
Redesign: Fix room lists sizing
 2018-10-24 12:23:05 +00:00
Bruno Windels 9299d84a13 tweak room list font sizes 2018-10-24 14:03:16 +02:00
Bruno Windels 8c62dddb32 one big commit, sorry 
changing looks of input & buttons
changing background color of right panels
moving invite button around
change margins and paddings in memberlist
 2018-10-24 13:50:58 +02:00
Bruno Windels 5425eda438
Merge pull request #2241 from matrix-org/bwindels/redesignicons1 
Redesign: update (most) icons
 2018-10-23 19:40:59 +00:00
Bruno Windels e479c72e3c Merge branch 'experimental' into bwindels/roomheader1 2018-10-23 21:39:13 +02:00
Bruno Windels 466062e872
Merge pull request #2239 from matrix-org/bwindels/topleftmenu1 
Redesign: 1st go at top left menu & restyling context menus
 2018-10-23 19:37:05 +00:00
Bruno Windels 88df3d2a81
Merge pull request #2238 from matrix-org/bwindels/initialtimelinetweaks 
Redesign: Initial timeline tweaks
 2018-10-23 19:36:19 +00:00
Bruno Windels eb453f4539 make icons in composer smaller, better spacing 2018-10-23 18:11:15 +02:00
Bruno Windels 18fedb23ec fix basic room header layout 
make room name take as much space as it needs (but not more than width)
put all items apart from right buttons in one flex container
 so name and topic can grow as required
more small tweaks
 2018-10-23 16:57:56 +02:00
Bruno Windels eba91d3edc initial restyle of context menus with drop shadow 2018-10-23 15:23:59 +02:00
Bruno Windels f2efbc15f4 apply color categories to sender profile name 2018-10-23 10:49:44 +02:00
Bruno Windels bf6486ac4f align avatar in room header with avatars in timeline 
(equally not part of design but making it prettier for now)
 2018-10-23 09:34:08 +02:00
Bruno Windels f3ae9fe981 align avatar in composer with avatar in timeline 
not part of design but temporarily make it prettier
 2018-10-23 09:33:35 +02:00
Travis Ralston f2cac45543 Merge branch 'develop' into travis/fix-group-members 2018-10-22 15:02:01 -06:00
Bruno Windels 59fe5ee91f make text on room tile with highlight or notifitications black 2018-10-22 18:18:08 +02:00
Bruno Windels 3d5395e784 tweak paddings and margins on room tile 2018-10-22 18:17:51 +02:00
Bruno Windels 91a2ee1779 tweak badges 2018-10-22 18:16:36 +02:00
Bruno Windels 15059fe005 make sure the room list doesn't grow taller than viewport 
by setting the min-height to 0 at every flex level,
since by default it's auto which means grow as tall as you need
to make the content fit.
 2018-10-22 15:55:29 +02:00
Bruno Windels d1bab6cc35 tweak resize handle in room list 
only show a 1 px line but with a 9px interaction target
apply darker color from design
 2018-10-22 11:19:42 +02:00
Bruno Windels 7c64d9637e hide resize handles next to collaped/empty sublists 2018-10-19 18:18:45 +02:00
Bruno Windels d264687796 don't scroll sub list header 2018-10-18 16:25:22 +02:00
Bruno Windels c1e602d56f scrollbars and resize handles around room sub lists 2018-10-18 15:19:45 +02:00
Travis Ralston af8dfda9a7 Add a bit of text to explain the purpose of the RoomPreviewSpinner 
Fixes https://github.com/vector-im/riot-web/issues/5869
 2018-10-17 13:53:12 -06:00
Travis Ralston 8668faa6b0 Show the group member list again 
Fixes https://github.com/vector-im/riot-web/issues/7511
 2018-10-16 19:14:06 -06:00
Bruno Windels 8fa22d620a align badge and make it non-flex when collapsed 2018-10-16 14:54:30 +02:00
Bruno Windels 99bf6b0e32 put dm icon back in it's correct location 2018-10-16 14:53:44 +02:00
Bruno Windels 313956dd99 make left panel adapt to width 
includes using flexbox in the room tile to avoid hardcoded width
 2018-09-24 16:06:57 +01:00
Bruno Windels 91ec96c8d3 Merge branch 'develop' into bwindels/redesign 2018-09-21 12:44:44 +02:00
David Baker 2c1ba6f104
Merge pull request #2124 from matrix-org/dbkr/tombstone 
Support m.room.tombstone events
 2018-08-29 18:38:48 +01:00
David Baker 42bb8e4ebd Add image dimensions 2018-08-21 17:57:15 +01:00
David Baker 7f8cd203a8 Support m.room.tombstone events 
For https://github.com/vector-im/riot-web/issues/7164
 2018-08-21 15:56:56 +01:00
David Baker 9f19896df0 Support for room upgrades 
* Show when a room upgrade is needed
 * Dialog box to perform the upgrade
 2018-08-17 14:54:43 +01:00
Matthew Hodgson 9783b6100d Merge branch 'develop' into matthew/dharma 2018-07-29 17:03:23 +01:00
Michael Telatynski afa19cd60d
make clicking autocomplete suggestions work again 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-24 13:48:05 +01:00
David Baker 4f8ece53b2 Fix CSS naming 2018-07-23 15:58:07 +01:00
David Baker 5adcd673ab Fix persisent apps being the wrong size 2018-07-23 15:08:17 +01:00
Bruno Windels 6f278ceab0
Merge pull request #2071 from matrix-org/dbkr/persistedelement_border 
Fix border around persisted widgets
 2018-07-20 12:23:02 +01:00
David Baker f658753610 Fix e2e icons floating above jitsi 
Remove another seemingly redundant z-index

Fixes https://github.com/vector-im/riot-web/issues/7056
 2018-07-18 14:14:38 +01:00
David Baker f868cd6699 Fix border around persisted widgets 
The PersistedElement had zero height so the border ended up in the
wrong place. Add a wrapper to fix the height back.

Fixes https://github.com/vector-im/riot-web/issues/7030
Fixes https://github.com/vector-im/riot-web/issues/7029
 2018-07-18 11:52:57 +01:00
Bruno Windels 349615c5c1
Merge pull request #2065 from matrix-org/dbkr/read_avatars_under_jitsi 
Fix read receipts on top of Jitsi
 2018-07-17 17:37:13 +01:00
David Baker a79caed0c9 Merge remote-tracking branch 'origin/develop' into dbkr/tiny_jitsi_follows_you_between_rooms 2018-07-16 17:21:51 +01:00
David Baker 74ad795d4a Fix read receipts on top of Jitsi 
By removing z-index which, as far as I can see, does nothing.

Fixes https://github.com/vector-im/riot-web/issues/7021
 2018-07-16 17:10:58 +01:00
David Baker d16ac4d80c
Merge pull request #1890 from matrix-org/matthew/slate 
Replace Draft with Slate
 2018-07-16 14:16:25 +01:00
David Baker e56feea9ec Put always-on-screen widgets in top left 
always-on-screen widgets now appear in the top-left where the
call preview normally is if you're not in the room that they're in.

Fixes https://github.com/vector-im/riot-web/issues/7007
Based off https://github.com/matrix-org/matrix-react-sdk/pull/2053
 2018-07-12 18:43:49 +01:00
David Baker 8f10ee01c6 Implement always-on-screen capability for widgets 
As per https://github.com/matrix-org/matrix-doc/issues/1354

This is whitelisted to only jitsi widgets for now as per comment,
mostly because any widget that we may make always-on-screen we need
to preemptively put in a PersistedElement container, which is
unnecessary for any other widget.

Apologies that this does a bunch of refactoring which could have
been split out separately: I only discovered what needed to be
refactored in the process of doing this.

Fixes https://github.com/vector-im/riot-web/issues/6984
 2018-07-11 18:07:32 +01:00
Matthew Hodgson efdc5430d7 merge develop 2018-07-09 17:50:07 +01:00
Luke Barnard 6345fcb8f2 Fix incorrectly positioned copy button on `<pre>` blocks 2018-06-27 11:31:55 +01:00
Michael Telatynski f7dfba417c
Revert "affix copyButton so that it doesn't get scrolled horizontally" 2018-06-25 16:31:43 +01:00
Michael Telatynski e1ba6949d0
expand composer input focus region and apply cursor:text to it 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-23 16:40:53 +01:00
Michael Telatynski 01a6b7f77f
affix copyButton so that it doesn't get scrolled horizontally 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-16 10:27:42 +01:00
Michael Telatynski a257dc27c5
move css rule to be more generic; remove overriden rule 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-13 19:08:24 +01:00
Travis Ralston 53396ff38d Show timestamp of pinned messages on hover 
Addresses part of https://github.com/vector-im/riot-web/issues/5405

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-26 19:46:11 -06:00
Travis Ralston 033c41a2a8 Align pinned message contents and reduce image size 
Fixes https://github.com/vector-im/riot-web/issues/5421

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-26 18:40:48 -06:00
Travis Ralston 62f4cfe734 Don't affect avatars in pinned message contents 
This uses more direct classes to avoid affecting pills. Fixes https://github.com/vector-im/riot-web/issues/5438

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-26 18:21:24 -06:00
Travis Ralston ed9e4d82c9 Reduce the text size on the 'Jump to pinned message' button 
Fixes https://github.com/vector-im/riot-web/issues/6329

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-26 18:16:19 -06:00
Matthew Hodgson 30bb7eeeae tweaks from pairing with @dharmaone 2018-05-26 00:07:39 +01:00
Matthew Hodgson 715632ff9c fix header weight 2018-05-25 03:19:19 +01:00
Matthew Hodgson 3bf28a08ec experiments in dharma 2018-05-25 03:17:29 +01:00
Matthew Hodgson 6ac2324874 fix wordwrap and pre formatting 2018-05-23 01:43:03 +01:00
Matthew Hodgson 117519566e remove HRs from H1/H2s 2018-05-19 23:40:48 +01:00
Matthew Hodgson 167742d900 make RTE sending work 2018-05-19 20:28:38 +01:00
Matthew Hodgson 721410b710 Merge branch 'develop' into matthew/slate 2018-05-13 19:50:55 +01:00
Luke Barnard fee480289c Use correct CSS selector in message composer 
to stop any last div from having its right-padding removed
 2018-05-11 18:17:39 +01:00
Luke Barnard 6500797d2a Use correct CSS selector in message composer 
to stop any last div from having its right-padding removed
 2018-05-11 14:49:50 +01:00
Luke Barnard 770e2d400e Improve appearance of short-lived app loading spinner 
by hiding it for 500ms - thereby only showing it if the loading is
taking a long time.
 2018-05-09 17:28:41 +01:00
Luke Barnard 0c1846630c Improve appearance of short-lived app loading spinner 
by hiding it for 500ms - thereby only showing it if the loading is
taking a long time.
 2018-05-09 16:54:01 +01:00
Matthew Hodgson 8b2eb2c400 make history work again 2018-05-08 01:54:06 +01:00
Matthew Hodgson a2233a48c2 stub out yet more 2018-05-06 01:18:26 +01:00
Michael Telatynski f2102e283c
Merge branches 'develop' and 't3chguy/m.relates_to' of github.com:matrix-org/matrix-react-sdk into t3chguy/m.relates_to 2018-05-02 13:08:38 +01:00
Eric Newport e037cf0063 namespace CSS better and fix bug 2018-04-30 12:22:16 -04:00
Eric Newport 55566b35a2 convert attribute to class 2018-04-28 12:39:25 -04:00
Michael Telatynski 71acf87c04
Add comments to _EventTile.scss 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-27 11:13:09 +01:00
Eric Newport d42fa9d17a Hide inline encryption icons except when hovering over a message 
Closes https://github.com/vector-im/riot-web/issues/2882

This is a redo of https://github.com/matrix-org/matrix-react-sdk/pull/1707 (see associated discussion there and here: https://github.com/vector-im/riot-web/pull/5988)

I tried several times to resolve the conflicts correctly, but could not. Thus, fresh PR.
 2018-04-22 22:30:37 -04:00
Michael Telatynski 563fc9adc7
fix bad copy-paste from other diff 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-20 09:37:25 +01:00
Michael Telatynski 06408f843b
post BigMerge fixup - merge in stuff from riot-web PR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-04-20 09:23:27 +01:00
Matthew Hodgson 79d3cca6e9 move components' CSS to be in the same repo as their JS 2018-04-12 00:23:58 +01:00