diff options
| author | Wouter Admiraal <wouter.admiraal@sonarsource.com> | 2019-07-17 08:56:19 +0200 |
|---|---|---|
| committer | SonarTech <sonartech@sonarsource.com> | 2019-08-02 20:21:14 +0200 |
| commit | 96f2fc0ce3ef6440fda4d34f46b2ebb3b6f0381f (patch) | |
| tree | 9134d6dc8b937956ef226e3ab9f0c73d33d28705 /server/sonar-web | |
| parent | 2d657c536a506e925f99a79dfb4843f58bbc9422 (diff) | |
| download | sonarqube-96f2fc0ce3ef6440fda4d34f46b2ebb3b6f0381f.tar.gz sonarqube-96f2fc0ce3ef6440fda4d34f46b2ebb3b6f0381f.zip | |
SONAR-12290 Only activate modal scrolling when necessary
Diffstat (limited to 'server/sonar-web')
2 files changed, 3 insertions, 2 deletions
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/ActivationFormModal.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/ActivationFormModal.tsx index 8756fc7b5d2..3ed11549fe2 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/ActivationFormModal.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/ActivationFormModal.tsx @@ -17,6 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +import * as classNames from 'classnames'; import * as React from 'react'; import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; import Modal from 'sonar-ui-common/components/controls/Modal'; @@ -159,7 +160,7 @@ export default class ActivationFormModal extends React.PureComponent<Props, Stat <h2>{this.props.modalHeader}</h2> </div> - <div className="modal-body modal-container"> + <div className={classNames('modal-body', { 'modal-container': params.length > 0 })}> {!isUpdateMode && activeInAllProfiles && ( <Alert variant="info">{translate('coding_rules.active_in_all_profiles')}</Alert> )} diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/__snapshots__/ActivationFormModal-test.tsx.snap b/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/__snapshots__/ActivationFormModal-test.tsx.snap index 2507c2d70c1..2225b883507 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/__snapshots__/ActivationFormModal-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/__snapshots__/ActivationFormModal-test.tsx.snap @@ -17,7 +17,7 @@ exports[`render correctly 1`] = ` </h2> </div> <div - className="modal-body modal-container" + className="modal-body" > <Alert variant="info" |