diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss index 5d83d6fda5a..b677ff4e909 100644 --- a/app/assets/stylesheets/common/base/modal.scss +++ b/app/assets/stylesheets/common/base/modal.scss @@ -193,6 +193,7 @@ .modal-body { overflow-y: auto; max-height: 400px; + padding: 1em; &.full-height-modal { max-height: calc(100vh - 150px); diff --git a/app/assets/stylesheets/common/base/topic-admin-menu.scss b/app/assets/stylesheets/common/base/topic-admin-menu.scss index eca47e8be01..e6a9f6240c1 100644 --- a/app/assets/stylesheets/common/base/topic-admin-menu.scss +++ b/app/assets/stylesheets/common/base/topic-admin-menu.scss @@ -119,7 +119,6 @@ } .mobile-view .feature-topic .feature-section { - padding: 1em 0.667em; .desc { display: block; clear: both; diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss index 9a74a03e4c0..897319cf0df 100644 --- a/app/assets/stylesheets/desktop/modal.scss +++ b/app/assets/stylesheets/desktop/modal.scss @@ -14,10 +14,6 @@ animation: fade 0.25s; } -.modal-body { - padding: 15px; -} - .modal-footer .btn.right { float: right; } diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss index 51894953915..b4328ae7621 100644 --- a/app/assets/stylesheets/mobile/modal.scss +++ b/app/assets/stylesheets/mobile/modal.scss @@ -15,17 +15,20 @@ width: 100%; } -.modal.fade { - transition: opacity 0.3s linear, top 0.3s ease-out; - top: -25%; -} -.modal.fade.in { - top: 50%; -} -.modal-body { - > * { - box-sizing: border-box; +.modal { + &.fade { + transition: opacity 0.3s linear, top 0.3s ease-out; + top: -25%; + } + &.fade.in { + top: 50%; + } + .modal-body { padding: 0.667em; + > * { + // adding box-sizing: border-box; to .modal-body causes iOS dropdown issues + box-sizing: border-box; + } } } @@ -114,3 +117,7 @@ overflow: auto; } } + +.modal .modal-body.reorder-categories { + max-height: calc(100vh - 220px); +}