aboutsummaryrefslogtreecommitdiff
path: root/FrontEnd/src/pages/timeline
diff options
context:
space:
mode:
Diffstat (limited to 'FrontEnd/src/pages/timeline')
-rw-r--r--FrontEnd/src/pages/timeline/TimelineCard.tsx3
-rw-r--r--FrontEnd/src/pages/timeline/TimelineDeleteDialog.tsx4
-rw-r--r--FrontEnd/src/pages/timeline/TimelinePostContentView.tsx13
3 files changed, 12 insertions, 8 deletions
diff --git a/FrontEnd/src/pages/timeline/TimelineCard.tsx b/FrontEnd/src/pages/timeline/TimelineCard.tsx
index cdc8a5a7..b287c620 100644
--- a/FrontEnd/src/pages/timeline/TimelineCard.tsx
+++ b/FrontEnd/src/pages/timeline/TimelineCard.tsx
@@ -47,7 +47,7 @@ export default function TimelineCard(props: TimelinePageCardProps) {
]);
const content = (
- <div className="cru-primary">
+ <div>
<h3 className="timeline-card-title">
{timeline.title}
<small className="timeline-card-title-name">{timeline.nameV2}</small>
@@ -123,6 +123,7 @@ export default function TimelineCard(props: TimelinePageCardProps) {
return (
<Card
+ color="secondary"
className={`timeline-card timeline-card-${
collapse ? "collapse" : "expand"
}`}
diff --git a/FrontEnd/src/pages/timeline/TimelineDeleteDialog.tsx b/FrontEnd/src/pages/timeline/TimelineDeleteDialog.tsx
index 0a5a2491..7d7b9527 100644
--- a/FrontEnd/src/pages/timeline/TimelineDeleteDialog.tsx
+++ b/FrontEnd/src/pages/timeline/TimelineDeleteDialog.tsx
@@ -23,14 +23,14 @@ const TimelineDeleteDialog: React.FC<TimelineDeleteDialog> = (props) => {
onClose={props.onClose}
title="timeline.deleteDialog.title"
color="danger"
- inputPrompt={() => (
+ inputPromptNode={
<Trans
i18nKey="timeline.deleteDialog.inputPrompt"
values={{ name: timeline.nameV2 }}
>
0<code className="mx-2">1</code>2
</Trans>
- )}
+ }
inputs={{
inputs: [
{
diff --git a/FrontEnd/src/pages/timeline/TimelinePostContentView.tsx b/FrontEnd/src/pages/timeline/TimelinePostContentView.tsx
index 41080e10..ad5465c1 100644
--- a/FrontEnd/src/pages/timeline/TimelinePostContentView.tsx
+++ b/FrontEnd/src/pages/timeline/TimelinePostContentView.tsx
@@ -40,7 +40,7 @@ const TextView: React.FC<TimelinePostContentViewProps> = (props) => {
setError("error");
}
}
- }
+ },
);
return () => {
@@ -77,7 +77,7 @@ const ImageView: React.FC<TimelinePostContentViewProps> = (props) => {
src={getHttpTimelineClient().generatePostDataUrl(
post.timelineOwnerV2,
post.timelineNameV2,
- post.id
+ post.id,
)}
className={classnames(className, "timeline-content-image")}
style={style}
@@ -113,7 +113,7 @@ const MarkdownView: React.FC<TimelinePostContentViewProps> = (props) => {
setError("error");
}
}
- }
+ },
);
return () => {
@@ -123,7 +123,10 @@ const MarkdownView: React.FC<TimelinePostContentViewProps> = (props) => {
const markdownHtml = React.useMemo<string | null>(() => {
if (markdown == null) return null;
- return marked.parse(markdown);
+ return marked.parse(markdown, {
+ mangle: false,
+ headerIds: false,
+ });
}, [markdown]);
if (error != null) {
@@ -168,7 +171,7 @@ const viewMap: Record<string, React.FC<TimelinePostContentViewProps>> = {
};
const TimelinePostContentView: React.FC<TimelinePostContentViewProps> = (
- props
+ props,
) => {
const { post, className, style } = props;