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

1928 Commits (fd427b7aebe39c3a477418a42e1931ec482ee1e4)

Author SHA1 Message Date
Matthew Hodgson 6ac2324874 fix wordwrap and pre formatting 2018-05-23 01:43:03 +01:00
Luke Barnard 836dc8b0ef Factor out all shared logic between MStickerBody and MImageBody 
The benefits of this:
 - One code path for determining spinner/placeholder and it's position
   for loading images/stickers. This includes spinner used in e2e
   decryption of images.
 - Very small definition for MStickerBody, only overriding the minimal
   differences is has from MImageBody.

The disadvantages:
 - Slightly more complicated MImageBody, but hopefully not less
   readable.
 2018-05-21 16:59:13 +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
Luke Barnard 015093b371 Move inline style to stylesheet 2018-05-18 11:34:41 +01:00
Luke Barnard 6699c4faed Spelling/grammar 2018-05-18 11:29:30 +01:00
Luke Barnard 7e7e2a7473 Add more comments to explain thumbnail sizing 2018-05-18 10:27:22 +01:00
Luke Barnard b28ed6075b Implement slightly hacky CSS soln. to thumbnail sizing 
As the slightly nicer alternative to fixupHeight being applied once
we actually have a timelineWidth.

The niceness comes from not needing timelineWidth, which means we can
implement at render time with CSS. (Despite still calculating aspect
ratios when we render.)
 2018-05-17 18:15:34 +01:00
Matthew Hodgson b60ccad29b Merge branch 'develop' into matthew/slate 2018-05-15 01:00:07 +01:00
Luke Barnard 21ec34d4ba
Merge pull request #1882 from matrix-org/t3chguy/m.relates_to 
Remove margins when in a ReplyThread to stop them taking so much space
 2018-05-14 11:22:06 +01:00
Matthew Hodgson c1000a7cd5 emojioneify the composer 
and also fix up the selectedness CSS for pills and emoji
 2018-05-14 03:02:12 +01:00
Matthew Hodgson 721410b710 Merge branch 'develop' into matthew/slate 2018-05-13 19:50:55 +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 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
Michael Telatynski ee0e6c5913
Remove margins when in a ReplyThread to stop them taking so much space 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-09 11:53:37 +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
Luke Barnard 22047d7e72
Merge pull request #1845 from kethinov/hide_encryption_icons 
Hide inline encryption icons except when hovering over a message
 2018-04-30 17:57:22 +01:00
Eric Newport e037cf0063 namespace CSS better and fix bug 2018-04-30 12:22:16 -04:00
Matthew Hodgson 45c0c0eddd add CSS destroyed by stickerpacks 
fixing mangling from 9fc7435ea2 (diff-be2f1d72c9704840ceddf019c825e825)
and 38efebb8d3 (diff-be2f1d72c9704840ceddf019c825e825)

also fixes https://github.com/vector-im/riot-web/issues/6492
 2018-04-29 04:50:44 +01: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 32dd7f976f merge vector-im/riot-web#5881 into matrix-react-sdk 2018-04-16 00:04:04 +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