carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity
20,056 Commits
1 Branch
0 Tags
2.3 GiB
Commit Graph

574 Commits (8c2a41b86811fc476b2a3fbc02fb7e1da9c8000a)

Author SHA1 Message Date
Aevann1 2da7bea62b combine the 2 user counters for non-jannies 2022-07-13 15:08:21 +02:00
Aevann1 05fb4168e4 hide user counter on other sites when num of users is under 100 2022-07-13 10:19:21 +02:00
Aevann1 240ffdb675 Revert "move the icons to the headers on desktop" 
This reverts commit 292207bd83.
 2022-07-12 21:18:40 +02:00
Aevann1 b7b0b200ad move icons back to sidebar for PCM 2022-07-12 02:40:30 +02:00
Aevann1 292207bd83 move the icons to the headers on desktop 2022-07-11 18:53:33 +02:00
Snakes 85d59d5656 LGB: Populate sidebar. 2022-07-09 08:51:08 -04:00
Aevann1 4093eba7d0 fix notifications link on mobile 2022-07-09 09:23:25 +02:00
Aevann1 ad1273995d notifications rework 2022-07-08 20:06:54 +02:00
Snakes 5407f4ed7f Lottershe icon back to navbar. 2022-07-03 14:33:31 -04:00
Snakes 1b9237ceaf Add assetcache.asset_siteimg, has_logo. 
Commit began by changing the duplicated SITE_NAME conditional in the
header to use a `has_logo` param, much like the recent `has_sidebar`.
From there, a need to include site-specific assets in assetcache was
revealed, adding the `asset_siteimg(...)` macro. This was applied
quite broadly, though not comprehensively.
 2022-07-01 01:55:53 -04:00
Snakes 39c945f7ca LGB: Initial sidebar & const. 2022-07-01 01:08:15 -04:00
Aevann1 8194c31417 fix 500 error 2022-07-01 00:08:22 +02:00
Snakes adfad3e8a5 Swap lottery & random_user nav, and other nav. 2022-06-28 03:53:33 -04:00
Aevann1 42a6b5731a sneed 2022-06-28 08:17:21 +02:00
Aevann1 cd811d7b9d consistent lottershe naming 2022-06-28 02:54:44 +02:00
Snakes a3e05a86d3 Enforce minimum width on header dropdown. 
The header dropdown menu's horizontal positioning depends on the
width of the user pfp/username/currency region to not overflow off
the right side of the page. Therefore, we enforce a minimum width.

There is presumably some way to fix this by right-aligning the right
side of the dropdown menu to the right side of the dropdown header.
I didn't want to risk it given the strange interplay of all of the
Bootstrap styling and the media queries. Also, it does visually
look better to be left-aligned.
 2022-06-27 03:45:46 -04:00
Snakes 1d500917ad Improve header currency display style. 2022-06-27 00:09:32 -04:00
Aevann1 52a8a219ae make poorcel-mode device-specific 2022-06-27 05:46:32 +02:00
Aevann1 03a9a5752b Revert "trying to fix weird banner behavior" 
This reverts commit 8d0a674f4e.
 2022-06-27 04:33:59 +02:00
Aevann1 6bd4efa61f Revert "make small text less small" 
This reverts commit 42b0f37034.
 2022-06-27 04:33:38 +02:00
Aevann1 8d0a674f4e trying to fix weird banner behavior 2022-06-27 04:24:56 +02:00
Aevann1 42b0f37034 make small text less small 2022-06-27 04:18:14 +02:00
Aevann1 b1ef8e4c62 add poorcel mode 2022-06-27 04:14:53 +02:00
Aevann1 b5d993569f embed rework 2022-06-27 03:00:45 +02:00
Snakes 268c23e2f8 WPD: make holes more flair-like in UI. 2022-06-26 03:42:15 -04:00
Snakes cd556b6d8e Refactor UI name of hole/sub to constant. 2022-06-26 03:41:28 -04:00
Aevann1 f34c4e1196 stop using app.config for our own stuff 2022-06-24 17:08:57 +02:00
Aevann1 4fc8520e24 remove post_toast2() and post_toast3() and incorporate them into post_toast() 2022-06-24 01:07:47 +02:00
Aevann1 e42227ab67 add glowie marseys 2022-06-23 02:34:37 +02:00
Aevann1 d704592bdd cache-bust all previously broken images 2022-06-22 17:59:47 +02:00
Aevann1 20585ca543 add a shortened endpoint for static images and rename loading.webp to l.webp (to save bytes) 2022-06-22 17:51:19 +02:00
Snakes 79ced3816c Add 'hole' search operator. 2022-06-22 02:35:50 -04:00
Snakes dee8eb5154 Replace loading.webp with new marseyloading. 2022-06-19 22:15:33 -04:00
Aevann1 bb1d3677c5 fix this https://i.imgur.com/6A9Rgkt.png 2022-06-19 16:55:10 +02:00
Snakes aea7e0b83a Exclude golden Marseys from animations flag. 
Fixes: https://rdrama.net/post/18459/-/2128499?context=8#context
 2022-06-15 16:40:30 -04:00
