6c19504c8b
Merge branch 'wmwragg/mention-state-indicator-round-3' into wmwragg/mention-state-menu
...
# resolved Conflicts:
# src/skins/vector/css/vector-web/views/rooms/RoomTooltip.css
2016-07-25 16:45:25 +01:00
497ebce88a
Corrected vertical alignment of membership button
2016-07-25 13:16:51 +01:00
2768cd2010
Initial unstyled mentions state notifier context menu
2016-07-22 17:30:09 +01:00
204e42494a
The default props doesn't seem to be working, hardcoded 'LABEL' for now. OnClick closes menu
2016-07-22 16:11:42 +01:00
72b4a86eed
Tweaked the tooltip to be better aligned. Also added the fading of the room name if too long
2016-07-22 14:59:02 +01:00
ce5311191f
Tweaked tooltip z-index
2016-07-22 11:30:41 +01:00
7eff6d968e
Tweak to z-index as the tooltip was occasionally getting occluded.
2016-07-22 11:16:04 +01:00
24e021b91f
Badge dohickey shown on name hover and badge hover
2016-07-21 18:19:52 +01:00
e988f5ca3b
Badge visual tweaks
2016-07-21 17:54:33 +01:00
633a3f4867
New component for testing
2016-07-21 17:44:05 +01:00
df163d8cb7
Clean up of the CSS, and refactor to better match current code
2016-07-21 14:33:27 +01:00
73bb317925
Slight tweak to the name padding so there is a little less space above and below the name
2016-07-21 12:19:11 +01:00
ad74d264a3
Selected room highlight teaked to better fit previous design
2016-07-21 11:37:40 +01:00
e9db975d7d
Redone assets, with lighter weight to match design
2016-07-21 10:25:42 +01:00
f3586a79c2
Final CSS tweaks for the hover and collapsed states
2016-07-20 17:10:23 +01:00
882d09bf85
Initial reworking of the RoomTile CSS
2016-07-20 12:46:44 +01:00
25eb2e2daf
Merge pull request #1822 from vector-im/wmwragg/spinner-fix
...
Wmwragg/spinner fix
2016-07-19 12:54:15 +01:00
d8d9912f2d
Merge pull request #1823 from vector-im/wmwragg/mention-state-indicator
...
Wmwragg/mention state indicator
2016-07-19 12:19:36 +01:00
8a28da1986
Fixed white space issues
2016-07-19 12:13:29 +01:00
384425582a
Fixed wonky white space
2016-07-19 11:47:32 +01:00
b87b356722
Added fixed SCG assets
2016-07-19 11:43:15 +01:00
6ae0dda9d3
give FF higher billing
2016-07-18 18:26:03 +01:00
6c680ff424
improve spacing
2016-07-18 18:25:50 +01:00
c6b455f470
improve spacing
2016-07-18 18:24:30 +01:00
f6d7052928
Oixel tweak so that it work properly in firefox
2016-07-18 16:38:29 +01:00
2ee1a9c440
Explanatory text about specificity
2016-07-18 16:20:44 +01:00
8fd12d530d
Added the hightlight badge restyling
2016-07-18 14:57:03 +01:00
3f7bd48c0a
Made the collapsed badge smaller than the uncollapsed one, basically the same size as it was originally
2016-07-18 14:27:14 +01:00
28108476bd
Added an overide for the view source so that it behaves correctly with the new Modal. Also tweaked the spinner overide
2016-07-18 10:31:17 +01:00
722cedc92e
CSS for generic user settings at last
2016-07-18 01:33:43 +01:00
f182e32e3d
typo
2016-07-18 01:33:36 +01:00
3cfcc13387
Initial fix for Dialog Spinners
2016-07-17 21:20:11 +01:00
953bb64e0b
Some quick initial tweaks to the badge icon
2016-07-17 21:18:47 +01:00
54f4443428
fix single emoji sizing
2016-07-17 18:30:06 +01:00
1e963a6c3a
Revert "Presentation for inline link"
2016-07-15 16:54:27 +01:00
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
cd865bbe8f
Merge pull request #1806 from vector-im/wmwragg/modal-restyle
...
Wmwragg/modal restyle
2016-07-15 15:01:01 +01:00
e668d7685d
Fixed light box colour, reset back to black.
2016-07-15 14:54:15 +01:00
6607bee91a
Merge pull request #1799 from ribot/feature-inline-link-preview
...
Presentation for inline link
2016-07-15 13:51:54 +01:00
3a89a5af0b
Increasing the specificity of the CSS so that primary input submit buttons are styled correctly
2016-07-15 12:33:56 +01:00
35e3621ae7
removes overflow comments
2016-07-15 12:21:05 +01:00
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
74c9ac0872
Merge pull request #1798 from vector-im/dbkr/offline_user_colour
...
CSS for offline user colours
2016-07-14 18:29:28 +01:00
adbad509f4
Updated to highlight the primary button in the dialog, i.e. the first one
2016-07-14 17:59:06 +01:00
15a97a653f
CSS for offline user colours
2016-07-14 17:43:43 +01:00
9fb97a6b10
presentation for inline link
2016-07-14 17:08:25 +01:00
579f210cfc
Initial Modal dialog restyling
2016-07-14 16:55:41 +01:00
2fb1e156ed
Modal background restyled
2016-07-14 15:41:23 +01:00
707ddc61bf
Mergeing up from develop
2016-07-14 12:43:25 +01:00
09e861637f
Simplification of the css
2016-07-14 12:04:31 +01:00
1f43f904d5
Search icon updated in header, and all icons spacing and positioning teaked
2016-07-14 11:33:07 +01:00
e1779ca8bc
Deleteing .DS_Store files before adding to gitignore
2016-07-14 10:41:41 +01:00
a4dc844338
Added truetype font fallback for browsers that don't support WOFF2 format, i.e. safari
2016-07-14 10:24:16 +01:00
0a4af647c8
Header and footer buttons updated to new versions
2016-07-13 17:46:07 +01:00
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
1fbc249de5
Updated Filter room icon
2016-07-13 14:23:46 +01:00
959dcd0c49
Updated BottomLeftMenu buttons to the new ones
2016-07-13 14:10:44 +01:00
ef4f2f10d9
Updated that RightPanel members icon, highlight and numbers
2016-07-13 13:56:59 +01:00
74f459f8a4
feat: bump emoji-body font-size down to 48px
2016-07-12 20:37:51 +05:30
49dd93ffab
feat: large emoji support
2016-07-05 04:04:34 +05:30
7174879ac9
Merge pull request #1717 from aviraldg/feature-autocomplete
...
Autocomplete
2016-07-04 18:16:22 +01:00
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
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
4bc4292ceb
Rooms may not have aliases
2016-06-23 11:12:25 +01:00
5f477b313b
Unused variable
2016-06-23 10:20:11 +01:00
d45e44d01c
Fix joining rooms by typing the alias
...
Fixes regression introduced by https://github.com/vector-im/vector-web/pull/1680
2016-06-23 10:11:46 +01:00
c12839dc7b
Merge pull request #1680 from vector-im/dbkr/delete_alias
...
Add ability to delete an alias from room directory
2016-06-22 17:25:27 +01:00
c35c9f7c3a
PR feedback
2016-06-22 16:20:06 +01:00
ff5c7072d7
Mark the room as private (unlisted) too
...
Also clean up RoomDirectory a bit and just pass the room object around rather than the name / alias, so now we don't have to look up the room by ID again.
2016-06-22 14:52:55 +01:00
eca453ee5a
reposition Login spinner
2016-06-21 19:49:55 +01:00
ad2541299f
Add ability to delete an alias from room directory
...
Hidden behind shift-click for now, but we're going to need to do this a lot to moderate the public room list.
2016-06-21 16:47:40 +01:00
dc840fdf48
updated selection styling
2016-06-21 19:02:18 +05:30
510bb5785e
Merge branch 'develop' into feature-autocomplete
2016-06-21 04:09:23 +05:30
034c045b37
Styling for autocomplete
2016-06-20 13:53:18 +05:30
654429dbdb
improve wording on 'search room names'
2016-06-18 21:12:32 +01:00
c7d0214aaa
#1664 Set a maximum height for codeblocks
2016-06-18 12:21:34 +01:00
895fb63d5d
Merge pull request #1661 from vector-im/rav/unverify_device
...
CSS for unverify button
2016-06-17 17:00:26 +01:00
95a0bc92d6
CSS for unverify button
...
(supports change in react-sdk)
2016-06-17 16:25:39 +01:00
a90492e393
fix CSS
2016-06-17 16:14:14 +01:00
ec7067e7bd
Autocomplete style
2016-06-17 04:58:39 +05:30
4cfcdfa040
Merge pull request #1639 from vector-im/dbkr/fix_peeking
...
Update for react-sdk dbkr/fix_peeking branch
2016-06-16 11:13:29 +01:00
e507339324
Merge pull request #1553 from aviraldg/feature-rte
...
Rich Text Editor
2016-06-14 15:27:35 +01:00
3547bd8d00
Update for react-sdk dbkr/fix_peeking branch
...
With the react-sdk update, this does nothing functionally since the room ID would just
have been ignored, but update this to correctly supply only one of ID/alias.
2016-06-14 13:02:34 +01:00
eb37032d8a
Markdown: styles for bold/italics
2016-06-12 01:04:22 +02:00
f6ed21559a
RTE mode switch styling & cleanup
2016-06-11 15:54:43 +05:30
d7504aeda5
Switch to new view_room
2016-06-10 15:13:41 +01:00
b2459b2dc6
Merge branch 'develop' of github.com:vector-im/vector-web into feature-rte
2016-06-10 04:43:06 +05:30
819e06e2cd
MessageComposer styling for Draft
2016-06-10 04:41:59 +05:30
a030e46c69
Use join_room_by_alias in RoomDirectory
...
This still doesn't actually cause the room to be joined by alias though, so still need to fix that
2016-06-09 17:13:02 +01:00
f61cfbc542
Fix RoomDirectory to join by alias whenever possible.
2016-06-09 16:41:01 +01:00
c4b7571c45
Merge pull request #1612 from vector-im/dbkr/optional_config
...
Make the config optional
2016-06-09 10:40:58 +01:00
4dd477e064
index.js: fix comment typo
...
Fix dave's typo for him
2016-06-09 10:38:51 +01:00
f595f6f141
This check shouldn't be here with the ||
2016-06-09 10:25:49 +01:00
24602119c5
This doesn't actually need to be global
...
(because the rendering isn't in a render method here)
2016-06-09 09:59:37 +01:00
3040d0a474
Comment typo
2016-06-09 09:57:44 +01:00
e4ea00ca23
Return here, else we'll call resolve too
2016-06-09 09:56:57 +01:00
4fc311da90
Style fix
2016-06-09 09:56:11 +01:00
7894e52529
Merge pull request #1610 from vector-im/rav/device_verification
...
CSS support for device verification
2016-06-08 21:37:35 +01:00
f6aa9a7ea4
Make the config optional
...
Accept 404 errors from getting the config and start MatrixChat with no config, make other errors display a simple error message to prevent a completely blank page if the config does fail to load.
2016-06-08 18:46:21 +01:00
5f29729e82
Make unverified encrypted events red and verified ones green
2016-06-08 17:03:54 +01:00
wmwragg