mirrors/mycorrhiza
1
0
Fork 0
mirror of https://github.com/osmarks/mycorrhiza.git synced 2026-10-06 01:11:40 +00:00
Code Issues Releases Wiki Activity

merge upstream changes

Browse Source
This commit is contained in:
osmarks
2026-03-02 20:07:05 +00:00
parent 3c323ffa25 f8bba997bf
commit ebbb55e3d8
14 changed files with 201 additions and 740 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/static/default.css
+2 -2
View File
@@ -368,7 +368,7 @@ kbd {
top: 0;
left: 50%;
width: 100%;
max-width: 800px;
max-width: 1000px;
margin: 96px auto;
padding: 24px;
transform: translate(-50%, 0);
@@ -405,7 +405,7 @@ kbd {
margin: 0;
padding: 8px;
border: none;
background: url(/web/static/icon/x.svg) no-repeat 8px 8px / 16px 16px;
background: url(/static/icon/x.svg) no-repeat 8px 8px / 16px 16px;
width: 32px;
height: 32px;
cursor: pointer;
web/static/shortcuts.js
+11
View File
@@ -283,6 +283,7 @@ rrh.shortcuts.addGroup(new ShortcutGroup('Common', null, [
]))
if (document.body.dataset.rrhAddr.startsWith('/hypha')) {
<<<<<<< HEAD
rrh.shortcuts.addGroup(new ShortcutGroup('Page', null, [
new Shortcut('', $$('article .wikilink'), 'First 9 pages′ links'),
new Shortcut(['p', 'Alt+ArrowLeft', 'Ctrl+Alt+ArrowLeft'], $('.prevnext__prev'), 'Previous page'),
@@ -291,6 +292,16 @@ if (document.body.dataset.rrhAddr.startsWith('/hypha')) {
new Shortcut(['c', 'Alt+ArrowDown', 'Ctrl+Alt+ArrowDown'], $('.subhyphae__link'), 'First child page'),
new Shortcut(['e', isMac ? 'Meta+Enter' : 'Ctrl+Enter'], $('.btn__link_navititle[href^="/edit/"]'), 'Edit this page'),
new Shortcut('v', $('.hypha-info__link[href^="/hypha/"]'), 'Go to page overview'),
=======
rrh.shortcuts.addGroup(new ShortcutGroup('Hypha', null, [
new Shortcut('', $$('article .wikilink'), 'First 9 hypha′s links'),
new Shortcut(['p', 'Alt+Shift+ArrowLeft', 'Ctrl+Alt+ArrowLeft'], $('.prevnext__prev'), 'Previous hypha'),
new Shortcut(['n', 'Alt+Shift+ArrowRight', 'Ctrl+Alt+ArrowRight'], $('.prevnext__next'), 'Next hypha'),
new Shortcut(['s', 'Alt+ArrowUp', 'Ctrl+Alt+ArrowUp'], $$('.navi-title a').slice(1, -1).slice(-1)[0], 'Parent hypha'),
new Shortcut(['c', 'Alt+ArrowDown', 'Ctrl+Alt+ArrowDown'], $('.subhyphae__link'), 'First child hypha'),
new Shortcut(['e', isMac ? 'Meta+Enter' : 'Ctrl+Enter'], $('.btn__link_navititle[href^="/edit/"]'), 'Edit this hypha'),
new Shortcut('v', $('.hypha-info__link[href^="/hypha/"]'), 'Go to hypha′s page'),
>>>>>>> f8bba997bf560a9aeb954fe9fc8042a30d378a3d
new Shortcut('a', $('.hypha-info__link[href^="/media/"]'), 'Go to media management'),
new Shortcut('h', $('.hypha-info__link[href^="/history/"]'), 'Go to history'),
new Shortcut('r', $('.hypha-info__link[href^="/rename/"]'), 'Rename this page'),