Snakes f04c3d6cdd Asst'd mobile CSS & markup fixes. 
Kitchen sink commit of semi-related things:
  - `#profile--bio a` tags didn't properly wrap on mobile with some
    browsers. Changing overflow-wrap may fix this.
  - Userpage markup for mobile tried to place profile_bio inside a
    <p> tag. Nesting paragraphs is invalid HTML. It has been made a
    <div> to match desktop and even nearby sections on mobile.
  - Fedi icon in mobile dropdown had the wrong classes, which broke
    consistent styling with its neighbors.
  - fa-square-share-nodes improperly wound up with the fa-share-nodes
    character code when committed.
 2022-06-15 05:59:27 -04:00
Snakes e5830ebec7 Add fedi to mobile nav, icon changes. 2022-06-15 04:35:13 -04:00
Snakes 564f5b38f1 Clarify notif color logic, extend to modaction. 
Previously, notification bell linking & color logic was interspersed
between templates and the user model. It doesn't _really_ belong in
the user model, but it's been moved out of the templates to there to
at least centralize it. This was also used as an opportunity to make
the modactions inbox color the bell appropriately.
 2022-06-15 01:43:34 -04:00
Snakes e578108903 Add fediverse to nav dropdown. 2022-06-15 00:44:16 -04:00
Aevann1 0f49c8e32f replace spaces with tabs 2022-06-13 20:33:25 +02:00
Aevann1 8f72407f84 show the party hat in the header too 2022-06-13 19:46:40 +02:00
Aevann1 30f71855f4 fix 5e9297b78f 2022-06-11 16:50:26 +02:00
Aevann1 5e9297b78f rename "Lottershe" to "Lottery" on other sites 2022-06-11 16:44:13 +02:00
Snakes e217335b3a Make pat anims unaffected by anim setting. 2022-06-07 07:29:07 -04:00
Snakes b187b72746 Remove backdrop blur on modals. 
By direct command of Benevolent rDrama Caliph for Life, his
exaltedness Aevann. Was causing performance issues on a large
number of users' systems.
 2022-06-07 07:23:46 -04:00
Snakes cb5f9d05c6 templates: Fix improper plurals, create helpers. 
Previously, the three instances of 'Report[s]' and one instance of
'Coin[s]' in the UI templates were always pluralized, even when they
referred to a singular instance. This has been corrected by creating
a `plural` helper macro.

Additionally, this was used as impetus to create `utils/helpers.html`
to eventually move more recurring template logic into macros.
 2022-06-07 05:26:22 -04:00
Snakes 8ae84214a3 Disable modal backdrop when !animations setting. 
Some users have complained about performance with the backdrop-filter
on .modal-backdrop.show. Partially as a kludge to avoid adding another
toggle, the 'animations' user setting now also disables the backdrop
filter. In practice, this may turn into a more general setting to
remove performance-intensive UI effects.
 2022-05-31 21:03:04 -04:00
