diff --git a/front/src/assets/css/main.css b/front/src/assets/css/main.css index ba651e2..cfd6aa5 100644 --- a/front/src/assets/css/main.css +++ b/front/src/assets/css/main.css @@ -8,6 +8,14 @@ --tertiary-background: #2a2a33; --quaternary-background: #303a46; --selected: #41474f; + + --border-color: #505050; + + --svg-primary-text: brightness(0) saturate(100%) invert(100%) sepia(4%) saturate(1934%) hue-rotate(130deg) + brightness(114%) contrast(100%); + + --svg-selected: brightness(0) saturate(100%) invert(22%) sepia(1%) saturate(7429%) hue-rotate(175deg) + brightness(79%) contrast(69%); /* 343a46 */ } -/* .badge-primary { */ \ No newline at end of file +/* .badge-primary { */ diff --git a/front/src/assets/svg/add-line.svg b/front/src/assets/svg/add-line.svg new file mode 100644 index 0000000..07d1d19 --- /dev/null +++ b/front/src/assets/svg/add-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/align-center.svg b/front/src/assets/svg/align-center.svg new file mode 100644 index 0000000..bbd8da2 --- /dev/null +++ b/front/src/assets/svg/align-center.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/align-justify.svg b/front/src/assets/svg/align-justify.svg new file mode 100644 index 0000000..e5c4f55 --- /dev/null +++ b/front/src/assets/svg/align-justify.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/align-left.svg b/front/src/assets/svg/align-left.svg new file mode 100644 index 0000000..5e29536 --- /dev/null +++ b/front/src/assets/svg/align-left.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/align-right.svg b/front/src/assets/svg/align-right.svg new file mode 100644 index 0000000..21b49dd --- /dev/null +++ b/front/src/assets/svg/align-right.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/attachment-2.svg b/front/src/assets/svg/attachment-2.svg new file mode 100644 index 0000000..9b90e09 --- /dev/null +++ b/front/src/assets/svg/attachment-2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/attachment-line.svg b/front/src/assets/svg/attachment-line.svg new file mode 100644 index 0000000..ec5bc18 --- /dev/null +++ b/front/src/assets/svg/attachment-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/bold.svg b/front/src/assets/svg/bold.svg new file mode 100644 index 0000000..90a2733 --- /dev/null +++ b/front/src/assets/svg/bold.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/delete-bin-4-line.svg b/front/src/assets/svg/delete-bin-4-line.svg new file mode 100644 index 0000000..05ba7d9 --- /dev/null +++ b/front/src/assets/svg/delete-bin-4-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/delete-bin-6-line.svg b/front/src/assets/svg/delete-bin-6-line.svg new file mode 100644 index 0000000..1a51d34 --- /dev/null +++ b/front/src/assets/svg/delete-bin-6-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/flag-2-line.svg b/front/src/assets/svg/flag-2-line.svg new file mode 100644 index 0000000..3a66be8 --- /dev/null +++ b/front/src/assets/svg/flag-2-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/flag-line.svg b/front/src/assets/svg/flag-line.svg new file mode 100644 index 0000000..a6175a5 --- /dev/null +++ b/front/src/assets/svg/flag-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/font-color.svg b/front/src/assets/svg/font-color.svg new file mode 100644 index 0000000..443dc7b --- /dev/null +++ b/front/src/assets/svg/font-color.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/indent-decrease.svg b/front/src/assets/svg/indent-decrease.svg new file mode 100644 index 0000000..0603240 --- /dev/null +++ b/front/src/assets/svg/indent-decrease.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/indent-increase.svg b/front/src/assets/svg/indent-increase.svg new file mode 100644 index 0000000..f467fa8 --- /dev/null +++ b/front/src/assets/svg/indent-increase.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/italic.svg b/front/src/assets/svg/italic.svg new file mode 100644 index 0000000..39ca871 --- /dev/null +++ b/front/src/assets/svg/italic.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/link.svg b/front/src/assets/svg/link.svg new file mode 100644 index 0000000..4142c41 --- /dev/null +++ b/front/src/assets/svg/link.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/list-check-2.svg b/front/src/assets/svg/list-check-2.svg new file mode 100644 index 0000000..9848fdf --- /dev/null +++ b/front/src/assets/svg/list-check-2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/list-check.svg b/front/src/assets/svg/list-check.svg new file mode 100644 index 0000000..6c19717 --- /dev/null +++ b/front/src/assets/svg/list-check.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/list-ordered.svg b/front/src/assets/svg/list-ordered.svg new file mode 100644 index 0000000..de0a84d --- /dev/null +++ b/front/src/assets/svg/list-ordered.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/list-unordered.svg b/front/src/assets/svg/list-unordered.svg new file mode 100644 index 0000000..718b17a --- /dev/null +++ b/front/src/assets/svg/list-unordered.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/mail-add-line.svg b/front/src/assets/svg/mail-add-line.svg new file mode 100644 index 0000000..c623235 --- /dev/null +++ b/front/src/assets/svg/mail-add-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/mail-check-line.svg b/front/src/assets/svg/mail-check-line.svg new file mode 100644 index 0000000..3e80461 --- /dev/null +++ b/front/src/assets/svg/mail-check-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/mail-line.svg b/front/src/assets/svg/mail-line.svg new file mode 100644 index 0000000..54c860e --- /dev/null +++ b/front/src/assets/svg/mail-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/mail-open-line.svg b/front/src/assets/svg/mail-open-line.svg new file mode 100644 index 0000000..0119f78 --- /dev/null +++ b/front/src/assets/svg/mail-open-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/mail-send-line.svg b/front/src/assets/svg/mail-send-line.svg new file mode 100644 index 0000000..d4b3f56 --- /dev/null +++ b/front/src/assets/svg/mail-send-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/mail-star-line.svg b/front/src/assets/svg/mail-star-line.svg new file mode 100644 index 0000000..5714594 --- /dev/null +++ b/front/src/assets/svg/mail-star-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/mail-unread-line.svg b/front/src/assets/svg/mail-unread-line.svg new file mode 100644 index 0000000..a206365 --- /dev/null +++ b/front/src/assets/svg/mail-unread-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/menu-add-line.svg b/front/src/assets/svg/menu-add-line.svg new file mode 100644 index 0000000..f5abcee --- /dev/null +++ b/front/src/assets/svg/menu-add-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/menu-line.svg b/front/src/assets/svg/menu-line.svg new file mode 100644 index 0000000..3830940 --- /dev/null +++ b/front/src/assets/svg/menu-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/reply-all-line.svg b/front/src/assets/svg/reply-all-line.svg new file mode 100644 index 0000000..02e5ae8 --- /dev/null +++ b/front/src/assets/svg/reply-all-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/reply-line.svg b/front/src/assets/svg/reply-line.svg new file mode 100644 index 0000000..b0a39c0 --- /dev/null +++ b/front/src/assets/svg/reply-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/send-plane-line.svg b/front/src/assets/svg/send-plane-line.svg new file mode 100644 index 0000000..8b5ae32 --- /dev/null +++ b/front/src/assets/svg/send-plane-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/share-forward-line.svg b/front/src/assets/svg/share-forward-line.svg new file mode 100644 index 0000000..d4fee0c --- /dev/null +++ b/front/src/assets/svg/share-forward-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/strikethrough.svg b/front/src/assets/svg/strikethrough.svg new file mode 100644 index 0000000..8ed6760 --- /dev/null +++ b/front/src/assets/svg/strikethrough.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/assets/svg/underline.svg b/front/src/assets/svg/underline.svg new file mode 100644 index 0000000..e7e2a62 --- /dev/null +++ b/front/src/assets/svg/underline.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/front/src/components/structure/message/Composer.vue b/front/src/components/structure/message/Composer.vue index 06f76c8..134170f 100644 --- a/front/src/components/structure/message/Composer.vue +++ b/front/src/components/structure/message/Composer.vue @@ -20,6 +20,7 @@ import HardBreak from "@tiptap/extension-hard-break"; import heading from "@tiptap/extension-heading"; import Image from "@tiptap/extension-image"; import TaskList from "@tiptap/extension-task-list"; +import SvgLoader from "@/components/utils/SvgLoader.vue"; // todo style link // todo link and drop cursor @@ -80,41 +81,37 @@ const send = () => { // Signatures: add a custom signature to the bottom of your email // HTML code editing: for advanced users who want to edit the HTML code of their email. - + @@ -165,7 +161,33 @@ const send = () => { padding: 0 10px; } -.is-active { - background-color: blue; +.bubble-menu { + display: flex; + flex-direction: row; + gap: 2px; + background-color: var(--primary-background); + border: 1px solid var(--border-color); + border-radius: 8px; + padding: 2px; + + .editorOption { + border-radius: 6px; + cursor: pointer; + + &:hover, + &.is-active { + background-color: var(--selected); + } + + ::v-deep img { + filter: var(--svg-primary-text); + padding: 1px; + } + } +} + +.sendMessage { + filter: var(--svg-primary-text); + cursor: pointer; } diff --git a/front/src/components/utils/SvgLoader.vue b/front/src/components/utils/SvgLoader.vue new file mode 100644 index 0000000..fbbf1c8 --- /dev/null +++ b/front/src/components/utils/SvgLoader.vue @@ -0,0 +1,17 @@ + + + + + diff --git a/front/src/views/room/Header.vue b/front/src/views/room/Header.vue index 2b1f0d3..900e814 100644 --- a/front/src/views/room/Header.vue +++ b/front/src/views/room/Header.vue @@ -42,7 +42,7 @@ const cc = () => props.room?.members.filter((member: Address) => member.type == display: flex; flex-direction: row; justify-content: space-between; - border-bottom: 1px solid #505050; + border-bottom: 1px solid var(--border-color); align-items: center; width: 100%; height: 35px; @@ -50,7 +50,7 @@ const cc = () => props.room?.members.filter((member: Address) => member.type == .members-list { padding: 3px 5px; - border-bottom: 1px solid #505050; + border-bottom: 1px solid var(--border-color); } .members { } diff --git a/front/src/views/sidebar/rooms/Room.vue b/front/src/views/sidebar/rooms/Room.vue index 0644938..435a341 100644 --- a/front/src/views/sidebar/rooms/Room.vue +++ b/front/src/views/sidebar/rooms/Room.vue @@ -20,7 +20,7 @@ const router = useRouter();