From 8290856a4bdc62dac0366e3e42594c479e93882d Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Thu, 12 Mar 2020 13:17:52 +0100 Subject: [PATCH] FIX: differentiates flag-modal and flag-modal-body (#9187) This was causing body styles to be applied on the whole modal. --- app/assets/javascripts/discourse/templates/modal/flag.hbs | 2 +- app/assets/stylesheets/common/base/modal.scss | 2 +- app/assets/stylesheets/mobile/modal.scss | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/modal/flag.hbs b/app/assets/javascripts/discourse/templates/modal/flag.hbs index b085e8211d5..056f2bc9a3f 100644 --- a/app/assets/javascripts/discourse/templates/modal/flag.hbs +++ b/app/assets/javascripts/discourse/templates/modal/flag.hbs @@ -1,4 +1,4 @@ -{{#d-modal-body class="flag-modal" title=title}} +{{#d-modal-body class="flag-modal-body" title=title}}
{{#flag-selection nameKey=selected.name_key flags=flagsAvailable as |f|}} {{flag-action-type flag=f diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss index a2944531818..90a20854fdf 100644 --- a/app/assets/stylesheets/common/base/modal.scss +++ b/app/assets/stylesheets/common/base/modal.scss @@ -594,7 +594,7 @@ } } -.flag-modal { +.flag-modal-body { max-height: 450px; .flag-action-type-details { width: 100%; diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss index b4328ae7621..36777b0eee8 100644 --- a/app/assets/stylesheets/mobile/modal.scss +++ b/app/assets/stylesheets/mobile/modal.scss @@ -79,7 +79,7 @@ } @media only screen and (max-device-width: 568px) { - .modal .flag-modal .flag-message { + .modal .flag-modal-body .flag-message { height: 3em; } }