d697f6b968
Merge remote-tracking branch 'upstream/stable' into custom
2025-10-14 00:58:07 -07:00
ilja
3065416c93
Make new SCSS work for non-variables
...
The SCSS that we took from Foundkey in a previous commit, is now working
The settings for disabling MFM or only show animation on hover are working
The previous representation also works and it's clearly marked in the code what is legacy
All the MFM SCSS is now located in one file specifically for MFM, ./src/components/status_content/mfm.scss
This is only SCSS:
* The variables who are provided as data-attributes are not working yet
* `sparkle` also doesn't work
2024-08-04 19:10:25 +02:00
ilja
92e278d406
Move MFM SCSS to separate SCSS
...
MFM was defined in three places.
There was ./src/components/status_body/status_body.scss => I moved this to ./src/components/status_content/mfm.scss
There was ./src/components/status_content/status_content.vue => I moved this to ./src/components/status_content/mfm.scss
There's ./static/mfm.css => I kept this as-is
./src/components/status_content/mfm.scss is now being loaded in ./src/components/status_content/status_content.vue
I added a comment in both ./src/components/status_content/mfm.scss and ./static/mfm.css referencing each other
Note that this is just a first step in an overhoal of how MFM is handled. It seemed easier to do this as a first step and then build further on that.
2024-08-04 17:44:21 +02:00
fox
87aee5e931
really obnoxious change
...
revert Prevent replying with a more open visibility than the parent post
2024-05-04 15:45:13 -07:00
Oneric
0e07d88afa
Expand Unicode emoji map
...
This pulls in 267 new emoji:
- all 258 non-deprecated country or macro region
flags (composed by two regional indicators)
- all 3 regional flags currently recommended for general use
(Wales, Scotland, England)
- a few random ones i picked out
- goose
- heart on fire
- heart mending
- transgender flag
- rainbow flag
- pirate flag
The new names are derived from official Unicode names
with minor modifications to fit into the usual shortcode scheme
and dropping the flag_ prefix from country indicators.
Due to a naming conflict the old "japan" emoji
U+1F5FE SILHOUETTE OF JAPAN was renamed to "japan_silhouette".
2024-04-04 21:52:33 +02:00
Denys Nykula
6b3b55455d
paper theme: more contrast and fix setting tab hover
2023-05-18 23:05:19 +03:00
FloatingGhost
f288d0c219
Make everything work with a strict CSP
2023-01-02 15:16:42 +00:00
FloatingGhost
313ddcebcb
Add blurhash support
2022-12-30 04:57:23 +00:00
FloatingGhost
ea941d7cfa
remove IHBA assets
2022-12-30 03:20:12 +00:00
FloatingGhost
b68e968bf9
Add ability to include custom CSS
2022-12-06 15:26:16 +00:00
FloatingGhost
a3e490edcd
use cutout of 512 logo
2022-12-02 12:00:30 +00:00
FloatingGhost
6af1df8bef
Add logo files
2022-12-02 11:27:24 +00:00
floatingghost
db46879a8f
Big 'ol set of patches and dep maintenance ( #212 )
...
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/212
2022-11-15 15:47:32 +00:00
sfr
974663c42d
Fix broken MFM tags ( #93 )
...
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/93
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>
2022-08-01 11:10:54 +00:00
FloatingGhost
dba047ce34
Merge branch 'develop' into marked-mfm
2022-07-15 10:58:41 +01:00
sfr
931ed3d3c7
Use Marked and marked-mfm for MFM rendering ( #29 )
...
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/29
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>
2022-07-15 09:57:17 +00:00
FloatingGhost
d29bccb7d6
bugfix: spin css, props setting
2022-07-15 10:55:47 +01:00
norm
4d84fd4cf7
Fix path to terms-of-service.html
2022-07-12 20:46:08 +00:00
Sol Fisher Romanoff
8c9821e444
Parse MFM options with values
2022-07-12 20:36:48 +03:00
Sol Fisher Romanoff
5f9e3709b3
Update MFM css
2022-07-09 14:34:31 +03:00
FloatingGhost
52644ec5cb
remove IHBA ToS
2022-06-16 11:35:25 +01:00
FloatingGhost
36309ebe04
don't clip on overflow
2022-06-14 17:28:41 +01:00
FloatingGhost
ef1c3d57b6
fix styling
2022-06-14 16:35:08 +01:00
FloatingGhost
ed42c476fb
allow MFM authoring
2022-06-14 15:57:02 +01:00
sadposter
feb7090cde
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
2021-08-05 12:59:18 +01:00
sadposter
214d85189c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
2021-06-25 10:07:29 +01:00
Mark Felder
21477d07e9
This setting didn't actually do anything
2021-06-01 16:51:47 -05:00
Mark Felder
0604b1d5b7
Rename legacy PleromaFE Chat functionality to "Shout"
2021-06-01 12:51:20 -05:00
sadposter
28ac9d83c1
Merge branch 'develop' of gitssh.ihatebeinga.live:IHBAGang/pleroma-fe into develop
2021-05-21 11:42:10 +01:00
FloatingGhost
6d47156297
Merge branch 'develop' of https://git.ihatebeinga.live/IHBAGang/pleroma-fe into develop
2021-05-21 11:37:33 +01:00
sadposter
edb5826072
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
2020-12-29 13:25:38 +00:00
Henry Jameson
c197756767
Basic no-wallpaper support
2020-12-16 18:25:07 +02:00
Shpuld Shpuldson
767db567ad
update emoji.json, add script that merges new emoji from another source
2020-11-30 14:43:39 +02:00
sadposter
7e1b1ec990
:Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
2020-11-15 19:45:52 +00:00
sadposter
804e25084d
thing
2020-11-15 19:45:14 +00:00
Henry Jameson
3db218dec1
change logo to svg
2020-11-02 19:37:01 +02:00
sadposter
e21dd584a9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
2020-11-01 12:26:14 +00:00
Henry Jameson
633349ddff
Refactor desktop navbar into a component, change layout to grid for
...
better compatibility with search field and simpler CSS
2020-10-29 22:54:28 +02:00
Henry Jameson
1b50d700aa
bye bye fontello
2020-10-21 00:34:42 +03:00
Shpuld Shpuldson
20d33c2fbc
change icon to a megaphone
2020-09-16 11:53:54 +03:00
sadposter
6f621dd34c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
2020-07-10 11:27:53 +01:00
sadposter
954d5c05df
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
2020-07-09 22:32:18 +01:00
eugenijm
aa2cf51c05
Add Chats
2020-07-08 15:21:31 +03:00
Dym Sohin
1767ee01d0
corrected tos.html location
2020-07-07 19:34:45 +00:00
Shpuld Shpuldson
87b5f828d7
fix conflicts, use file icon instead of link, add support for audio and file icon in cw'd posts
2020-07-06 14:01:03 +03:00
Eugenij
de291e2e33
Add bookmarks
...
Co-authored-by: jared <jaredrmain@gmail.com>
2020-07-03 19:45:49 +00:00
Shpuld Shpuldson
96d2c86d3b
change placeholders to use descriptions, use icons with placeholders, change uploads to use attachment component
2020-06-29 14:48:22 +03:00
sadposter
77bd79100b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop
2020-06-19 11:01:06 +01:00
Henry Jameson
e4b18deece
fix redmond themes
2020-06-13 13:16:53 +03:00
lain
fd109fa355
Merge branch 'develop' into 'chore/improve-default-tos'
...
# Conflicts:
# static/terms-of-service.html
2020-06-12 14:17:56 +00:00