diff --git a/web/src/less/home.less b/web/src/less/home.less index ff3a17c6..57e965fc 100644 --- a/web/src/less/home.less +++ b/web/src/less/home.less @@ -12,7 +12,7 @@ } > .memos-wrapper { - @apply relative flex-grow max-w-2xl min-h-full flex flex-col justify-start items-start px-4 sm:pr-6 overflow-x-hidden; + @apply relative flex-grow max-w-2xl min-h-full flex flex-col justify-start items-start px-4 sm:pr-6; > .memos-editor-wrapper { @apply sticky top-0 w-full h-full flex flex-col justify-start items-start z-10; diff --git a/web/src/less/memo-editor.less b/web/src/less/memo-editor.less index 0fbfd835..11080734 100644 --- a/web/src/less/memo-editor.less +++ b/web/src/less/memo-editor.less @@ -1,7 +1,7 @@ @import "./mixin.less"; .memo-editor-container { - @apply transition-all relative w-full max-h-full flex flex-col justify-start items-start bg-white p-4 rounded-lg border-2 border-gray-200; + @apply transition-all relative w-full flex flex-col justify-start items-start bg-white p-4 rounded-lg border-2 border-gray-200; &.fullscreen { @apply fixed w-full h-full top-0 left-0 z-1000 border-none rounded-none sm:p-8; diff --git a/web/src/locales/en.json b/web/src/locales/en.json index 3bc4ebaa..46835dfa 100644 --- a/web/src/locales/en.json +++ b/web/src/locales/en.json @@ -14,6 +14,7 @@ "pin": "Pin", "unpin": "Unpin", "edit": "Edit", + "restore": "Restore", "delete": "Delete", "share": "Share", "mark": "Mark", diff --git a/web/src/locales/zh.json b/web/src/locales/zh.json index b4a4960b..e1633f41 100644 --- a/web/src/locales/zh.json +++ b/web/src/locales/zh.json @@ -9,12 +9,12 @@ "create": "创建", "change": "修改", "reset": "重置", - "restore": "恢复", "language": "语言", "version": "版本", "pin": "置顶", "unpin": "取消置顶", "edit": "编辑", + "restore": "恢复", "delete": "删除", "share": "分享", "mark": "标注",