Commit Graph

3722 Commits (6d354e3e10b5c5abfe590e1459d8305c3b38cedf)

Author SHA1 Message Date
Travis Ralston 7dd610b41e
Merge pull request #2235 from MaxwellKepler/develop
Added badge to non-autoplay GIFs
2018-11-16 13:25:40 -07:00
Travis Ralston 8916c90fed Make the 'Accept' button for consent a little more friendly
Part of https://github.com/vector-im/riot-web/issues/7700
2018-11-15 20:26:37 -07:00
Travis Ralston c8b38606cc Fix terms auth continue button CSS 2018-11-14 18:40:00 -07:00
Travis Ralston 2ffc024fab Add a dedicated "Continue" button to the terms auth stage
The button itself is conditionally enabled because the ILAG dialog already has a continue button. It'd be confusing to users to have 2 continue buttons on the same dialog, so this commit adds the structure required to pass along clicks from the dialog's button down to the UI auth component. 

The other place the continue button would appear is on the register page (not ILAG). The button's style is different here, however that will be improved in a later commit. 

Part of https://github.com/vector-im/riot-web/issues/7700
2018-11-14 18:26:35 -07: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 b9ccdc4952 Align encrypted event buttons in Safari
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-11-08 20:38:16 +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
David Baker 8ac62f8c12 Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups 2018-10-29 16:20:45 +00:00
David Baker 04ed61ec4e
Merge pull request #2257 from matrix-org/t3chguy/view_community_context_menu
click-through svg on tag tile context menu to make it less weird
2018-10-29 11:37:56 +00:00
Michael Telatynski 8a3824b9ca click-through svg on tag tile context menu to make it less weird
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-10-27 11:27:43 +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
J. Ryan Stinnett 2dc335798d Repair DevTools button padding by centralizing styles
This moves the padding styles for dialog content to the .mx_Dialog rule. In
addition, it fixes vector-im/riot-web#7548 where the DevTools buttons had double
padding.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
2018-10-26 14:15:46 +02:00
David Baker b59b8b7fca Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups 2018-10-25 17:42:46 +01: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
Maxwell Kepler 5d35ce9449 Changed letter case. 2018-10-24 19:06:48 +01: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 b7ab207778 move sendername colors to theme 2018-10-23 15:48:44 +02:00
Bruno Windels 4b90fd5c11 move TopLeftMenu to context_menus folder 2018-10-23 15:42:28 +02:00
Bruno Windels eba91d3edc initial restyle of context menus with drop shadow 2018-10-23 15:23:59 +02:00
Bruno Windels 3f6175527c move menu padding from wrapper so menu can have full-width elements 2018-10-23 15:22:41 +02:00
Bruno Windels f2efbc15f4 apply color categories to sender profile name 2018-10-23 10:49:44 +02:00
Bruno Windels 2a264f36b7 style date separator 2018-10-23 10:25:04 +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
Maxwell Kepler 54f9231582 Added badge to GIFs (https://github.com/vector-im/riot-web/issues/7344) 2018-10-22 20:57:58 +01: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
David Baker 9976c4eba5
Merge pull request #2231 from matrix-org/travis/dialog-buttons
Move all dialog buttons to the right and fix their order
2018-10-22 15:00:35 +01: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
Travis Ralston 9582c1e65a Move all dialog buttons to the right and fix their order
Fixes https://github.com/vector-im/riot-web/issues/5689

Some dialogs had their own CSS that prevented the buttons from being placed in the right spot. This has been fixed by using a generic standard for the buttons. The only strange dialog that needed more CSS was the devtools dialog due to the header.

Not all dialogs have been checked - I spot-checked about half of them and verified the CSS manually on an established account. It's hard to get at all the dialogs without convoluted testing.
2018-10-19 15:33:23 -06:00
Bruno Windels 7c64d9637e hide resize handles next to collaped/empty sublists 2018-10-19 18:18:45 +02:00
Bruno Windels bbd50e75ee disable old style of showing focus for now 2018-10-19 12:10:37 +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 e5d1b3328c make resize handles have correct color + bidirectional cursor 2018-10-11 15:35:17 +02:00
Bruno Windels 928b6d47c8 add resize handles between 3 main app columns 2018-09-24 16:07:42 +01: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 f507aac3d5 Show if recovery key is valid 2018-09-17 17:05:29 +01:00
David Baker d94553bafc UI for whether the key backup is enabled or not 2018-09-14 17:08:02 +01:00
David Baker 292b1f09af WIP e2e key backups
Continues from Matthew's work: adds a feature flag & panel in
user settings to create a backup.

Can't restore a backup yet, nor even continue backing up to the same
backup after a refresh.
2018-09-13 17:11:46 +01: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 c40ac49b2a Merge remote-tracking branch 'origin/develop' into dbkr/roomcreate 2018-08-29 18:18:08 +01:00
David Baker 42bb8e4ebd Add image dimensions 2018-08-21 17:57:15 +01:00
David Baker cd4b520574 Add image dimensions
To avoid popping when the image loads & make sure the SVG appears
the right size
2018-08-21 17:52:13 +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 ab10b5493b Support room creation events
For https://github.com/vector-im/riot-web/issues/7164
2018-08-20 16:20:59 +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
David Baker 6593ee09d1 Warning bar for MAU limit hit
Somewhat untested, sorry
2018-08-07 17:04:37 +01:00
Matthew Hodgson 4fbf34e05b Merge branch 'develop' into matthew/dharma 2018-08-03 17:15:00 -07:00
David Baker b5d2fa769c Support MAU error on sync
For https://github.com/vector-im/riot-web/issues/7091
2018-08-03 14:54:52 +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
Michael Telatynski 7225f7372c
Revert " make click to insert nick work on join/parts, /me's etc" 2018-07-03 10:30:08 +01:00
Michael Telatynski 2c537a8dff
update styling
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-29 15:28:36 +01:00
Michael Telatynski 6021c3a634
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/click_username_state_ev 2018-06-29 14:56:18 +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 32ab997230
properly style Group Pill
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-22 14:38:06 +01:00
Michael Telatynski c1e608f1a8
show permalinks to communities as Pills
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-19 11:53:17 +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
David Baker 6904c2bafe
Merge pull request #1948 from matrix-org/export_Group
Share Dialog
2018-06-15 10:52:27 +01:00
Michael Telatynski 7de7275c6d
remove subheadings in ShareDialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-14 18:56:46 +01:00
Luke Barnard 7029e9ac74
Merge pull request #1912 from matrix-org/luke/kill-mimage-fixupheight
Implement slightly magical CSS soln. to thumbnail sizing
2018-06-14 11:17:15 +01:00
David Baker 742a2d0111
Merge pull request #1962 from matrix-org/t3chguy/codeblock_notice
move css rule to be more generic; remove overriden rule
2018-06-14 10:57:58 +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
Michael Telatynski 22bec0d67d
allow CreateRoom to scale properly horizontally
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-13 09:13:32 +01:00
Michael Telatynski e3c455e599
Style the ShareDialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-12 11:22:01 +01:00
Luke Barnard 2120858e5f
Merge branch 'develop' into luke/kill-mimage-fixupheight 2018-06-11 14:24:40 +01:00
Michael Telatynski c91e6cb530
make click to insert nick work on join/parts, /me's etc
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-06-07 01:02:34 +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
Richard Lewis 6288e9bc08
Merge pull request #1923 from matrix-org/rxl881/devTools
Make devTools styling more consistent and easier to edit event data.
2018-05-24 18:10:59 +01:00
Luke Barnard dca1217a45 Change wording and appearance of Deactivate Account dialog 2018-05-24 11:50:45 +01:00
Richard Lewis 7da51f2bd4 Remove max-width restriction (no longer makes sense). 2018-05-23 18:40:48 +01:00
Richard Lewis 7db31835b4 Remove unused / misspelt class. 2018-05-23 18:24:52 +01:00
Richard Lewis 2a9859c7b6 Styling for consistency. 2018-05-23 17:40:15 +01:00
Richard Lewis 9f9cde12ce Make devTools styling more consistent and easier to edit event data. 2018-05-23 17:18:33 +01:00
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