From 1ac8922013b90ef210ee5168bd92287feb082ab6 Mon Sep 17 00:00:00 2001 From: Kris Date: Fri, 23 Feb 2024 09:14:37 -0500 Subject: [PATCH] DEV: update classes, remove unused CSS (#25825) --- .../stylesheets/common/admin/customize.scss | 2 +- .../stylesheets/common/base/directory.scss | 7 +- .../stylesheets/common/base/history.scss | 3 +- app/assets/stylesheets/common/base/login.scss | 19 ------ app/assets/stylesheets/common/base/modal.scss | 53 --------------- .../common/base/topic-admin-menu.scss | 27 -------- .../components/add-pm-participants.scss | 13 ---- .../table-builder/insert-table-modal.scss | 5 +- app/assets/stylesheets/desktop/discourse.scss | 8 --- app/assets/stylesheets/desktop/modal.scss | 10 --- .../stylesheets/mobile/invite-signup.scss | 3 +- app/assets/stylesheets/mobile/modal.scss | 68 +------------------ 12 files changed, 6 insertions(+), 212 deletions(-) diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss index a42cb459ce4..e5d0b12d485 100644 --- a/app/assets/stylesheets/common/admin/customize.scss +++ b/app/assets/stylesheets/common/admin/customize.scss @@ -1127,7 +1127,7 @@ table.permalinks { } .customize-form-template-view-modal { - .modal-footer { + .d-modal__footer { .btn:last-child { margin-left: auto; } diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss index 56006ddac65..7272428f82b 100644 --- a/app/assets/stylesheets/common/base/directory.scss +++ b/app/assets/stylesheets/common/base/directory.scss @@ -70,13 +70,8 @@ } } } - .modal-footer { - display: flex; + .d-modal__footer { justify-content: space-between; - - .reset-to-default { - margin-right: 0; - } } } diff --git a/app/assets/stylesheets/common/base/history.scss b/app/assets/stylesheets/common/base/history.scss index 513a9399392..35f62b4842e 100644 --- a/app/assets/stylesheets/common/base/history.scss +++ b/app/assets/stylesheets/common/base/history.scss @@ -15,8 +15,7 @@ min-height: 65dvh; } - .modal-footer { - gap: 0.5em; + .d-modal__footer { justify-content: space-between; } diff --git a/app/assets/stylesheets/common/base/login.scss b/app/assets/stylesheets/common/base/login.scss index cd1dc95f8fc..527bb4ca4e3 100644 --- a/app/assets/stylesheets/common/base/login.scss +++ b/app/assets/stylesheets/common/base/login.scss @@ -8,20 +8,6 @@ body.invite-page { .invites-show, .admin-invite-page { - .modal-inner-container { - position: relative; - } - .modal-body { - padding: 0; - } - .modal-header { - border-bottom: none; - padding: 0; - position: absolute; - top: 0.75em; - right: 0.75em; - z-index: z("max"); - } #modal-alert { box-sizing: border-box; display: inline-block; @@ -38,11 +24,6 @@ body.invite-page { overflow: hidden; display: inline; } - .modal-footer { - .inline-spinner { - display: inline-flex; - } - } } #login-link, diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss index 33ea260c81d..eba1089b76e 100644 --- a/app/assets/stylesheets/common/base/modal.scss +++ b/app/assets/stylesheets/common/base/modal.scss @@ -160,36 +160,6 @@ color: var(--secondary-high); } -.modal-header { - display: flex; - padding: 10px 15px; - border-bottom: 1px solid var(--primary-low); - align-items: center; - - .title { - margin-right: 1em; - - h3 { - margin-bottom: 0; - } - - p { - margin: 0; - } - } - - .modal-close { - order: 2; - margin-left: auto; - align-self: start; - padding: 0.15em 0; - - .close { - color: var(--primary-high); - } - } -} - .modal-backdrop { user-select: none; position: fixed; @@ -262,21 +232,6 @@ margin-bottom: 0; } -.modal-footer { - display: flex; - flex-wrap: wrap; - align-items: center; - padding: 14px 15px 10px; - border-top: 1px solid var(--primary-low); - gap: 0.3em 0; - .btn { - margin: 0 0.75em 0 0; - &[href] { - min-height: unset; - } - } -} - .modal { .nav { padding: 10px 30px 10px 15px; @@ -473,14 +428,6 @@ } } -.delete-user-modal { - .modal-footer { - .btn { - line-height: var(--line-height-medium); - } - } -} - .admin-delete-user-posts-progress-modal { .progress-bar { height: 15px; diff --git a/app/assets/stylesheets/common/base/topic-admin-menu.scss b/app/assets/stylesheets/common/base/topic-admin-menu.scss index a61a85200fe..afafb09ab9b 100644 --- a/app/assets/stylesheets/common/base/topic-admin-menu.scss +++ b/app/assets/stylesheets/common/base/topic-admin-menu.scss @@ -91,33 +91,6 @@ } } -.desktop-view .feature-topic-modal { - .pin-until { - position: relative; - display: inline-block; - } - .modal-inner-container { - overflow: visible; - } - .modal-footer { - background: var(--secondary); - } -} - -.mobile-view .feature-topic .feature-section { - .desc { - display: block; - clear: both; - max-width: 90%; - margin: 0; - } - .badge-category__wrapper { - white-space: nowrap; - overflow: hidden; - max-width: 19em; - } -} - // Select posts .selected-posts { diff --git a/app/assets/stylesheets/common/components/add-pm-participants.scss b/app/assets/stylesheets/common/components/add-pm-participants.scss index 6e8ff3b1401..ea1d713b171 100644 --- a/app/assets/stylesheets/common/components/add-pm-participants.scss +++ b/app/assets/stylesheets/common/components/add-pm-participants.scss @@ -1,16 +1,3 @@ -.add-pm-participants.modal { - .modal-body { - max-width: 475px; - min-width: 320px; - } - - .modal-header { - .modal-close { - padding-left: 0; - } - } -} - .add-pm-participants.modal .share.modal-panel { .header { display: flex; diff --git a/app/assets/stylesheets/common/table-builder/insert-table-modal.scss b/app/assets/stylesheets/common/table-builder/insert-table-modal.scss index 115c212a7c5..e77bcac3481 100644 --- a/app/assets/stylesheets/common/table-builder/insert-table-modal.scss +++ b/app/assets/stylesheets/common/table-builder/insert-table-modal.scss @@ -39,10 +39,7 @@ margin: 0; } - .d-modal__footer, - .modal-footer { - display: flex; - align-items: center; + .d-modal__footer { justify-content: space-between; .primary-actions { diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss index 0820de56626..5e207c37df6 100644 --- a/app/assets/stylesheets/desktop/discourse.scss +++ b/app/assets/stylesheets/desktop/discourse.scss @@ -158,14 +158,6 @@ input { } } -.bootbox.modal { - .modal-footer { - a.btn-primary { - color: var(--secondary); - } - } -} - /* bootstrap columns */ .offset { diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss index 5f673b89a9d..55f7142214a 100644 --- a/app/assets/stylesheets/desktop/modal.scss +++ b/app/assets/stylesheets/desktop/modal.scss @@ -32,16 +32,6 @@ } } -.modal-footer .btn.right { - float: right; -} - -.modal-header { - h3 { - font-size: var(--font-up-3); - } -} - .close { font-size: var(--font-up-3); text-decoration: none; diff --git a/app/assets/stylesheets/mobile/invite-signup.scss b/app/assets/stylesheets/mobile/invite-signup.scss index 97ad228582c..498d2d25d59 100644 --- a/app/assets/stylesheets/mobile/invite-signup.scss +++ b/app/assets/stylesheets/mobile/invite-signup.scss @@ -1,7 +1,6 @@ .invites-show { - width: 100vw; box-sizing: border-box; - padding: 0 1em 1em; + padding: 1em; .invitation-cta { display: flex; diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss index 3e901d58aa7..2e8102cf056 100644 --- a/app/assets/stylesheets/mobile/modal.scss +++ b/app/assets/stylesheets/mobile/modal.scss @@ -51,63 +51,16 @@ } } -// we need a little extra room on mobile for the -// stuff inside the footer to fit -.modal-footer { - padding: 10px; -} - -.modal-header { - padding: 10px; - h3 { - font-size: var(--font-up-2); - } -} - .close { font-size: var(--font-up-4); } -#choosing-topic { - p { - margin-top: 0; - padding-bottom: 0; - } - - input[type="radio"] { - margin-right: 10px; - } - - .category-chooser { - margin-bottom: 9px; - } - - button { - margin-top: 10px; - display: block; - } - - form { - margin-top: 20px; - input:not(.filter-input)[type="text"] { - box-sizing: border-box; - width: 100%; - } - } -} - @media only screen and (max-device-width: 568px) { - .modal .flag-modal-body .flag-message { + .flag-modal-body .flag-message { height: 3em; } } -/* fixes for the new account confirm dialog on mobile */ - -.modal-inner-container { - margin-bottom: 20px; -} - /* fix for tall modals */ .fixed-modal { @@ -131,22 +84,3 @@ } } } - -.modal .modal-body.reorder-categories { - max-height: calc(100vh - 220px); -} - -.discard-draft-modal { - .modal-inner-container { - width: 250px; - } - .modal-footer { - justify-content: center; - flex-flow: column nowrap; - align-items: stretch; - - .btn { - margin-right: 0; - } - } -}