mirror of
https://github.com/YunoHost-Apps/outline_ynh.git
synced 2024-09-03 19:56:12 +02:00
Delete app-04-bible.patch
This commit is contained in:
parent
81201867fc
commit
161f5aba78
1 changed files with 0 additions and 135 deletions
|
@ -1,135 +0,0 @@
|
|||
diff --git a/app/editor/menus/block.tsx b/app/editor/menus/block.tsx
|
||||
index 42269b5e4..174c84c02 100644
|
||||
--- a/app/editor/menus/block.tsx
|
||||
+++ b/app/editor/menus/block.tsx
|
||||
@@ -19,6 +19,7 @@ import {
|
||||
ClockIcon,
|
||||
CalendarIcon,
|
||||
MathIcon,
|
||||
+ BookmarkedIcon,
|
||||
} from "outline-icons";
|
||||
import * as React from "react";
|
||||
import styled from "styled-components";
|
||||
@@ -187,6 +188,13 @@ export default function blockMenuItems(dictionary: Dictionary): MenuItem[] {
|
||||
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
|
||||
index 5b9196de5..90caf27d7 100644
|
||||
--- a/app/hooks/useDictionary.ts
|
||||
+++ b/app/hooks/useDictionary.ts
|
||||
@@ -75,6 +75,8 @@ export default function useDictionary() {
|
||||
showSource: t("Show source"),
|
||||
warning: t("Warning"),
|
||||
warningNotice: t("Warning notice"),
|
||||
+ 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/typings/styled-components.d.ts b/app/typings/styled-components.d.ts
|
||||
index 5a4d4a079..e43c4fc29 100644
|
||||
--- a/app/typings/styled-components.d.ts
|
||||
+++ b/app/typings/styled-components.d.ts
|
||||
@@ -53,6 +53,8 @@ declare module "styled-components" {
|
||||
noticeTipText: string;
|
||||
noticeWarningBackground: string;
|
||||
noticeWarningText: string;
|
||||
+ noticeBibleBackground: string;
|
||||
+ noticeBibleText: string;
|
||||
}
|
||||
|
||||
interface Colors {
|
||||
diff --git a/shared/editor/components/Styles.ts b/shared/editor/components/Styles.ts
|
||||
index c61b0fdb4..6ea2a6798 100644
|
||||
--- a/shared/editor/components/Styles.ts
|
||||
+++ b/shared/editor/components/Styles.ts
|
||||
@@ -635,6 +635,20 @@ h6 {
|
||||
}
|
||||
}
|
||||
|
||||
+.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};
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
blockquote {
|
||||
margin: 0;
|
||||
padding-left: 1.5em;
|
||||
diff --git a/shared/editor/nodes/Notice.tsx b/shared/editor/nodes/Notice.tsx
|
||||
index 158a0dfb9..f297c3433 100644
|
||||
--- a/shared/editor/nodes/Notice.tsx
|
||||
+++ b/shared/editor/nodes/Notice.tsx
|
||||
@@ -1,5 +1,5 @@
|
||||
import Token from "markdown-it/lib/token";
|
||||
-import { WarningIcon, InfoIcon, StarredIcon } from "outline-icons";
|
||||
+import { WarningIcon, InfoIcon, StarredIcon, BookmarkedIcon } from "outline-icons";
|
||||
import { wrappingInputRule } from "prosemirror-inputrules";
|
||||
import { NodeSpec, Node as ProsemirrorNode, NodeType } from "prosemirror-model";
|
||||
import * as React from "react";
|
||||
@@ -15,6 +15,7 @@ export default class Notice extends Node {
|
||||
info: this.options.dictionary.info,
|
||||
warning: this.options.dictionary.warning,
|
||||
tip: this.options.dictionary.tip,
|
||||
+ bible: this.options.dictionary.bible,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -47,6 +48,8 @@ export default class Notice extends Node {
|
||||
? "tip"
|
||||
: dom.className.includes("warning")
|
||||
? "warning"
|
||||
+ : dom.className.includes("bible")
|
||||
+ ? "bible"
|
||||
: undefined,
|
||||
}),
|
||||
},
|
||||
@@ -75,6 +78,8 @@ export default class Notice extends Node {
|
||||
component = <StarredIcon color="currentColor" />;
|
||||
} else if (node.attrs.style === "warning") {
|
||||
component = <WarningIcon color="currentColor" />;
|
||||
+ } else if (node.attrs.style === "bible") {
|
||||
+ component = <BookmarkedIcon color="currentColor" />;
|
||||
} else {
|
||||
component = <InfoIcon color="currentColor" />;
|
||||
}
|
||||
diff --git a/shared/styles/theme.ts b/shared/styles/theme.ts
|
||||
index f28d552c0..1e6490890 100644
|
||||
--- a/shared/styles/theme.ts
|
||||
+++ b/shared/styles/theme.ts
|
||||
@@ -88,6 +88,8 @@ export const base = {
|
||||
noticeTipText: colors.almostBlack,
|
||||
noticeWarningBackground: "#d73a49",
|
||||
noticeWarningText: colors.almostBlack,
|
||||
+ noticeBibleBackground: "#996633",
|
||||
+ noticeBibleText: colors.almostBlack,
|
||||
breakpoints,
|
||||
};
|
||||
|
||||
@@ -213,6 +215,7 @@ export const dark = {
|
||||
noticeInfoText: colors.white,
|
||||
noticeTipText: colors.white,
|
||||
noticeWarningText: colors.white,
|
||||
+ noticeBibleText: colors.white,
|
||||
progressBarBackground: colors.slate,
|
||||
scrollbarBackground: colors.black,
|
||||
scrollbarThumb: colors.lightBlack,
|
Loading…
Add table
Reference in a new issue