Shpuld Shpuldson
7aa1f02e38
Merge branch 'feature/timeline-fetch-error' into 'develop'
...
Use one error variable for all timelines
See merge request !57
2017-03-09 08:06:59 -05:00
wakarimasen
e064d2da4d
Use one error variable for all timelines
2017-03-09 13:38:32 +01:00
shpuld
00531ad9df
lint fix
2017-03-09 12:48:43 +02:00
shpuld
d99b9bdac1
Merged with changes in develop & fixed conflicts.
2017-03-09 12:45:12 +02:00
lambadalambda
64d71b75cf
Merge branch 'feature/nav-panel-hover-state' into 'develop'
...
themeable hover states for nav-panel
See merge request !53
2017-03-09 03:10:31 -05:00
lambadalambda
7a5bed0684
Merge branch 'feature/animated-favorite-and-boost' into 'develop'
...
add a spin animation to favorite and boost actions
See merge request !52
2017-03-09 03:08:59 -05:00
lambadalambda
e808df0285
Merge branch 'cleanups' into 'develop'
...
Cleanups
See merge request !54
2017-03-09 03:02:55 -05:00
Roger Braun
b11c1f57a9
Merge branch 'develop' into xj9/pleroma-fe-feature/even-better-nsfw-image-loading
2017-03-09 09:00:09 +01:00
Roger Braun
08297ea83e
Remove redirect on login
...
This is to enable this workflow:
1. Open conversation in new tab
2. Login
3. Interact with the conversation
We can add this again once we have persistent logins.
2017-03-09 08:51:33 +01:00
xj9
d94cd15467
fix cursor style
2017-03-08 22:38:14 -07:00
xj9
aff432a572
themeable hover states for nav-panel
2017-03-08 22:36:03 -07:00
xj9
459fdaf10f
add a spin animation to favorite and boost actions
2017-03-08 21:45:40 -07:00
xj9
502757da28
improvements on fature/better-nsfw-image-loading
...
- loading indicator
- avoid hitting the cache if we already know the image was loaded
- more responsive toggle
2017-03-08 20:23:10 -07:00
Shpuld Shpuldson
ba4f7ef3ef
Merge branch 'feature/failed-login-error' into 'develop'
...
Visual feedback on failed login
See merge request !49
2017-03-08 19:21:36 -05:00
shpuld
9511691c94
Make the error into a div instead of a button to get rid of the hover effects.
2017-03-09 02:21:23 +02:00
shpuld
507fe79050
Add base03 border to timeline bottom fetcher too.
2017-03-09 01:13:37 +02:00
shpuld
6c8fc99d5a
Make style setter create an often used base03-border class, use that class in notifications, navpanel and statuses.
2017-03-09 01:09:23 +02:00
wakarimasen
ccc460bb5e
Give more specific reason for failed login
2017-03-08 19:22:56 +01:00
wakarimasen
c0e8111d64
Clear username and password field on failed login
2017-03-08 19:08:01 +01:00
wakarimasen
a6b6fe95c0
Show visual feedback on login error, redirect on success
2017-03-08 18:28:41 +01:00
Roger Braun
bde1241843
eslint fixes.
2017-03-08 17:58:49 +01:00
Roger Braun
ccbfc64bfc
Don't redirect after login.
2017-03-08 16:54:06 +01:00
Shpuld Shpuldson
d954db0221
Merge branch 'feature/timeline-fetch-error' into 'develop'
...
Visual feedback on failure to fetch new statuses
See merge request !47
2017-03-07 12:15:37 -05:00
lambadalambda
3a62ad3c4c
Merge branch 'feature/more-visible-notifications' into 'develop'
...
Notifications inside a red circle and the red line more visible
See merge request !46
2017-03-07 11:27:46 -05:00
wakarimasen
086dd832d3
Visual feedback on failure to fetch new statuses
2017-03-07 17:27:12 +01:00
shpuld
ae570ea0ff
Put conversation 'Collapse' back on the same line with the rest of the heading.'
2017-03-07 16:00:45 +02:00
shpuld
58fdf9e70d
Put the number of notifications inside a red circle (kinda like qvitter and everyone else does), make the red notification line slightly less transparent.
2017-03-07 15:55:00 +02:00
lambadalambda
aa0d207c94
Merge branch 'fix/highlight-expanded-retweets' into 'develop'
...
Highlight original notice when expanding retweets
See merge request !43
2017-03-07 06:06:43 -05:00
shpuld
a4ebf44f24
Fix overlapping styles in timeline and notifications that screwed up user-card.
2017-03-06 23:51:39 +02:00
wakarimasen
9d56721533
Highlight original notice when expanding retweets
2017-03-06 16:21:11 +01:00
shpuld
31c0a2dfef
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/load-new-statuses-in-heading
2017-03-06 14:51:01 +02:00
Roger Braun
51160f0fdb
Style fixes.
2017-03-05 20:36:22 +01:00
shpuld
e19bfb9a22
Merged from develop, made 'new notices' into a 'show new' button placed on the heading element, updated headings and buttons to be more consistent with new changes (log-in, notifications/read, conversation/collapse), changed bottom 'load older' block to not disappear on click to keep screen from scrolling and changed its styling more consistent with everything else.
2017-03-05 19:00:35 +02:00
wakarimasen
42ae57dace
Remove unused import
2017-03-05 16:49:45 +01:00
wakarimasen
289326855c
Add focused prop to status
2017-03-05 16:31:01 +01:00
wakarimasen
22e8258a56
Highlight current notice in conversation-page, add backlinks
2017-03-05 11:56:28 +01:00
xj9
9107facaca
issue #1 - better nsfw image loading
...
preload the image when it is toggled, but wait to replace it until
it has loaded.
2017-03-02 20:01:19 -07:00
Roger Braun
a4c58aab13
Unify notice timelines to make changes easier.
2017-03-01 20:36:37 +01:00
lambadalambda
51294082e0
Merge branch 'fix/improved-profile-background-color' into 'develop'
...
Make use of template literals instead of string concat.
See merge request !34
2017-03-01 11:14:18 -05:00
shpuld
4d1183cc1f
Fix the very visible padding offset in unread notification caused by the border.
2017-02-27 19:21:40 +02:00
shpuld
8c43b3f505
Remove newlines from template literal.
2017-02-26 22:42:22 +02:00
shpuld
015bf78dd9
Heading text floats left, initial attempt at load more in the right side of the heading.
2017-02-26 22:36:54 +02:00
shpuld
960ed9540d
Make use of template literals instead of string concat.
2017-02-25 14:34:05 +02:00
lambadalambda
bebd5c3328
Merge branch 'fix/improved-profile-background-color' into 'develop'
...
Make the profile background use a new calculated color using the theme
See merge request !33
2017-02-25 06:33:14 -05:00
shpuld
e9820326e3
Clean up whitespace
2017-02-25 13:19:37 +02:00
shpuld
536a7176df
Make the profile background use a new calculated color using the theme
2017-02-25 13:13:08 +02:00
shpuld
142a8a1a76
Fix poor choice of colors for input/textarea borders, adjust login form padding.
2017-02-24 19:43:27 +02:00
shpuld
cac47f7128
Make user card buttons more light-theme friendly without compromising the dark ones.
2017-02-24 19:12:57 +02:00
shpuld
2bfd2190a0
Mark unread notifs with the red line, make read notifs base01 again, center the heading text and move the button to the right of the panel.
2017-02-24 18:53:53 +02:00
shpuld
9dfcf8a301
Align attachments with usercard, make buttons use theme colors, prettify login form, more border radii adjustment for consistency.
2017-02-24 17:32:41 +02:00
