edshot99/eBooru
1
0
Fork 0
forked from e621ng/e621ng
Code Issues 11 Releases 1 Activity

Merge branch 'master' into master2

Browse Source
This commit is contained in:
edshot99 2025-02-06 12:53:56 -06:00
commit f705938b8d
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/src/styles/common/navigation.scss
View File

@ -389,6 +389,7 @@ nav.navigation, html.nav-toggled nav.navigation {
background: unset; background: unset;
height: unset; height: unset;
padding-left: 0.25rem; padding-left: 0.25rem;
overflow-y: unset;
li a { li a {
border-bottom: 0; border-bottom: 0;
@ -401,6 +402,7 @@ nav.navigation, html.nav-toggled nav.navigation {
padding: 0 0.25rem; padding: 0 0.25rem;
border-radius: 0.25rem 0 0 0.25rem; border-radius: 0.25rem 0 0 0.25rem;
overflow-y: unset;
overflow: hidden; // Silly fix for too many links overflow: hidden; // Silly fix for too many links
z-index: 1; // above the avatar z-index: 1; // above the avatar

3
db/fixes/123_convert_staffnote_to_deleted_feedback.rb
View File

@ -16,6 +16,9 @@ CurrentUser.as_system do
record_id = mod_action.values["record_id"].to_i record_id = mod_action.values["record_id"].to_i
destroyed_feedback_ids << record_id destroyed_feedback_ids << record_id
# old mod actions do not contain the necessary information. we skip them.
next if mod_action.values["type"].nil? || mod_action.values["reason"].nil?
{ {
id: record_id, id: record_id,
user_id: mod_action.values["user_id"].to_i, user_id: mod_action.values["user_id"].to_i,