wmwragg
|
f382946138
|
Merge up from develop
|
2016-07-30 12:07:34 +01:00 |
|
wmwragg
|
bb93a59cfb
|
fixed unread hightlight font weight for room name
|
2016-07-29 13:49:28 +01:00 |
|
wmwragg
|
0ad84fd7b0
|
Better comments
|
2016-07-29 10:59:54 +01:00 |
|
wmwragg
|
87bddcd8ce
|
Preliminary fix for showing muted state when collapsed - keep faded avatar, but don't show the mute icon
|
2016-07-29 10:50:50 +01:00 |
|
wmwragg
|
18701a2dae
|
CSS tweaks to get the collapsed mute state properly working
|
2016-07-29 10:01:42 +01:00 |
|
wmwragg
|
2f65064688
|
CSS bugfix to stop incorrect letter spaceing on room names
|
2016-07-28 17:44:17 +01:00 |
|
wmwragg
|
2f08f2441f
|
CSS tweaks for muted dohickey positioning
|
2016-07-28 17:41:01 +01:00 |
|
wmwragg
|
6c4c0bf57a
|
Initial feature set complete, but the state and CSS need to be simplified
|
2016-07-28 17:35:25 +01:00 |
|
wmwragg
|
55a10ee275
|
Mute state handled corrcectly
|
2016-07-28 17:25:28 +01:00 |
|
wmwragg
|
49545ce0c2
|
Leaving the fail promise section blank as a todo, with explanitary comment
|
2016-07-28 15:29:57 +01:00 |
|
wmwragg
|
b87058508e
|
When a use clicks the state they want, after the change has been made it pasues breifly before closing, so that the user can see their state change has taken place.
|
2016-07-28 15:28:05 +01:00 |
|
Matthew Hodgson
|
fd53f10fbd
|
improve the getting started instructions and plug the electron apps
|
2016-07-28 16:05:21 +02:00 |
|
wmwragg
|
6329e274ab
|
Extra polish to get styling looking like the design
|
2016-07-28 14:20:24 +01:00 |
|
wmwragg
|
b5fdaac947
|
Final spacing tweaks to get it aligned with the design
|
2016-07-27 18:06:47 +01:00 |
|
wmwragg
|
22bf74dc65
|
Tweaks to get icons to line up better, still need to space labels correctly
|
2016-07-27 18:01:43 +01:00 |
|
wmwragg
|
d376df478a
|
Initial context menu with all it's elements
|
2016-07-27 17:43:35 +01:00 |
|
wmwragg
|
53f4da1d30
|
Refactor so that chevron and menu can be positioned independantly
|
2016-07-27 16:09:26 +01:00 |
|
David Baker
|
e34db7b8c6
|
Merge pull request #1883 from vector-im/rav/remove_relayoutonupdate
Remove relayoutOnUpdate prop on gemini-scrollbar
|
2016-07-27 15:55:27 +01:00 |
|
wmwragg
|
074bbc7149
|
Added the two additiona states that don't yet exist on the backend, as faded and disabled options
|
2016-07-27 12:25:44 +01:00 |
|
Richard van der Hoff
|
4b33164ab6
|
Remove relayoutOnUpdate prop on gemini-scrollbar
The latest gemini-scrollbar makes relayoutOnUpdate redundant, so update to it
and remove the properties.
|
2016-07-27 11:41:27 +01:00 |
|
wmwragg
|
dab707a893
|
Additional refactor to further modularise the context menus
|
2016-07-27 11:26:36 +01:00 |
|
wmwragg
|
5cf164fcc1
|
Re-modularised the context menus
|
2016-07-27 10:40:57 +01:00 |
|
wmwragg
|
37a7ce809a
|
Added two new icons for notifications states
|
2016-07-27 10:40:19 +01:00 |
|
wmwragg
|
15f9f5dbe8
|
Doing the state change via onClick events rather than radio buttons, as they were causeing untraceable react errros for some reason
|
2016-07-26 17:24:45 +01:00 |
|
wmwragg
|
187818aaa0
|
Radio buttons now added, and only none guests can modify notfication state
|
2016-07-26 10:34:03 +01:00 |
|
wmwragg
|
30b1e7078f
|
Contextual menu restyling
|
2016-07-25 18:04:16 +01:00 |
|
wmwragg
|
791980cd1f
|
Menu context dohickey now sticks when menu shown
|
2016-07-25 17:19:06 +01:00 |
|
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
|
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 |
|
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 |
|
Matthew Hodgson
|
6ae0dda9d3
|
give FF higher billing
|
2016-07-18 18:26:03 +01:00 |
|