mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-10 15:35:49 +01:00
Fix layout overflow on changesets with multiple tags
This commit is contained in:
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
- JWT token timeout is now handled properly ([#1297](https://github.com/scm-manager/scm-manager/pull/1297))
|
- 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))
|
- Fix text-overflow in danger zone ([#1298](https://github.com/scm-manager/scm-manager/pull/1298))
|
||||||
- Fix plugin installation error if previously a plugin was installed with the same dependency which is still pending. ([#1300](https://github.com/scm-manager/scm-manager/pull/1300))
|
- Fix plugin installation error if previously a plugin was installed with the same dependency which is still pending. ([#1300](https://github.com/scm-manager/scm-manager/pull/1300))
|
||||||
|
- Fix layout overflow on changesets with multiple tags ([#1314](https://github.com/scm-manager/scm-manager/pull/1314))
|
||||||
|
|
||||||
## [2.4.0] - 2020-08-14
|
## [2.4.0] - 2020-08-14
|
||||||
### Added
|
### Added
|
||||||
|
|||||||
@@ -22,12 +22,12 @@
|
|||||||
* SOFTWARE.
|
* SOFTWARE.
|
||||||
*/
|
*/
|
||||||
import React, { ReactNode } from "react";
|
import React, { ReactNode } from "react";
|
||||||
import classNames from "classnames";
|
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
message: string;
|
message: string;
|
||||||
className?: string;
|
className?: string;
|
||||||
location: string;
|
location: string;
|
||||||
|
multiline?: boolean;
|
||||||
children: ReactNode;
|
children: ReactNode;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -37,9 +37,17 @@ class Tooltip extends React.Component<Props> {
|
|||||||
};
|
};
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
const { className, message, location, children } = this.props;
|
const { className, message, location, multiline, children } = this.props;
|
||||||
|
let classes = `tooltip has-tooltip-${location}`;
|
||||||
|
if (multiline) {
|
||||||
|
classes += " has-tooltip-multiline";
|
||||||
|
}
|
||||||
|
if (className) {
|
||||||
|
classes += " " + className;
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<span className={classNames("tooltip", "has-tooltip-" + location, className)} data-tooltip={message}>
|
<span className={classes} data-tooltip={message}>
|
||||||
{children}
|
{children}
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ class ChangesetTagsCollapsed extends React.Component<Props> {
|
|||||||
const { tags, t } = this.props;
|
const { tags, t } = this.props;
|
||||||
const message = tags.map(tag => tag.name).join(", ");
|
const message = tags.map(tag => tag.name).join(", ");
|
||||||
return (
|
return (
|
||||||
<Tooltip location="top" message={message}>
|
<Tooltip location="top" message={message} multiline={true}>
|
||||||
<ChangesetTagBase icon="tags" label={tags.length + " " + t("changeset.tags")} />
|
<ChangesetTagBase icon="tags" label={tags.length + " " + t("changeset.tags")} />
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ import { Trans, useTranslation, WithTranslation, withTranslation } from "react-i
|
|||||||
import classNames from "classnames";
|
import classNames from "classnames";
|
||||||
import styled from "styled-components";
|
import styled from "styled-components";
|
||||||
import { ExtensionPoint } from "@scm-manager/ui-extensions";
|
import { ExtensionPoint } from "@scm-manager/ui-extensions";
|
||||||
import { Changeset, ParentChangeset, Repository, Tag } from "@scm-manager/ui-types";
|
import { Changeset, ParentChangeset, Repository } from "@scm-manager/ui-types";
|
||||||
import {
|
import {
|
||||||
AvatarImage,
|
AvatarImage,
|
||||||
AvatarWrapper,
|
AvatarWrapper,
|
||||||
@@ -36,14 +36,15 @@ import {
|
|||||||
ChangesetDiff,
|
ChangesetDiff,
|
||||||
ChangesetId,
|
ChangesetId,
|
||||||
changesets,
|
changesets,
|
||||||
ChangesetTag,
|
ChangesetTags,
|
||||||
DateFromNow,
|
DateFromNow,
|
||||||
|
FileControlFactory,
|
||||||
Icon,
|
Icon,
|
||||||
Level
|
Level,
|
||||||
|
SignatureIcon
|
||||||
} from "@scm-manager/ui-components";
|
} from "@scm-manager/ui-components";
|
||||||
import ContributorTable from "./ContributorTable";
|
import ContributorTable from "./ContributorTable";
|
||||||
import { Link as ReactLink } from "react-router-dom";
|
import { Link as ReactLink } from "react-router-dom";
|
||||||
import { FileControlFactory, SignatureIcon } from "@scm-manager/ui-components";
|
|
||||||
|
|
||||||
type Props = WithTranslation & {
|
type Props = WithTranslation & {
|
||||||
changeset: Changeset;
|
changeset: Changeset;
|
||||||
@@ -59,16 +60,6 @@ const RightMarginP = styled.p`
|
|||||||
margin-right: 1em;
|
margin-right: 1em;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const TagsWrapper = styled.div`
|
|
||||||
& .tag {
|
|
||||||
margin-left: 0.25rem;
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
const SignedIcon = styled(SignatureIcon)`
|
|
||||||
padding-left: 1rem;
|
|
||||||
`;
|
|
||||||
|
|
||||||
const BottomMarginLevel = styled(Level)`
|
const BottomMarginLevel = styled(Level)`
|
||||||
margin-bottom: 1rem !important;
|
margin-bottom: 1rem !important;
|
||||||
`;
|
`;
|
||||||
@@ -224,7 +215,9 @@ class ChangesetDetails extends React.Component<Props, State> {
|
|||||||
)}
|
)}
|
||||||
</ChangesetSummary>
|
</ChangesetSummary>
|
||||||
</div>
|
</div>
|
||||||
<div className="media-right">{this.renderTags()}</div>
|
<div className="media-right">
|
||||||
|
<ChangesetTags changeset={changeset} />
|
||||||
|
</div>
|
||||||
</article>
|
</article>
|
||||||
<p>
|
<p>
|
||||||
{description.message.split("\n").map((item, key) => {
|
{description.message.split("\n").map((item, key) => {
|
||||||
@@ -264,24 +257,6 @@ class ChangesetDetails extends React.Component<Props, State> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
getTags = () => {
|
|
||||||
return this.props.changeset._embedded.tags || [];
|
|
||||||
};
|
|
||||||
|
|
||||||
renderTags = () => {
|
|
||||||
const tags = this.getTags();
|
|
||||||
if (tags.length > 0) {
|
|
||||||
return (
|
|
||||||
<TagsWrapper className="level-item">
|
|
||||||
{tags.map((tag: Tag) => {
|
|
||||||
return <ChangesetTag key={tag.name} tag={tag} />;
|
|
||||||
})}
|
|
||||||
</TagsWrapper>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
};
|
|
||||||
|
|
||||||
collapseDiffs = () => {
|
collapseDiffs = () => {
|
||||||
this.setState(state => ({
|
this.setState(state => ({
|
||||||
collapsed: !state.collapsed
|
collapsed: !state.collapsed
|
||||||
|
|||||||
Reference in New Issue
Block a user