Commit graph

2185 commits

Author SHA1 Message Date
wmwragg
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
wmwragg
497ebce88a Corrected vertical alignment of membership button 2016-07-25 13:16:51 +01:00
wmwragg
2768cd2010 Initial unstyled mentions state notifier context menu 2016-07-22 17:30:09 +01:00
wmwragg
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
wmwragg
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
wmwragg
ce5311191f Tweaked tooltip z-index 2016-07-22 11:30:41 +01:00
wmwragg
7eff6d968e Tweak to z-index as the tooltip was occasionally getting occluded. 2016-07-22 11:16:04 +01:00
David Baker
d01e2506f5 Merge pull request #1842 from vector-im/rav/bump_dependency_versions
Bump dependency versions
2016-07-22 10:53:55 +01:00
Richard van der Hoff
53fe372a0c Bump to react 15.2.1
This should also stop npm complaining about invalid peerDependencies.
2016-07-22 10:47:09 +01:00
Richard van der Hoff
4cb04d1e40 Bump to latest react-gemini-scrollbar
I've updated our forks of the gemini-scrollbar project to latest upstream.
2016-07-22 10:46:38 +01:00
wmwragg
24e021b91f Badge dohickey shown on name hover and badge hover 2016-07-21 18:19:52 +01:00
wmwragg
e988f5ca3b Badge visual tweaks 2016-07-21 17:54:33 +01:00
wmwragg
633a3f4867 New component for testing 2016-07-21 17:44:05 +01:00
wmwragg
df163d8cb7 Clean up of the CSS, and refactor to better match current code 2016-07-21 14:33:27 +01:00
wmwragg
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
wmwragg
ad74d264a3 Selected room highlight teaked to better fit previous design 2016-07-21 11:37:40 +01:00
wmwragg
e9db975d7d Redone assets, with lighter weight to match design 2016-07-21 10:25:42 +01:00
Matthew Hodgson
0958a6bb62 Merge pull request #1835 from vector-im/wmwragg/mention-state-indicator-round-2
Wmwragg/mention state indicator round 2
2016-07-20 18:01:54 +01:00
wmwragg
f3586a79c2 Final CSS tweaks for the hover and collapsed states 2016-07-20 17:10:23 +01:00
wmwragg
882d09bf85 Initial reworking of the RoomTile CSS 2016-07-20 12:46:44 +01:00
Matthew Hodgson
25eb2e2daf Merge pull request #1822 from vector-im/wmwragg/spinner-fix
Wmwragg/spinner fix
2016-07-19 12:54:15 +01:00
Matthew Hodgson
d8d9912f2d Merge pull request #1823 from vector-im/wmwragg/mention-state-indicator
Wmwragg/mention state indicator
2016-07-19 12:19:36 +01:00
wmwragg
8a28da1986 Fixed white space issues 2016-07-19 12:13:29 +01:00
wmwragg
384425582a Fixed wonky white space 2016-07-19 11:47:32 +01:00
wmwragg
b87b356722 Added fixed SCG assets 2016-07-19 11:43:15 +01:00
Matthew Hodgson
6ae0dda9d3 give FF higher billing 2016-07-18 18:26:03 +01:00
Matthew Hodgson
6c680ff424 improve spacing 2016-07-18 18:25:50 +01:00
Matthew Hodgson
c6b455f470 improve spacing 2016-07-18 18:24:30 +01:00
wmwragg
f6d7052928 Oixel tweak so that it work properly in firefox 2016-07-18 16:38:29 +01:00
wmwragg
2ee1a9c440 Explanatory text about specificity 2016-07-18 16:20:44 +01:00
wmwragg
8fd12d530d Added the hightlight badge restyling 2016-07-18 14:57:03 +01:00
wmwragg
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
wmwragg
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
Matthew Hodgson
722cedc92e CSS for generic user settings at last 2016-07-18 01:33:43 +01:00
Matthew Hodgson
f182e32e3d typo 2016-07-18 01:33:36 +01:00
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
a039450d10 Merge pull request #1809 from vector-im/revert-1799-feature-inline-link-preview
Revert "Presentation for inline link"
2016-07-15 16:54:39 +01:00
Matthew Hodgson
1e963a6c3a Revert "Presentation for inline link" 2016-07-15 16:54:27 +01:00
Matthew Hodgson
80ad45df06 spell out that vector should not depend on the public net 2016-07-15 15:57:59 +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
David Baker
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
wmwragg
adbad509f4 Updated to highlight the primary button in the dialog, i.e. the first one 2016-07-14 17:59:06 +01:00