outruncolors c2f598a17f Move lottery to own page (#296) 2022-05-30 22:40:38 -04:00
Snakes b3604cca9f Remove chat icon from mobile header. 
3106823511 added a chat icon to the navbar on mobile. I forgot that
the bottom navbar on mobile already had one. It has therefore been
removed, thus totally alleviating issues with wrapping when a user
is both an admin and has a high notification count.
 2022-05-30 06:31:07 -04:00
Snakes 81e19b1aed Add can_gamble user setting. 
Users now have a toggleable can_gamble setting which disables their
ability to use all chance-based gains on the site: viz. slots,
blackjack, the lottery, and treasure chests.

This only applies on invocation of commands that start gambling
games, so it should cause no bugs when toggled with e.g. active
blackjack games.

This was added for the benefit of users with actual problems with
gambling, be they past addiction or religious conviction. All future
gambling features are humbly requested to respect it.
 2022-05-30 05:32:45 -04:00
Snakes 15d2be85f2 Remove delayed color change on voting. 2022-05-30 04:52:33 -04:00
Snakes 3106823511 Rearrange nav icons, move some to sidebar. 
After the recent addition of the Lottershe, some narrow phone screens
caused the header to wrap to two lines. Prompted by this, a more
general rework of the header nav icons was initiated.

Notably: random user, random post, all comments has been moved to
sidebar on all sites, and a .sidebar-link CSS class was created to
support it. Additionally, on rDrama, links for Badges and Marseys
were added, since I believe these are presently inaccessible from
the UI. Further, a Modlog link was added to be more accessible.

Additionally, the icons in the header were rearranged on desktop and
mobile to better fit relative priority.
 2022-05-30 04:16:03 -04:00
outruncolors 4bbe567125 Reintroduce bootstrap title styling (#294) 2022-05-30 02:03:41 -04:00
Nekobit b5533c6f4a Design improvements take 2 + Scroll to top (#291) 
* fuck u bootstrap

* cleanup

* Improve CSS

* Vote and reply animations

* Fixse

* Fix bugs and add scroll to top thing

* Update themes and sidebar and stuff and such

* Fix mobile arrows

* soy blur

* Fix dramlr or dramalr or tumblr or whatever its called
 2022-05-30 01:36:06 -04:00
Snakes 5b6ba1ac82 Merge remote-tracking branch 'mccoxmaul/add-lottershe' into frost 2022-05-29 23:52:04 -04:00
Outrun Colors, LLC b9dc28e6d1 Don't show lotteries on the sister sites 2022-05-29 20:43:16 -05:00
Outrun Colors, LLC a0cc7e1cf6 Move more stuff to proper location 2022-05-29 19:49:14 -05:00
Aevann1 eafa2a2b0a Revert "Bigly UI improvements (#290)" 
This reverts commit c081c2bec2.
 2022-05-29 11:13:20 +02:00
Snakes 0a73083e8a Add settings toggle for UI animations. 2022-05-29 03:08:28 -04:00
Snakes 0aafd810a2 assetcache: Add dynamic file parameter, apply more. 
Assetcache macro improvement: to support assets in folders which are
dynamically referenced by e.g. ID or name, the `asset` macro now
accepts an optional second parameter to be included in the path but
not to be used for versioning the class of assets.

To support recent commits, assetcache now applies for:
  - images/badges/*.webp
  - js/: award_modal.js, bootstrap.js, header.js
 2022-05-29 00:52:40 -04:00
Nekobit c081c2bec2 Bigly UI improvements (#290) 
* fuck u bootstrap

* cleanup

* Improve CSS

* Vote and reply animations
 2022-05-29 00:28:36 -04:00
Outrun Colors, LLC 422ba56b31 Add assets for lottery 2022-05-28 17:24:21 -05:00
Aevann1 0352f6a626 sfd 2022-05-28 19:35:21 +02:00
Aevann1 9c9ffdfd7a vcx 2022-05-27 19:05:07 +02:00
Aevann1 d4f7f5497b fds 2022-05-26 22:49:36 +02:00
Aevann1 e4893c617e fd 2022-05-26 02:54:05 +02:00
Aevann1 27a94797cf fsd 2022-05-25 23:43:30 +02:00
Aevann1 7ff300d0c6 fds 2022-05-25 23:42:50 +02:00
Aevann1 50b995d3a0 fds 2022-05-25 22:16:26 +02:00
Aevann1 c8efa3ade1 sfd 2022-05-25 21:31:39 +02:00
Aevann1 49c53cb2ff fds 2022-05-25 20:59:24 +02:00
Snakes bb40bc1c53 User counter: move to sidebar, add flavor. 
After much debate, the user counter will remain in the top banner for
all non-rDrama sites using the codebase, while on rDrama the journoid
banner will remain there and the counter has been moved back to the
sidebar. This partially reverts some recent commits.

In addition to the sidebar move, the rDrama user counter now has
random flavor text, much as reddit sidebars do, though ours is
cooler because it can randomly select from a list.
 2022-05-24 23:37:25 -04:00
Aevann1 4e4f667387 journoid 2022-05-25 03:14:18 +02:00
Aevann1 63914d974b Revert "Respect newtab setting for header menu." 
This reverts commit 4847000f67.
 2022-05-24 18:55:24 +02:00
Snakes 4847000f67 Respect newtab setting for header menu. 
Fixes https://rdrama.net/post/18459/-/1969386
The appropriate internal links--viz. profile, settings, changelogs,
bug reporting, discord, archives, and contact--in the header menu
respect the User.newtab setting to open internal links in new tabs.
 2022-05-23 02:06:54 -04:00
Snakes cc75375c82 Un-deploy Birthgay event. 
Removes temporary changes for the Birthgay 2022 event, ending
approximately at 2022-05-23 0600Z. Changes:
 - Double XP disabled.
 - Lootboxes disabled.
 - Three event awards given real descriptions and colors.
 - Partyhats: restored to cakeday-only condition and tooltip.
 - Header UI: balloons removed, text visibility outline removed,
   journoid banner reverted, marseyjam as header icon.
 - Birthgay banners: removed from template, moved to new storage dir.

Confetti, though remaining as a permanent award, has been temporarily
removed pending a less performance-intensive implementation and one
that doesn't require maintaining a third-party package in the codebase.
 2022-05-23 01:48:25 -04:00
Aevann1 20cc20d806 fsd 2022-05-21 14:36:22 +02:00
Aevann1 aed84df4ad fsd 2022-05-20 20:45:12 +02:00
Aevann1 301f134309 fds 2022-05-20 18:02:27 +02:00
Aevann1 a83a72ca95 fsd 2022-05-20 16:51:14 +02:00
Aevann1 f4ac063354 sfd 2022-05-20 16:48:13 +02:00
Snakes ee8c54a8d4 Replace journoid w b-day message, h/t @nekobbbbbbit 2022-05-19 18:48:55 -04:00
Aevann1 f4d5998e80 fsd 2022-05-20 00:38:03 +02:00
Aevann1 c093d8cbb1 fsd 2022-05-20 00:33:53 +02:00
Snakes c789f6923e Merge remote-tracking branch 'upstream/frost' into birthgay-staging 2022-05-19 17:59:35 -04:00
Snakes b09cad1a84 Swap header icon to :marseyparty:. 2022-05-19 17:16:07 -04:00
Snakes 38680fd38c Fix user popovers failing from early bs_trigger. 
Very strange bug, and I hope this fixes it. User popovers, e.g. on
comments pages when names are clicked, spontaneously stopped working
on my local instance. This parallels occasional reports from others
that their popovers stop working for seemingly no reason.

The primary symptom appeared to be in comments+submission_listing.js
@ popclick(...), which became unable to find any `.popover` elements
in the document, resulting in a console error. Running `bs_trigger(
document)` manually in console after page load always fixed this.
As such, I am assuming this is (hopefully) a timing bug from the
bs_trigger call in header.js running before document ready. The call
now runs on a standard document ready callback boilerplate.
May God have mercy on our souls if this doesn't fix it.
I discovered that running `bs_trigger(document)`
 2022-05-18 01:46:14 -04:00
Aevann1 c0461f4554 fdsdf 2022-05-09 14:13:38 +02:00
Aevann1 557754d0c3 fsd 2022-05-08 07:56:57 +02:00
Aevann1 6b10d097a2 mn 2022-05-05 01:09:46 +02:00
Aevann1 cd78de4d0b sdf 2022-05-02 21:11:03 +02:00
Aevann1 93ab0a1365 dfg 2022-05-02 21:10:49 +02:00
Aevann1 53ac9ab777 dfs 2022-05-02 03:06:20 +02:00
Aevann1 6b3987299c sdf 2022-05-02 02:41:00 +02:00
Aevann1 14ffac7db0 fsd 2022-05-02 02:02:31 +02:00
Aevann1 f3983ab491 sdf 2022-05-02 02:02:19 +02:00
Aevann1 ecf20686bb jg 2022-05-02 01:51:47 +02:00
Aevann1 bc2a20cd4b sfd 2022-05-01 23:44:38 +02:00
Aevann1 ebba5fd9b3 gdf 2022-04-29 15:36:33 +02:00
TLSM 3e8e299fb8 Add dynamic journoid banner text. (#232) 
The .srd header banner currently has fixed text. However, there have
been many gayops which have made the news. journoid_banner.html is a
dynamic template which selects a random one to present.

Also, stylesheets and markup for the banner have been unslurred.
 2022-04-28 23:58:41 +02:00
Aevann1 be32f091bc dsf 2022-04-28 03:38:17 +02:00
Aevann1 8ae52ed35b dsf 2022-04-28 02:45:49 +02:00
Aevann1 3061801270 fds 2022-04-28 02:44:38 +02:00
Aevann1 47fd1afa91 sfd' 2022-04-28 02:37:12 +02:00
Aevann1 d961ffc913 fds 2022-04-28 02:04:01 +02:00
Aevann1 50022797a7 fds 2022-04-27 16:29:32 +02:00
gooseman 967b1b5141 make logo not giant lol 2022-04-26 17:25:06 -04:00
Aevann1 5a49be1d47 fsd 2022-04-26 15:40:37 +02:00
Aevann1 79c6630285 gf 2022-04-26 15:28:35 +02:00
Aevann1 1f7d343ff6 sfd 2022-04-26 00:45:05 +02:00
Aevann1 2d1d946919 vxc 2022-04-26 00:41:34 +02:00
Aevann1 5d8fdef38c fsd 2022-04-26 00:36:47 +02:00
Aevann1 72346b4e88 fsd 2022-04-26 00:35:27 +02:00
Aevann1 18acaa8dd1 nv 2022-04-26 00:29:35 +02:00
Aevann1 0f05bf3f94 fsd 2022-04-26 00:28:20 +02:00
Aevann1 b554065c49 vcx 2022-04-24 19:30:05 +02:00
Aevann1 e384356b33 fsd 2022-04-22 21:41:37 +02:00
Aevann1 d5453085a4 fds 2022-04-22 21:26:49 +02:00
Aevann1 d97343c5be fsd 2022-04-22 21:24:28 +02:00
Aevann1 6b02d11238 sfd 2022-04-22 21:23:38 +02:00
Aevann1 e391ef7a29 fds 2022-04-22 21:22:11 +02:00
Aevann1 9f3654cfbe fds 2022-04-21 00:19:43 +02:00
Aevann1 f3743d717d fds 2022-04-18 23:11:30 +02:00
Aevann1 8d268268f1 fds 2022-04-18 19:20:10 +02:00
Aevann1 d7fa942d85 fds 2022-04-18 18:01:03 +02:00
Aevann1 0f05a76522 fds 2022-04-18 00:16:02 +02:00
Aevann1 8214e2c6f9 fds 2022-04-18 00:13:37 +02:00
Aevann1 10984dc92c fds 2022-04-17 22:29:14 +02:00
Aevann1 264528c72c cxcxc 2022-04-17 22:28:11 +02:00
Aevann1 456b9af099 fds 2022-04-17 22:26:45 +02:00
Aevann1 5de173b73d fd 2022-04-17 17:47:56 +02:00
Aevann1 2bff85b439 fds 2022-04-17 11:11:19 +02:00
Aevann1 39c374a90d fds 2022-04-17 00:42:12 +02:00
Aevann1 2d45a66739 fdsfd 2022-04-16 17:25:17 +02:00
Aevann1 7047953ce7 fdsdfs 2022-04-16 00:39:17 +02:00
Aevann1 4ca5c7a0d8 fsd 2022-04-09 19:32:38 +02:00
Aevann1 817990c495 fsd 2022-04-05 15:36:58 +02:00
Aevann1 0456984a9f fds 2022-04-04 22:11:25 +02:00
Aevann1 864fc7d950 fsd 2022-04-04 21:21:33 +02:00
Aevann1 41611928ce sf 2022-04-03 20:14:21 +02:00
Aevann1 724ef551fd dgf 2022-04-03 20:12:37 +02:00
Aevann1 2d177ed1d8 spaghetti 2022-04-03 20:01:11 +02:00
Aevann1 b4c5159325 sfd 2022-04-03 14:57:46 +02:00
Aevann1 b7696cd52e gd 2022-04-03 14:53:23 +02:00
Aevann1 e471b7e1ce fds 2022-04-02 19:12:50 +02:00
Aevann1 ae82ada424 fsd 2022-04-02 18:54:27 +02:00
Aevann1 b538d2a24c gdfg 2022-03-31 18:28:53 +02:00
Aevann1 37d5003af4 bbbbbbbbbbbbb 2022-03-27 15:39:21 +02:00
Aevann1 c5304b1c69 fsd 2022-03-26 01:01:17 +02:00
Aevann1 7ec16168de v 2022-03-26 00:59:13 +02:00