mirror of
https://github.com/zadam/trilium.git
synced 2025-12-05 06:54:23 +01:00
Compare commits
16 Commits
378efff98e
...
fbbe999806
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fbbe999806 | ||
|
|
76af488d35 | ||
|
|
a54d2a5f22 | ||
|
|
a1df075194 | ||
|
|
4de2182b40 | ||
|
|
6fa88123f1 | ||
|
|
f81dbde15e | ||
|
|
484fbc6b9d | ||
|
|
8ba30135a1 | ||
|
|
ba5a72fdad | ||
|
|
70b39ddadf | ||
|
|
8200c0b0ab | ||
|
|
59ebfa6cc7 | ||
|
|
57b694162d | ||
|
|
2e6bdc225f | ||
|
|
8ced689432 |
@ -1554,12 +1554,15 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
|
|||||||
@media (max-width: 991px) {
|
@media (max-width: 991px) {
|
||||||
body.mobile #launcher-pane .dropdown.global-menu > .dropdown-menu.show,
|
body.mobile #launcher-pane .dropdown.global-menu > .dropdown-menu.show,
|
||||||
body.mobile #launcher-container .dropdown > .dropdown-menu.show {
|
body.mobile #launcher-container .dropdown > .dropdown-menu.show {
|
||||||
|
--dropdown-bottom: calc(var(--mobile-bottom-offset) + var(--launcher-pane-size));
|
||||||
position: fixed !important;
|
position: fixed !important;
|
||||||
bottom: calc(var(--mobile-bottom-offset) + var(--launcher-pane-size)) !important;
|
bottom: var(--dropdown-bottom) !important;
|
||||||
top: unset !important;
|
top: unset !important;
|
||||||
inset-inline-start: 0 !important;
|
inset-inline-start: 0 !important;
|
||||||
inset-inline-end: 0 !important;
|
inset-inline-end: 0 !important;
|
||||||
transform: unset !important;
|
transform: unset !important;
|
||||||
|
overflow-y: auto;
|
||||||
|
max-height: calc(90vh - var(--dropdown-bottom));
|
||||||
}
|
}
|
||||||
|
|
||||||
#mobile-sidebar-container {
|
#mobile-sidebar-container {
|
||||||
|
|||||||
@ -308,6 +308,15 @@ body.mobile #context-menu-cover {
|
|||||||
&.show {
|
&.show {
|
||||||
background: rgba(0, 0, 0, 0.7);
|
background: rgba(0, 0, 0, 0.7);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
&.global-menu-cover {
|
||||||
|
bottom: calc(var(--mobile-bottom-offset) + var(--launcher-pane-size));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
body.mobile .dropdown-menu.mobile-bottom-menu,
|
||||||
|
body.mobile .dropdown.global-menu .dropdown-menu {
|
||||||
|
border-radius: var(--dropdown-border-radius) var(--dropdown-border-radius) 0 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
body.mobile .dropdown-menu {
|
body.mobile .dropdown-menu {
|
||||||
@ -316,9 +325,8 @@ body.mobile .dropdown-menu {
|
|||||||
--hover-item-background-color: var(--card-background-color);
|
--hover-item-background-color: var(--card-background-color);
|
||||||
font-size: 1em !important;
|
font-size: 1em !important;
|
||||||
backdrop-filter: var(--dropdown-backdrop-filter);
|
backdrop-filter: var(--dropdown-backdrop-filter);
|
||||||
border-radius: var(--dropdown-border-radius) var(--dropdown-border-radius) 0 0;
|
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|
||||||
.dropdown-toggle::after {
|
.dropdown-toggle::after {
|
||||||
top: 0.5em;
|
top: 0.5em;
|
||||||
right: var(--dropdown-menu-padding-horizontal);
|
right: var(--dropdown-menu-padding-horizontal);
|
||||||
@ -334,8 +342,8 @@ body.mobile .dropdown-menu {
|
|||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
padding: var(--dropdown-menu-padding-vertical) var(--dropdown-menu-padding-horizontal) !important;
|
padding: var(--dropdown-menu-padding-vertical) var(--dropdown-menu-padding-horizontal) !important;
|
||||||
background: var(--card-background-color);
|
background: var(--card-background-color);
|
||||||
border-bottom: 1px solid var(--main-border-color) !important;
|
border-bottom: 1px solid var(--menu-item-delimiter-color) !important;
|
||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dropdown-item:first-of-type,
|
.dropdown-item:first-of-type,
|
||||||
@ -383,12 +391,38 @@ body.mobile .dropdown-menu {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.dropdown-divider {
|
||||||
|
visibility: visible;
|
||||||
|
margin: 0;
|
||||||
|
height: 3px;
|
||||||
|
border-top: unset;
|
||||||
|
background-color: rgba(0, 0, 0, 0.2);
|
||||||
|
|
||||||
|
&:after {
|
||||||
|
content: unset;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
&.submenu-open {
|
&.submenu-open {
|
||||||
.dropdown-toggle {
|
.dropdown-toggle {
|
||||||
padding-bottom: var(--dropdown-menu-padding-vertical);
|
padding-bottom: var(--dropdown-menu-padding-vertical);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.dropdown-custom-item:has(.note-color-picker) {
|
||||||
|
overflow-x: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.note-color-picker {
|
||||||
|
padding: 0;
|
||||||
|
width: fit-content;
|
||||||
|
|
||||||
|
.color-cell {
|
||||||
|
--color-picker-cell-size: 26px;
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
/* #endregion */
|
/* #endregion */
|
||||||
|
|
||||||
|
|||||||
@ -1557,7 +1557,8 @@
|
|||||||
"refresh-saved-search-results": "刷新保存的搜索结果",
|
"refresh-saved-search-results": "刷新保存的搜索结果",
|
||||||
"create-child-note": "创建子笔记",
|
"create-child-note": "创建子笔记",
|
||||||
"unhoist": "取消聚焦",
|
"unhoist": "取消聚焦",
|
||||||
"toggle-sidebar": "切换侧边栏"
|
"toggle-sidebar": "切换侧边栏",
|
||||||
|
"dropping-not-allowed": "不允许移动笔记到此处。"
|
||||||
},
|
},
|
||||||
"title_bar_buttons": {
|
"title_bar_buttons": {
|
||||||
"window-on-top": "保持此窗口置顶"
|
"window-on-top": "保持此窗口置顶"
|
||||||
@ -1660,7 +1661,8 @@
|
|||||||
"duplicate-launcher": "复制启动器 <kbd data-command=\"duplicateSubtree\">"
|
"duplicate-launcher": "复制启动器 <kbd data-command=\"duplicateSubtree\">"
|
||||||
},
|
},
|
||||||
"editable-text": {
|
"editable-text": {
|
||||||
"auto-detect-language": "自动检测"
|
"auto-detect-language": "自动检测",
|
||||||
|
"keeps-crashing": "编辑组件时崩溃。请尝试重启 Trilium。如果问题仍然存在,请考虑提交错误报告。"
|
||||||
},
|
},
|
||||||
"highlighting": {
|
"highlighting": {
|
||||||
"title": "代码块",
|
"title": "代码块",
|
||||||
|
|||||||
@ -1516,7 +1516,8 @@
|
|||||||
"refresh-saved-search-results": "重新整理儲存的搜尋結果",
|
"refresh-saved-search-results": "重新整理儲存的搜尋結果",
|
||||||
"create-child-note": "建立子筆記",
|
"create-child-note": "建立子筆記",
|
||||||
"unhoist": "取消聚焦",
|
"unhoist": "取消聚焦",
|
||||||
"toggle-sidebar": "切換側邊欄"
|
"toggle-sidebar": "切換側邊欄",
|
||||||
|
"dropping-not-allowed": "不允許移動筆記至此處。"
|
||||||
},
|
},
|
||||||
"title_bar_buttons": {
|
"title_bar_buttons": {
|
||||||
"window-on-top": "保持此視窗置頂"
|
"window-on-top": "保持此視窗置頂"
|
||||||
@ -1619,7 +1620,8 @@
|
|||||||
"duplicate-launcher": "複製啟動器 <kbd data-command=\"duplicateSubtree\">"
|
"duplicate-launcher": "複製啟動器 <kbd data-command=\"duplicateSubtree\">"
|
||||||
},
|
},
|
||||||
"editable-text": {
|
"editable-text": {
|
||||||
"auto-detect-language": "自動檢測"
|
"auto-detect-language": "自動檢測",
|
||||||
|
"keeps-crashing": "編輯元件持續發生崩潰。請嘗試重新啟動 Trilium。若問題仍存在,請考慮提交錯誤報告。"
|
||||||
},
|
},
|
||||||
"highlighting": {
|
"highlighting": {
|
||||||
"description": "控制文字筆記程式碼區塊中的語法高亮,程式碼筆記不會受到影響。",
|
"description": "控制文字筆記程式碼區塊中的語法高亮,程式碼筆記不會受到影響。",
|
||||||
|
|||||||
@ -26,6 +26,7 @@ export default function GlobalMenu({ isHorizontalLayout }: { isHorizontalLayout:
|
|||||||
const isVerticalLayout = !isHorizontalLayout;
|
const isVerticalLayout = !isHorizontalLayout;
|
||||||
const parentComponent = useContext(ParentComponent);
|
const parentComponent = useContext(ParentComponent);
|
||||||
const { isUpdateAvailable, latestVersion } = useTriliumUpdateStatus();
|
const { isUpdateAvailable, latestVersion } = useTriliumUpdateStatus();
|
||||||
|
const isMobileLocal = isMobile();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Dropdown
|
<Dropdown
|
||||||
@ -38,6 +39,8 @@ export default function GlobalMenu({ isHorizontalLayout }: { isHorizontalLayout:
|
|||||||
</div>}
|
</div>}
|
||||||
</>}
|
</>}
|
||||||
noDropdownListStyle
|
noDropdownListStyle
|
||||||
|
onShown={isMobileLocal ? () => document.getElementById("context-menu-cover")?.classList.add("show", "global-menu-cover") : undefined}
|
||||||
|
onHidden={isMobileLocal ? () => document.getElementById("context-menu-cover")?.classList.remove("show", "global-menu-cover") : undefined}
|
||||||
>
|
>
|
||||||
|
|
||||||
<MenuItem command="openNewWindow" icon="bx bx-window-open" text={t("global_menu.open_new_window")} />
|
<MenuItem command="openNewWindow" icon="bx bx-window-open" text={t("global_menu.open_new_window")} />
|
||||||
|
|||||||
@ -19,9 +19,11 @@ export interface DropdownProps extends Pick<HTMLProps<HTMLDivElement>, "id" | "c
|
|||||||
disabled?: boolean;
|
disabled?: boolean;
|
||||||
text?: ComponentChildren;
|
text?: ComponentChildren;
|
||||||
forceShown?: boolean;
|
forceShown?: boolean;
|
||||||
|
onShown?: () => void;
|
||||||
|
onHidden?: () => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function Dropdown({ id, className, buttonClassName, isStatic, children, title, text, dropdownContainerStyle, dropdownContainerClassName, hideToggleArrow, iconAction, disabled, noSelectButtonStyle, noDropdownListStyle, forceShown }: DropdownProps) {
|
export default function Dropdown({ id, className, buttonClassName, isStatic, children, title, text, dropdownContainerStyle, dropdownContainerClassName, hideToggleArrow, iconAction, disabled, noSelectButtonStyle, noDropdownListStyle, forceShown, onShown: externalOnShown, onHidden: externalOnHidden }: DropdownProps) {
|
||||||
const dropdownRef = useRef<HTMLDivElement | null>(null);
|
const dropdownRef = useRef<HTMLDivElement | null>(null);
|
||||||
const triggerRef = useRef<HTMLButtonElement | null>(null);
|
const triggerRef = useRef<HTMLButtonElement | null>(null);
|
||||||
|
|
||||||
@ -40,10 +42,12 @@ export default function Dropdown({ id, className, buttonClassName, isStatic, chi
|
|||||||
|
|
||||||
const onShown = useCallback(() => {
|
const onShown = useCallback(() => {
|
||||||
setShown(true);
|
setShown(true);
|
||||||
|
externalOnShown?.();
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
const onHidden = useCallback(() => {
|
const onHidden = useCallback(() => {
|
||||||
setShown(false);
|
setShown(false);
|
||||||
|
externalOnHidden?.();
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user