Commit graph

4532 commits

Author SHA1 Message Date
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
lambadalambda
67c22276d3 Merge branch 'wakarimasen/pleroma-fe-highlight-notice' into 'develop'
Wakarimasen/pleroma fe highlight notice

See merge request !41
2017-03-05 14:59:33 -05: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
c921662036 Add inConversation prop to status 2017-03-05 14:34:14 +01:00
wakarimasen
22e8258a56 Highlight current notice in conversation-page, add backlinks 2017-03-05 11:56:28 +01:00
wakarimasen
6bcbed38d0 Add option to only hide attachments on timeline 2017-03-04 21:25:59 +01:00
lambadalambda
049c74f8e8 Merge branch 'feature/better-nsfw-image-loading' into 'develop'
issue #1 - better nsfw image loading

See merge request !37
2017-03-03 05:00:06 -05: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
Shpuld Shpuldson
6075915223 Merge branch 'feature/restructure-timelines' into 'develop'
Unify notice timelines to make changes easier.

See merge request !36
2017-03-01 16:58:42 -05:00
lambadalambda
bed37646f9 Update .gitlab-ci.yml 2017-03-01 14:46:07 -05:00
lambadalambda
30a908b56d Update .gitlab-ci.yml 2017-03-01 14:42:45 -05: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
lambadalambda
5db70a212d Merge branch 'fix/remove-unread-notifications-offset' into 'develop'
Fix the very visible padding offset in unread notification caused by the border.

See merge request !35
2017-03-01 11:13:46 -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
Roger Braun
290180a987 Merge branch 'develop' into feature/hash-routed 2017-02-26 11:39:42 +01: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
lambadalambda
e2ba7d9037 Merge branch 'fix/various-style-fixes-all-over-the-place' into 'develop'
Fix/various style fixes all over the place

See merge request !32
2017-02-25 06:32:19 -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
lambadalambda
614cbb556a Remove old commented style. 2017-02-24 16:50:32 -05: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
shpuld
e0e507348c Give buttons cursor: pointer; Make border radii more consistent by not using em everywhere. 2017-02-24 10:17:41 +02:00
Roger Braun
2b2061b03f Switch to lz-string.
Pako was very slow in Chromium.
2017-02-23 19:11:22 +01:00
Roger Braun
d030462d12 Indentation. 2017-02-23 01:54:22 +01:00
Roger Braun
ffc23dc686 Merge branch 'hae/pleroma-fe-develop' into develop 2017-02-23 01:53:52 +01:00
Hector A. Escobedo
c338940084 Fix syntax errors and hiding logic.
This has been tested.
2017-02-22 19:31:49 -05:00
Hector A. Escobedo
a7db72d7a7 Add setting to toggle NSFW hiding. 2017-02-22 18:39:56 -05:00
Roger Braun
b939f70d17 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop 2017-02-23 00:26:52 +01:00
Roger Braun
74931dece7 Revert "Show actual status in notifications when mentioned."
This reverts commit 0e1ab69c33.
2017-02-23 00:26:37 +01:00
lambadalambda
854faf905e Merge branch 'feature/user-card-improvements' into 'develop'
User card visual improvements

See merge request !29
2017-02-22 18:09:54 -05:00
Roger Braun
7c0f3ea666 Add setting to hide all attachments. 2017-02-23 00:04:47 +01:00
shpuld
9237f0b918 Removed unnecessary debug stuff 2017-02-23 00:39:41 +02:00
Roger Braun
0e1ab69c33 Show actual status in notifications when mentioned. 2017-02-22 23:37:12 +01:00
shpuld
715bfb3dca Make gradient use the theme colors, adjust user interction elements, make profiles without bg use a darker gray solid color to not drown out white text. 2017-02-23 00:24:37 +02:00
Roger Braun
9778d4cfc0 More eslint fixes. 2017-02-22 22:43:40 +01:00
Roger Braun
5abf857705 Style fixes. 2017-02-22 22:33:28 +01:00
lambadalambda
b9be4708e6 Merge branch 'feature/drag_and_drop_for_media_upload' into 'develop'
Proper handling of drag/drop for most platforms

See merge request !28
2017-02-22 16:31:59 -05:00
shpuld
1072cd6c02 Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into feature/user-card-improvements 2017-02-22 23:08:49 +02:00
shpuld
ede4d77cfd Move profile picture to right side, make the names appear next to it, extend profile background pic further and fade it out with gradients, fix the crappy borders around the inline user card. 2017-02-22 23:08:14 +02:00
Roger Braun
ec5d8b9833 Set colors into config so they can be used for more dynamic styles. 2017-02-22 21:14:55 +01:00