Commit graph

7128 commits

Author SHA1 Message Date
Henry Jameson
666498e7b7 fix main post form having hidden emoji picker 2022-04-10 21:56:54 +03:00
Henry Jameson
ce4319e56c Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fix horizontal scroll, make hovered column render stuff on top of other ones (popups, tooltips etc)
2022-04-10 21:32:35 +03:00
Henry Jameson
aa07b219c9 fix horizontal scroll, make hovered column render stuff on top of other
ones (popups, tooltips etc)
2022-04-10 21:32:29 +03:00
Henry Jameson
f5d103c1c7 fix horizontal scroll, make hovered column render stuff on top of other
ones (popups, tooltips etc)
2022-04-10 21:31:58 +03:00
Henry Jameson
5b71b33579 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  remove margins from underlay since it causes horizontal scroll on smaller screens
  underlay improvements
  Fix image cropper not closing correctly
2022-04-10 20:43:10 +03:00
Henry Jameson
3f65c8b1d6 Merge remote-tracking branch 'origin/develop' into threecolumn
* origin/develop:
  Fix image cropper not closing correctly
2022-04-10 20:42:25 +03:00
Henry Jameson
62572c3204 remove margins from underlay since it causes horizontal scroll on
smaller screens
2022-04-10 20:41:36 +03:00
HJ
c2a4051d72 Merge branch 'from/develop/tusooa/cropper-close' into 'develop'
Fix image cropper not closing correctly

See merge request pleroma/pleroma-fe!1512
2022-04-10 17:40:52 +00:00
Henry Jameson
3f9d9dd6bd underlay improvements 2022-04-10 20:27:09 +03:00
Henry Jameson
5596599402 underlay improvements 2022-04-10 20:26:59 +03:00
Henry Jameson
cfa876d01a Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fix new post button not working day1, minor stylistic fixes
  layout fixes
  fix extra padding in thread view
  chat fixes
  more fixes
  fix timeline scroll-to-top
  fix scrollable columns
  revert layout back to scrollable body
  revert timeline changes
2022-04-10 20:19:24 +03:00
Henry Jameson
3e1b40ce29 fix new post button not working day1, minor stylistic fixes 2022-04-10 20:18:54 +03:00
Tusooa Zhu
169d13680a
Fix image cropper not closing correctly 2022-04-10 13:02:45 -04:00
Henry Jameson
0f28c28760 layout fixes 2022-04-10 19:29:10 +03:00
Henry Jameson
d9f8091ce6 fix extra padding in thread view 2022-04-10 19:29:06 +03:00
Henry Jameson
5b664f464d chat fixes 2022-04-10 19:29:06 +03:00
Henry Jameson
7426417a52 more fixes 2022-04-10 18:44:22 +03:00
Henry Jameson
a035fa4e6c fix timeline scroll-to-top 2022-04-10 18:44:03 +03:00
Henry Jameson
4c2301bc9f fix scrollable columns 2022-04-10 18:43:52 +03:00
Henry Jameson
77505fa7c9 revert layout back to scrollable body 2022-04-10 17:48:02 +03:00
Henry Jameson
2df48b1643 revert timeline changes 2022-04-10 17:47:54 +03:00
Henry Jameson
5d6ed75fbd Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  restore margins for inline convos
  clean up and organize CSS, use ems for widths, use vars more
  fix notifs' shadow peeking in when closed on mobile
  Fix tab switcher not working when some tabs hidden
  fix scrollbars for real now
  Fix mobile nav link text colour
  Fix shrug text in muted status
2022-04-10 14:54:39 +03:00
Henry Jameson
ce9fd04865 Merge remote-tracking branch 'origin/develop' into threecolumn
* origin/develop:
  Fix tab switcher not working when some tabs hidden
  Fix mobile nav link text colour
  Fix shrug text in muted status
2022-04-10 14:54:03 +03:00
Henry Jameson
684650e14f restore margins for inline convos 2022-04-10 14:47:47 +03:00
Henry Jameson
0ff34f8a5a clean up and organize CSS, use ems for widths, use vars more 2022-04-10 14:23:30 +03:00
Henry Jameson
4750d9bb4c fix notifs' shadow peeking in when closed on mobile 2022-04-10 14:23:03 +03:00
HJ
4d15cbcbbd Merge branch 'from/develop/tusooa/1158-hidden-tabs' into 'develop'
Fix tab switcher not working when some tabs hidden

Closes #1158

See merge request pleroma/pleroma-fe!1511
2022-04-10 06:32:41 +00:00
Tusooa Zhu
3b02566e16
Fix tab switcher not working when some tabs hidden 2022-04-09 23:50:29 -04:00
Henry Jameson
5b47856329 fix scrollbars for real now 2022-04-08 13:34:20 +03:00
Henry Jameson
8709e09809 fix scrollbars for real now 2022-04-08 13:34:11 +03:00
Henry Jameson
9aa457eeaf Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fix chats, boost popover's z-index some more
2022-04-08 13:32:12 +03:00
Henry Jameson
282e6812b3 fix chats, boost popover's z-index some more 2022-04-08 13:31:29 +03:00
Henry Jameson
cc7af66788 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  cleanup, fix some things, try to disable scrollbars on mobile
  fix mobile view
2022-04-08 10:17:46 +03:00
Henry Jameson
6109fab14e cleanup, fix some things, try to disable scrollbars on mobile 2022-04-08 10:17:23 +03:00
HJ
87311cff09 Merge branch 'from/develop/tusooa/mobile-nav-link-col' into 'develop'
Fix mobile nav link text colour

See merge request pleroma/pleroma-fe!1510
2022-04-07 21:12:17 +00:00
Tusooa Zhu
6951fda0d6
Fix mobile nav link text colour 2022-04-07 15:59:03 -04:00
HJ
2d99cbc640 Merge branch 'from/develop/tusooa/1160-rm-shrug' into 'develop'
Fix shrug text in muted status

Closes #1160

See merge request pleroma/pleroma-fe!1509
2022-04-07 15:50:51 +00:00
Tusooa Zhu
22c70ae22a
Fix shrug text in muted status 2022-04-07 11:45:23 -04:00
Henry Jameson
c71cf72eea fix mobile view 2022-04-07 16:39:39 +03:00
Henry Jameson
5f5f59d3ef fix mobile view 2022-04-07 16:39:32 +03:00
Henry Jameson
0fe0fc76a7 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  boost z-index of popover
  oops
2022-04-07 16:18:59 +03:00
Henry Jameson
51c996bd7e boost z-index of popover 2022-04-07 16:18:39 +03:00
Henry Jameson
4007ddbf32 oops 2022-04-07 16:10:46 +03:00
Henry Jameson
cef6633c8a oops 2022-04-07 16:10:35 +03:00
Henry Jameson
785c3df7e1 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  make scrollbars use button roundness
2022-04-07 16:08:09 +03:00
Henry Jameson
6b67c095bf make scrollbars use button roundness 2022-04-07 16:07:47 +03:00
Henry Jameson
c15b066bca Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fancy scrollbars
2022-04-07 16:04:50 +03:00
Henry Jameson
b8b7ae8564 fancy scrollbars 2022-04-07 16:04:22 +03:00
Henry Jameson
b836b27175 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fancy scrollbars
2022-04-07 16:00:49 +03:00
Henry Jameson
d23f169173 fancy scrollbars 2022-04-07 16:00:28 +03:00