diff --git a/CHANGELOG.md b/CHANGELOG.md index de9cd21a47..6b9b95c35a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased ### Fixed - JWT token timeout is now handled properly ([#1297](https://github.com/scm-manager/scm-manager/pull/1297)) +- Fix text-overflow in danger zone ([#1298](https://github.com/scm-manager/scm-manager/pull/1298)) ## [2.4.0] - 2020-08-14 ### Added diff --git a/pom.xml b/pom.xml index 189584d1fd..f78accff67 100644 --- a/pom.xml +++ b/pom.xml @@ -915,7 +915,7 @@ 2.1.1 4.5.6.Final 1.19.4 - 2.11.1 + 2.11.2 4.2.3 2.3.3 6.1.5.Final diff --git a/scm-ui/ui-webapp/src/repos/containers/DangerZone.tsx b/scm-ui/ui-webapp/src/repos/containers/DangerZone.tsx index 5fb14e4557..3844717487 100644 --- a/scm-ui/ui-webapp/src/repos/containers/DangerZone.tsx +++ b/scm-ui/ui-webapp/src/repos/containers/DangerZone.tsx @@ -36,9 +36,20 @@ type Props = { }; const DangerZoneContainer = styled.div` - padding: 1rem; + padding: 1.5rem 1rem; border: 1px solid #ff6a88; border-radius: 5px; + > .level { + flex-flow: wrap; + + .level-left { + max-width: 100%; + } + + .level-right { + margin-top: 0.75rem; + } + } > *:not(:last-child) { padding-bottom: 1.5rem; border-bottom: solid 2px whitesmoke; diff --git a/scm-ui/ui-webapp/src/repos/containers/DeleteRepo.tsx b/scm-ui/ui-webapp/src/repos/containers/DeleteRepo.tsx index 8585e98466..23f6ea10a5 100644 --- a/scm-ui/ui-webapp/src/repos/containers/DeleteRepo.tsx +++ b/scm-ui/ui-webapp/src/repos/containers/DeleteRepo.tsx @@ -26,9 +26,8 @@ import { connect } from "react-redux"; import { compose } from "redux"; import { RouteComponentProps, withRouter } from "react-router-dom"; import { WithTranslation, withTranslation } from "react-i18next"; -import { History } from "history"; import { Repository } from "@scm-manager/ui-types"; -import { confirmAlert, DeleteButton, ErrorNotification, Level, ButtonGroup } from "@scm-manager/ui-components"; +import { confirmAlert, DeleteButton, ErrorNotification, Level } from "@scm-manager/ui-components"; import { deleteRepo, getDeleteRepoFailure, isDeleteRepoPending } from "../modules/repos"; type Props = RouteComponentProps & @@ -89,10 +88,11 @@ class DeleteRepo extends React.Component { +

{t("deleteRepo.subtitle")} -

{t("deleteRepo.description")}

- +
+ {t("deleteRepo.description")} +

} right={} /> diff --git a/scm-ui/ui-webapp/src/repos/containers/RenameRepository.tsx b/scm-ui/ui-webapp/src/repos/containers/RenameRepository.tsx index ede6414029..9254774a6d 100644 --- a/scm-ui/ui-webapp/src/repos/containers/RenameRepository.tsx +++ b/scm-ui/ui-webapp/src/repos/containers/RenameRepository.tsx @@ -38,7 +38,7 @@ type Props = { }; const RenameRepository: FC = ({ repository, indexLinks }) => { - let history = useHistory(); + const history = useHistory(); const [t] = useTranslation("repos"); const [error, setError] = useState(undefined); const [loading, setLoading] = useState(false); @@ -156,10 +156,11 @@ const RenameRepository: FC = ({ repository, indexLinks }) => { /> +

{t("renameRepo.subtitle")} -

{t("renameRepo.description")}

- +
+ {t("renameRepo.description")} +

} right={