1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/outline_ynh.git synced 2024-09-03 19:56:12 +02:00
outline_ynh/sources/patches/app-04-bible.patch

149 lines
5.4 KiB
Diff
Raw Normal View History

2023-02-26 10:03:51 +01:00
diff --git a/app/editor/menus/block.tsx b/app/editor/menus/block.tsx
2023-05-04 09:55:08 +02:00
index d9404e6ba..0c2b07b46 100644
2023-02-26 10:03:51 +01:00
--- a/app/editor/menus/block.tsx
+++ b/app/editor/menus/block.tsx
2023-05-04 09:55:08 +02:00
@@ -20,6 +20,7 @@ import {
2023-02-26 10:03:51 +01:00
CalendarIcon,
MathIcon,
2023-05-04 09:55:08 +02:00
DoneIcon,
2023-02-26 10:03:51 +01:00
+ BookmarkedIcon,
} from "outline-icons";
import * as React from "react";
import styled from "styled-components";
2023-05-04 09:55:08 +02:00
@@ -196,6 +197,13 @@ export default function blockMenuItems(dictionary: Dictionary): MenuItem[] {
2023-02-26 10:03:51 +01:00
keywords: "notice card suggestion",
attrs: { style: "tip" },
},
+ {
+ name: "container_notice",
+ title: dictionary.bibleNotice,
+ icon: <BookmarkedIcon />,
+ keywords: "notice card bible",
+ attrs: { style: "bible" },
+ },
{
name: "separator",
},
diff --git a/app/hooks/useDictionary.ts b/app/hooks/useDictionary.ts
2023-05-04 09:55:08 +02:00
index 5d359bc0b..3d9cd5aff 100644
2023-02-26 10:03:51 +01:00
--- a/app/hooks/useDictionary.ts
+++ b/app/hooks/useDictionary.ts
2023-05-04 09:55:08 +02:00
@@ -78,6 +78,8 @@ export default function useDictionary() {
2023-02-26 10:03:51 +01:00
warningNotice: t("Warning notice"),
2023-05-04 09:55:08 +02:00
success: t("Success"),
successNotice: t("Success notice"),
2023-02-26 10:03:51 +01:00
+ bible: t("Bible"),
+ bibleNotice: t("Bible quote"),
insertDate: t("Current date"),
insertTime: t("Current time"),
insertDateTime: t("Current date and time"),
diff --git a/app/scenes/Document/components/Document.tsx b/app/scenes/Document/components/Document.tsx
2023-06-24 20:18:41 +02:00
index fac830c75..b4399e34b 100644
2023-02-26 10:03:51 +01:00
--- a/app/scenes/Document/components/Document.tsx
+++ b/app/scenes/Document/components/Document.tsx
2023-06-24 20:18:41 +02:00
@@ -545,11 +545,6 @@ class DocumentScene extends React.Component<Props> {
2023-02-26 10:03:51 +01:00
</Flex>
</React.Suspense>
</MaxWidth>
- {isShare &&
- !parseDomain(window.location.origin).custom &&
- !auth.user && (
- <Branding href="//www.getoutline.com?ref=sharelink" />
- )}
</Container>
{!isShare && (
<Footer>
diff --git a/app/typings/styled-components.d.ts b/app/typings/styled-components.d.ts
2023-05-04 09:55:08 +02:00
index e30b32de3..1beeccf75 100644
2023-02-26 10:03:51 +01:00
--- a/app/typings/styled-components.d.ts
+++ b/app/typings/styled-components.d.ts
2023-05-04 09:55:08 +02:00
@@ -55,6 +55,8 @@ declare module "styled-components" {
2023-02-26 10:03:51 +01:00
noticeWarningText: string;
2023-05-04 09:55:08 +02:00
noticeSuccessBackground: string;
noticeSuccessText: string;
2023-02-26 10:03:51 +01:00
+ noticeBibleBackground: string;
+ noticeBibleText: string;
}
interface Colors {
diff --git a/shared/editor/components/Styles.ts b/shared/editor/components/Styles.ts
2023-06-24 20:18:41 +02:00
index c553d3d27..8d14b876f 100644
2023-02-26 10:03:51 +01:00
--- a/shared/editor/components/Styles.ts
+++ b/shared/editor/components/Styles.ts
2023-06-24 20:18:41 +02:00
@@ -660,6 +660,18 @@ h6 {
2023-02-26 10:03:51 +01:00
2023-05-04 09:55:08 +02:00
a {
color: ${props.theme.noticeSuccessText};
+
2023-02-26 10:03:51 +01:00
+.notice-block.bible {
+ background: ${transparentize(0.9, props.theme.noticeBibleBackground)};
+ border-left: 4px solid ${props.theme.noticeBibleBackground};
+ color: ${props.theme.noticeBibleText};
+
+ .icon {
+ color: ${props.theme.noticeBibleBackground};
+ }
+
+ a {
+ color: ${props.theme.noticeBibleText};
2023-05-04 09:55:08 +02:00
}
}
2023-02-26 10:03:51 +01:00
diff --git a/shared/editor/nodes/Notice.tsx b/shared/editor/nodes/Notice.tsx
2023-06-29 18:26:23 +02:00
index 2193d0b02..7b31f5d86 100644
2023-02-26 10:03:51 +01:00
--- a/shared/editor/nodes/Notice.tsx
+++ b/shared/editor/nodes/Notice.tsx
@@ -1,5 +1,5 @@
import Token from "markdown-it/lib/token";
2023-05-04 09:55:08 +02:00
-import { WarningIcon, InfoIcon, StarredIcon, DoneIcon } from "outline-icons";
+import { WarningIcon, InfoIcon, StarredIcon, BookmarkedIcon, DoneIcon } from "outline-icons";
2023-02-26 10:03:51 +01:00
import { wrappingInputRule } from "prosemirror-inputrules";
import { NodeSpec, Node as ProsemirrorNode, NodeType } from "prosemirror-model";
import * as React from "react";
2023-06-29 18:26:23 +02:00
@@ -15,6 +15,7 @@ export default class Notice extends Node {
info: this.options.dictionary.info,
2023-02-26 10:03:51 +01:00
warning: this.options.dictionary.warning,
2023-05-04 09:55:08 +02:00
success: this.options.dictionary.success,
2023-02-26 10:03:51 +01:00
+ bible: this.options.dictionary.bible,
2023-06-29 18:26:23 +02:00
tip: this.options.dictionary.tip,
2023-02-26 10:03:51 +01:00
});
}
2023-06-24 20:18:41 +02:00
@@ -51,6 +52,8 @@ export default class Notice extends Node {
2023-02-26 10:03:51 +01:00
? "warning"
2023-05-04 09:55:08 +02:00
: dom.className.includes("success")
? "success"
2023-02-26 10:03:51 +01:00
+ : dom.className.includes("bible")
+ ? "bible"
: undefined,
}),
},
2023-06-24 20:18:41 +02:00
@@ -115,6 +118,8 @@ export default class Notice extends Node {
2023-05-04 09:55:08 +02:00
component = <WarningIcon />;
} else if (node.attrs.style === "success") {
component = <DoneIcon />;
2023-02-26 10:03:51 +01:00
+ } else if (node.attrs.style === "bible") {
2023-06-29 16:59:33 +02:00
+ component = <BookmarkedIcon />;
2023-02-26 10:03:51 +01:00
} else {
2023-05-04 09:55:08 +02:00
component = <InfoIcon />;
2023-02-26 10:03:51 +01:00
}
diff --git a/shared/styles/theme.ts b/shared/styles/theme.ts
2023-05-04 09:55:08 +02:00
index f3d83141e..c576a67c2 100644
2023-02-26 10:03:51 +01:00
--- a/shared/styles/theme.ts
+++ b/shared/styles/theme.ts
2023-05-04 09:55:08 +02:00
@@ -93,6 +93,8 @@ const buildBaseTheme = (input: Partial<Colors>) => {
noticeSuccessBackground: colors.brand.green,
noticeSuccessText: colors.almostBlack,
tableSelectedBackground: transparentize(0.8, colors.accent),
2023-02-26 10:03:51 +01:00
+ noticeBibleBackground: "#996633",
+ noticeBibleText: colors.almostBlack,
breakpoints,
...colors,
...spacing,
@@ -233,6 +235,7 @@ export const buildDarkTheme = (input: Partial<Colors>): DefaultTheme => {
noticeTipText: colors.white,
noticeWarningText: colors.white,
2023-05-04 09:55:08 +02:00
noticeSuccessText: colors.white,
2023-02-26 10:03:51 +01:00
+ noticeBibleText: colors.white,
progressBarBackground: colors.slate,
scrollbarBackground: colors.black,
scrollbarThumb: colors.lightBlack,