diff --git a/src/api/utils/ColorUtils.ts b/src/api/utils/ColorUtils.ts index ccb6e27a..126d271d 100644 --- a/src/api/utils/ColorUtils.ts +++ b/src/api/utils/ColorUtils.ts @@ -7,7 +7,16 @@ export class ColorUtils public static makeColorNumberHex(color: number): string { - return ( '#' + color.toString(16)); + let val = color.toString(16); + if(val.length < 6) + { + const diff = 6 - val.length; + for(let i = 0; i < diff; i++) + { + val = '0' + val; + } + } + return ( '#' + val); } public static convertFromHex(color: string): number diff --git a/src/assets/images/notifications/frank.gif b/src/assets/images/notifications/frank.gif new file mode 100644 index 00000000..211634f7 Binary files /dev/null and b/src/assets/images/notifications/frank.gif differ diff --git a/src/assets/styles/bootstrap/_reboot.scss b/src/assets/styles/bootstrap/_reboot.scss index 7abee7e0..4345886d 100644 --- a/src/assets/styles/bootstrap/_reboot.scss +++ b/src/assets/styles/bootstrap/_reboot.scss @@ -65,7 +65,7 @@ body { hr { margin: $hr-margin-y 0; color: $hr-color; // 1 - background-color: currentColor; + background-color: rgba(black,.2); border: 0; opacity: $hr-opacity; } diff --git a/src/common/index.scss b/src/common/index.scss index e6740af7..f143ea85 100644 --- a/src/common/index.scss +++ b/src/common/index.scss @@ -193,7 +193,7 @@ .nitro-alert { width: 350px; min-height: 150px; - max-height: 350px; + max-height: 550px; } .nitro-notification-bubble { diff --git a/src/common/layout/LayoutNotificationAlertView.tsx b/src/common/layout/LayoutNotificationAlertView.tsx index b534d37d..4f1a11a0 100644 --- a/src/common/layout/LayoutNotificationAlertView.tsx +++ b/src/common/layout/LayoutNotificationAlertView.tsx @@ -23,7 +23,7 @@ export const LayoutNotificationAlertView: FC = return ( - + { children } diff --git a/src/components/mod-tools/views/user/ModToolsUserModActionView.tsx b/src/components/mod-tools/views/user/ModToolsUserModActionView.tsx index 8700bd54..e460cceb 100644 --- a/src/components/mod-tools/views/user/ModToolsUserModActionView.tsx +++ b/src/components/mod-tools/views/user/ModToolsUserModActionView.tsx @@ -15,8 +15,8 @@ interface ModToolsUserModActionViewProps const MOD_ACTION_DEFINITIONS = [ new ModActionDefinition(1, 'Alert', ModActionDefinition.ALERT, 1, 0), new ModActionDefinition(2, 'Mute 1h', ModActionDefinition.MUTE, 2, 0), - new ModActionDefinition(4, 'Ban 7 days', ModActionDefinition.BAN, 4, 0), new ModActionDefinition(3, 'Ban 18h', ModActionDefinition.BAN, 3, 0), + new ModActionDefinition(4, 'Ban 7 days', ModActionDefinition.BAN, 4, 0), new ModActionDefinition(5, 'Ban 30 days (step 1)', ModActionDefinition.BAN, 5, 0), new ModActionDefinition(7, 'Ban 30 days (step 2)', ModActionDefinition.BAN, 7, 0), new ModActionDefinition(6, 'Ban 100 years', ModActionDefinition.BAN, 6, 0), @@ -98,14 +98,7 @@ export const ModToolsUserModActionView: FC = pro return; } - if(message.trim().length === 0) - { - sendAlert('Please write a message to user'); - - return; - } - - SendMessageComposer(new ModAlertMessageComposer(user.userId, message, category.id)); + SendMessageComposer(new ModAlertMessageComposer(user.userId, messageOrDefault, category.id)); break; } case ModActionDefinition.MUTE: @@ -172,9 +165,9 @@ export const ModToolsUserModActionView: FC = pro Optional message type, overrides default