mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-08 14:35:45 +01:00
corrected sizing problems and page breaks on mobile pages
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
//@flow
|
//@flow
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import type { Changeset, Repository } from "@scm-manager/ui-types";
|
import type { Changeset, Repository } from "@scm-manager/ui-types";
|
||||||
import {Button, ButtonAddons} from "../../buttons";
|
import { ButtonAddons, Button } from "../../buttons";
|
||||||
import { createChangesetLink, createSourcesLink } from "./changesets";
|
import { createChangesetLink, createSourcesLink } from "./changesets";
|
||||||
import { translate } from "react-i18next";
|
import { translate } from "react-i18next";
|
||||||
|
|
||||||
@@ -21,7 +21,7 @@ class ChangesetButtonGroup extends React.Component<Props> {
|
|||||||
const sourcesLink = createSourcesLink(repository, changeset);
|
const sourcesLink = createSourcesLink(repository, changeset);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ButtonAddons className="level-item">
|
<ButtonAddons className="is-marginless">
|
||||||
<Button link={changesetLink} className="reduced-mobile">
|
<Button link={changesetLink} className="reduced-mobile">
|
||||||
<span className="icon">
|
<span className="icon">
|
||||||
<i className="fas fa-exchange-alt" />
|
<i className="fas fa-exchange-alt" />
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import injectSheet from "react-jss";
|
|||||||
import { DateFromNow } from "../..";
|
import { DateFromNow } from "../..";
|
||||||
import ChangesetAuthor from "./ChangesetAuthor";
|
import ChangesetAuthor from "./ChangesetAuthor";
|
||||||
import { parseDescription } from "./changesets";
|
import { parseDescription } from "./changesets";
|
||||||
import {AvatarImage, AvatarWrapper} from "../../avatar";
|
import { AvatarWrapper, AvatarImage } from "../../avatar";
|
||||||
import { ExtensionPoint } from "@scm-manager/ui-extensions";
|
import { ExtensionPoint } from "@scm-manager/ui-extensions";
|
||||||
import ChangesetTags from "./ChangesetTags";
|
import ChangesetTags from "./ChangesetTags";
|
||||||
import ChangesetButtonGroup from "./ChangesetButtonGroup";
|
import ChangesetButtonGroup from "./ChangesetButtonGroup";
|
||||||
@@ -26,21 +26,22 @@ const styles = {
|
|||||||
},
|
},
|
||||||
avatarFigure: {
|
avatarFigure: {
|
||||||
marginTop: ".25rem",
|
marginTop: ".25rem",
|
||||||
marginRight: ".5rem",
|
marginRight: ".5rem"
|
||||||
},
|
},
|
||||||
avatarImage: {
|
avatarImage: {
|
||||||
height: "35px",
|
height: "35px",
|
||||||
width: "35px"
|
width: "35px"
|
||||||
},
|
},
|
||||||
isVcentered: {
|
|
||||||
marginTop: "auto",
|
|
||||||
marginBottom: "auto"
|
|
||||||
},
|
|
||||||
metadata: {
|
metadata: {
|
||||||
marginLeft: 0
|
marginLeft: 0
|
||||||
},
|
},
|
||||||
tag: {
|
isVcentered: {
|
||||||
marginTop: ".5rem"
|
alignSelf: "center"
|
||||||
|
},
|
||||||
|
flexVcenter: {
|
||||||
|
display: "flex",
|
||||||
|
alignItems: "center",
|
||||||
|
justifyContent: "flex-end"
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -65,9 +66,10 @@ class ChangesetRow extends React.Component<Props> {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={classes.changeset}>
|
<div className={classes.changeset}>
|
||||||
<div className="columns">
|
<div className="columns is-gapless is-mobile">
|
||||||
<div className="column is-three-fifths">
|
<div className="column is-three-fifths">
|
||||||
|
<div className="columns is-gapless">
|
||||||
|
<div className="column is-four-fifths">
|
||||||
<h4 className="has-text-weight-bold is-ellipsis-overflow">
|
<h4 className="has-text-weight-bold is-ellipsis-overflow">
|
||||||
<ExtensionPoint
|
<ExtensionPoint
|
||||||
name="changeset.description"
|
name="changeset.description"
|
||||||
@@ -77,17 +79,18 @@ class ChangesetRow extends React.Component<Props> {
|
|||||||
{description.title}
|
{description.title}
|
||||||
</ExtensionPoint>
|
</ExtensionPoint>
|
||||||
</h4>
|
</h4>
|
||||||
|
|
||||||
<div className="media">
|
<div className="media">
|
||||||
<AvatarWrapper>
|
<AvatarWrapper>
|
||||||
<figure className={classNames(classes.avatarFigure, "media-left")}>
|
<figure
|
||||||
|
className={classNames(classes.avatarFigure, "media-left")}
|
||||||
|
>
|
||||||
<div className={classNames("image", classes.avatarImage)}>
|
<div className={classNames("image", classes.avatarImage)}>
|
||||||
<AvatarImage person={changeset.author} />
|
<AvatarImage person={changeset.author} />
|
||||||
</div>
|
</div>
|
||||||
</figure>
|
</figure>
|
||||||
</AvatarWrapper>
|
</AvatarWrapper>
|
||||||
<div className={classNames(classes.metadata, "media-right")}>
|
<div className={classNames(classes.metadata, "media-right")}>
|
||||||
<p className="is-hidden-mobile is-hidden-tablet-only">
|
<p className="is-hidden-touch">
|
||||||
<Interpolate
|
<Interpolate
|
||||||
i18nKey="changeset.summary"
|
i18nKey="changeset.summary"
|
||||||
id={changesetId}
|
id={changesetId}
|
||||||
@@ -106,13 +109,17 @@ class ChangesetRow extends React.Component<Props> {
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div className={classNames("column", classes.isVcentered)}>
|
<div className={classNames("column", classes.isVcentered)}>
|
||||||
<ChangesetTags changeset={changeset} />
|
<ChangesetTags changeset={changeset} />
|
||||||
<div className="is-pulled-right level">
|
</div>
|
||||||
<ChangesetButtonGroup repository={repository} changeset={changeset} />
|
</div>
|
||||||
<div className={classes.isVcentered}>
|
</div>
|
||||||
|
<div className={classNames("column", classes.flexVcenter)}>
|
||||||
|
<ChangesetButtonGroup
|
||||||
|
repository={repository}
|
||||||
|
changeset={changeset}
|
||||||
|
/>
|
||||||
<ExtensionPoint
|
<ExtensionPoint
|
||||||
name="changeset.right"
|
name="changeset.right"
|
||||||
props={{ repository, changeset }}
|
props={{ repository, changeset }}
|
||||||
@@ -121,8 +128,6 @@ class ChangesetRow extends React.Component<Props> {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,9 +4,6 @@ import injectSheet from "react-jss";
|
|||||||
import classNames from "classnames";
|
import classNames from "classnames";
|
||||||
|
|
||||||
const styles = {
|
const styles = {
|
||||||
tag: {
|
|
||||||
marginTop: ".5rem"
|
|
||||||
},
|
|
||||||
spacing: {
|
spacing: {
|
||||||
marginRight: ".25rem"
|
marginRight: ".25rem"
|
||||||
}
|
}
|
||||||
@@ -24,7 +21,7 @@ class ChangesetTagBase extends React.Component<Props> {
|
|||||||
render() {
|
render() {
|
||||||
const { icon, label, classes } = this.props;
|
const { icon, label, classes } = this.props;
|
||||||
return (
|
return (
|
||||||
<span className={classNames(classes.tag, "tag", "is-info")}>
|
<span className={classNames("tag", "is-info")}>
|
||||||
<span className={classNames("fa", icon, classes.spacing)} /> {label}
|
<span className={classNames("fa", icon, classes.spacing)} /> {label}
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user