diff --git a/app/soapbox/actions/moderation.js b/app/soapbox/actions/moderation.js index 3cdf076df1..cc05bd9055 100644 Binary files a/app/soapbox/actions/moderation.js and b/app/soapbox/actions/moderation.js differ diff --git a/app/soapbox/features/admin/moderation_log.js b/app/soapbox/features/admin/moderation_log.js index e84fd6ed68..853cb9c1e1 100644 Binary files a/app/soapbox/features/admin/moderation_log.js and b/app/soapbox/features/admin/moderation_log.js differ diff --git a/app/soapbox/features/ui/components/confirmation_modal.js b/app/soapbox/features/ui/components/confirmation_modal.js index d4caac3cd8..4c7a911452 100644 Binary files a/app/soapbox/features/ui/components/confirmation_modal.js and b/app/soapbox/features/ui/components/confirmation_modal.js differ diff --git a/app/soapbox/reducers/admin_log.js b/app/soapbox/reducers/admin_log.js new file mode 100644 index 0000000000..874cab3734 Binary files /dev/null and b/app/soapbox/reducers/admin_log.js differ diff --git a/app/soapbox/reducers/index.js b/app/soapbox/reducers/index.js index e8cb4821b9..45ab583d06 100644 Binary files a/app/soapbox/reducers/index.js and b/app/soapbox/reducers/index.js differ diff --git a/app/soapbox/utils/accounts.js b/app/soapbox/utils/accounts.js index 929429b240..acc4cde653 100644 Binary files a/app/soapbox/utils/accounts.js and b/app/soapbox/utils/accounts.js differ diff --git a/app/styles/components/admin.scss b/app/styles/components/admin.scss index db09ed55f6..f8a5628344 100644 --- a/app/styles/components/admin.scss +++ b/app/styles/components/admin.scss @@ -214,4 +214,10 @@ .logentry { padding: 15px; + + &__timestamp { + color: var(--primary-text-color--faint); + font-size: 13px; + text-align: right; + } } diff --git a/app/styles/components/modal.scss b/app/styles/components/modal.scss index 44f32c6868..e64965da47 100644 --- a/app/styles/components/modal.scss +++ b/app/styles/components/modal.scss @@ -393,6 +393,23 @@ .button { flex: 0 0 auto; + display: flex; + align-items: center; + justify-content: center; + + .submit__favicon { + width: 16px; + height: 16px; + margin-right: 8px; + display: flex; + align-items: center; + justify-content: center; + + img { + width: 100%; + max-height: 100%; + } + } } } @@ -604,6 +621,21 @@ } } } + + .account { + text-align: left; + background-color: var(--background-color); + border-radius: 4px; + margin-bottom: 16px; + } +} + +.confirmation-modal__checkbox { + padding: 0 30px; + + .simple_form { + margin-top: -14px; + } } .report-modal__target {