Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
canifa_note
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vũ Hoàng Anh
canifa_note
Commits
05e46ee4
Commit
05e46ee4
authored
Oct 03, 2022
by
steven
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: emoji picker style
parent
6a3b052f
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
28 deletions
+31
-28
MemoEditor.tsx
web/src/components/MemoEditor.tsx
+5
-5
MemoList.tsx
web/src/components/MemoList.tsx
+1
-1
memo-content.less
web/src/less/memo-content.less
+4
-3
memo-editor.less
web/src/less/memo-editor.less
+20
-18
memo-list.less
web/src/less/memo-list.less
+1
-1
No files found.
web/src/components/MemoEditor.tsx
View file @
05e46ee4
...
@@ -333,6 +333,11 @@ const MemoEditor: React.FC = () => {
...
@@ -333,6 +333,11 @@ const MemoEditor: React.FC = () => {
<
button
className=
"action-btn"
onClick=
{
handleFullscreenBtnClick
}
>
<
button
className=
"action-btn"
onClick=
{
handleFullscreenBtnClick
}
>
{
state
.
fullscreen
?
<
Icon
.
Minimize
className=
"icon-img"
/>
:
<
Icon
.
Maximize
className=
"icon-img"
/>
}
{
state
.
fullscreen
?
<
Icon
.
Minimize
className=
"icon-img"
/>
:
<
Icon
.
Maximize
className=
"icon-img"
/>
}
</
button
>
</
button
>
<
EmojiPicker
shouldShow=
{
state
.
shouldShowEmojiPicker
}
onEmojiClick=
{
handleEmojiClick
}
onShouldShowEmojiPickerChange=
{
handleChangeShouldShowEmojiPicker
}
/>
</
div
>
</
div
>
<
div
className=
"btns-container"
>
<
div
className=
"btns-container"
>
<
button
className=
"action-btn confirm-btn"
disabled=
{
!
allowSave
}
onClick=
{
handleSaveBtnClick
}
>
<
button
className=
"action-btn confirm-btn"
disabled=
{
!
allowSave
}
onClick=
{
handleSaveBtnClick
}
>
...
@@ -353,11 +358,6 @@ const MemoEditor: React.FC = () => {
...
@@ -353,11 +358,6 @@ const MemoEditor: React.FC = () => {
})
}
})
}
</
div
>
</
div
>
)
}
)
}
<
EmojiPicker
shouldShow=
{
state
.
shouldShowEmojiPicker
}
onEmojiClick=
{
handleEmojiClick
}
onShouldShowEmojiPickerChange=
{
handleChangeShouldShowEmojiPicker
}
/>
</
div
>
</
div
>
);
);
};
};
...
...
web/src/components/MemoList.tsx
View file @
05e46ee4
...
@@ -92,7 +92,7 @@ const MemoList = () => {
...
@@ -92,7 +92,7 @@ const MemoList = () => {
}
, [query]);
}
, [query]);
return (
return (
<
div
className=
{
`memo-list-container ${isFetching ? "" : "completed"}`
}
ref=
{
wrapperElement
}
>
<
div
className=
"memo-list-container"
ref=
{
wrapperElement
}
>
{
sortedMemos
.
map
((
memo
)
=>
(
{
sortedMemos
.
map
((
memo
)
=>
(
<
Memo
key=
{
`${memo.id}-${memo.createdTs}-${memo.updatedTs}`
}
memo=
{
memo
}
/>
<
Memo
key=
{
`${memo.id}-${memo.createdTs}-${memo.updatedTs}`
}
memo=
{
memo
}
/>
))
}
))
}
...
...
web/src/less/memo-content.less
View file @
05e46ee4
...
@@ -34,14 +34,15 @@
...
@@ -34,14 +34,15 @@
@apply text-blue-600 cursor-pointer underline break-all hover:opacity-80;
@apply text-blue-600 cursor-pointer underline break-all hover:opacity-80;
}
}
.counter-block,
.ol-block,
.ul-block,
.todo-block {
.todo-block {
@apply
float-left
inline-block box-border text-center w-7 font-mono select-none;
@apply inline-block box-border text-center w-7 font-mono select-none;
}
}
.todo-block {
.todo-block {
@apply w-4 h-4 leading-4 border rounded box-border text-lg cursor-pointer shadow-inner hover:opacity-80;
@apply w-4 h-4 leading-4 border rounded box-border text-lg cursor-pointer shadow-inner hover:opacity-80;
margin-top: 6px
;
transform: translateY(2px)
;
margin-left: 6px;
margin-left: 6px;
margin-right: 6px;
margin-right: 6px;
}
}
...
...
web/src/less/memo-editor.less
View file @
05e46ee4
...
@@ -5,11 +5,11 @@
...
@@ -5,11 +5,11 @@
&.float {
&.float {
@media (max-width: 640px) {
@media (max-width: 640px) {
@apply fixed w-full bottom-
2 left-0 border-none rounded-none sm:relative sm:bottom-0 sm:w-full
;
@apply fixed w-full bottom-
0 left-0 border-none rounded-none
;
background-color: #f6f5f4;
background-color: #f6f5f4;
> .memo-editor {
> .memo-editor {
@apply p-4 rounded-lg border-2 flex flex-col flex-grow justify-start items-start relative w-full h-full bg-white;
@apply p-4
mb-2
rounded-lg border-2 flex flex-col flex-grow justify-start items-start relative w-full h-full bg-white;
.tag-action > .tag-list {
.tag-action > .tag-list {
@apply bottom-7;
@apply bottom-7;
...
@@ -18,7 +18,8 @@
...
@@ -18,7 +18,8 @@
}
}
.emoji-picker-react {
.emoji-picker-react {
@apply bottom-16;
@apply !bottom-8;
top: unset !important;
}
}
}
}
}
}
...
@@ -28,20 +29,21 @@
...
@@ -28,20 +29,21 @@
background-color: #f6f5f4;
background-color: #f6f5f4;
> .memo-editor {
> .memo-editor {
@apply p-4 rounded-lg border shadow-lg flex flex-col flex-grow justify-start items-start relative w-full h-full bg-white;
@apply p-4
mb-4
rounded-lg border shadow-lg flex flex-col flex-grow justify-start items-start relative w-full h-full bg-white;
> .common-editor-inputer {
> .common-editor-inputer {
@apply flex-grow w-full !h-full max-h-full;
@apply flex-grow w-full !h-full max-h-full;
}
}
}
.tag-action > .tag-list {
.tag-action > .tag-list {
@apply bottom-7;
@apply bottom-7;
top: unset;
top: unset;
}
}
}
.emoji-picker-react {
.emoji-picker-react {
@apply bottom-20;
@apply !bottom-8;
top: unset !important;
}
}
}
}
...
@@ -66,7 +68,7 @@
...
@@ -66,7 +68,7 @@
}
}
> .common-tools-wrapper {
> .common-tools-wrapper {
@apply w-full flex flex-row justify-between items-center;
@apply
relative
w-full flex flex-row justify-between items-center;
> .common-tools-container {
> .common-tools-container {
@apply flex flex-row justify-start items-center;
@apply flex flex-row justify-start items-center;
...
@@ -104,6 +106,14 @@
...
@@ -104,6 +106,14 @@
@apply hidden ml-1 text-xs leading-5 text-gray-700 border border-gray-300 rounded-xl px-2;
@apply hidden ml-1 text-xs leading-5 text-gray-700 border border-gray-300 rounded-xl px-2;
}
}
}
}
.emoji-picker-react {
@apply absolute shadow left-6 top-8;
li.emoji::before {
@apply hidden;
}
}
}
}
> .btns-container {
> .btns-container {
...
@@ -146,12 +156,4 @@
...
@@ -146,12 +156,4 @@
}
}
}
}
}
}
.emoji-picker-react {
@apply absolute shadow;
li.emoji::before {
@apply hidden;
}
}
}
}
web/src/less/memo-list.less
View file @
05e46ee4
@import "./mixin.less";
@import "./mixin.less";
.memo-list-container {
.memo-list-container {
@apply flex flex-col justify-start items-start w-full max-w-full overflow-y-scroll;
@apply flex flex-col justify-start items-start w-full max-w-full overflow-y-scroll
!pb-36
;
.hide-scroll-bar();
.hide-scroll-bar();
> .status-text-container {
> .status-text-container {
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment