github/marktext
5
0
Fork 0
mirror of https://github.com/marktext/marktext.git synced 2025-05-20 02:40:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

apply option key symbol conditionally. change command key symbol from ^ to ctrl. adjust css

Browse Source 
make sure text is right aligned

revert width auto

revert width auto
This commit is contained in:
Patrick Weingaertner 2019-11-07 14:16:49 +01:00 committed by jocs
parent 245962a6a1
commit ca2149e4fb
3 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/muya/lib/ui/formatPicker/config.js
View File

@ -10,7 +10,7 @@ import mathIcon from '../../assets/pngicon/format_math/2.png'
import highlightIcon from '../../assets/pngicon/highlight/2.png'
import clearIcon from '../../assets/pngicon/format_clear/2.png'
const COMMAND_KEY = isOsx ? '⌘' : '⌃'
const COMMAND_KEY = isOsx ? '⌘' : 'Ctrl'
const icons = [
{

37
src/muya/lib/ui/quickInsert/config.js
View File

@ -21,7 +21,8 @@ import mermaidIcon from '../../assets/pngicon/mermaid/2.png'
import vegaIcon from '../../assets/pngicon/chart/2.png'
import { isOsx } from '../../config'
const COMMAND_KEY = isOsx ? '⌘' : '⌃'
const COMMAND_KEY = isOsx ? '⌘' : 'Ctrl'
const OPTION_KEY = isOsx ? '⌥' : 'Alt'
// Command (or Cmd) ⌘
// Shift ⇧
@ -35,106 +36,106 @@ export const quickInsertObj = {
title: 'Paragraph',
subTitle: 'Lorem Ipsum is simply dummy text',
label: 'paragraph',
shortCut: `${COMMAND_KEY}0`,
shortCut: `${COMMAND_KEY}+0`,
icon: paragraphIcon
}, {
title: 'Horizontal Line',
subTitle: '---',
label: 'hr',
shortCut: `⌥${COMMAND_KEY}-`,
shortCut: `${OPTION_KEY}+${COMMAND_KEY}+-`,
icon: hrIcon
}, {
title: 'Front Matter',
subTitle: '--- Lorem Ipsum ---',
label: 'front-matter',
shortCut: `⌥${COMMAND_KEY}Y`,
shortCut: `${OPTION_KEY}+${COMMAND_KEY}+Y`,
icon: frontMatterIcon
}],
header: [{
title: 'Header 1',
subTitle: '# Lorem Ipsum is simply ...',
label: 'heading 1',
shortCut: `${COMMAND_KEY}1`,
shortCut: `${COMMAND_KEY}+1`,
icon: header1Icon
}, {
title: 'Header 2',
subTitle: '## Lorem Ipsum is simply ...',
label: 'heading 2',
shortCut: `${COMMAND_KEY}2`,
shortCut: `${COMMAND_KEY}+2`,
icon: header2Icon
}, {
title: 'Header 3',
subTitle: '### Lorem Ipsum is simply ...',
label: 'heading 3',
shortCut: `${COMMAND_KEY}3`,
shortCut: `${COMMAND_KEY}+3`,
icon: header3Icon
}, {
title: 'Header 4',
subTitle: '#### Lorem Ipsum is simply ...',
label: 'heading 4',
shortCut: `${COMMAND_KEY}4`,
shortCut: `${COMMAND_KEY}+4`,
icon: header4Icon
}, {
title: 'Header 5',
subTitle: '##### Lorem Ipsum is simply ...',
label: 'heading 5',
shortCut: `${COMMAND_KEY}5`,
shortCut: `${COMMAND_KEY}+5`,
icon: header5Icon
}, {
title: 'Header 6',
subTitle: '###### Lorem Ipsum is simply ...',
label: 'heading 6',
shortCut: `${COMMAND_KEY}6`,
shortCut: `${COMMAND_KEY}+6`,
icon: header6Icon
}],
'advanced block': [{
title: 'Table Block',
subTitle: '|Lorem | Ipsum is simply |',
label: 'table',
shortCut: `${COMMAND_KEY}T`,
shortCut: `${COMMAND_KEY}+T`,
icon: newTableIcon
}, {
title: 'Math Formula',
subTitle: '$$ Lorem Ipsum is simply $$',
label: 'mathblock',
shortCut: `⌥${COMMAND_KEY}M`,
shortCut: `${OPTION_KEY}+${COMMAND_KEY}+M`,
icon: mathblockIcon
}, {
title: 'HTML Block',
subTitle: '<div> Lorem Ipsum is simply </div>',
label: 'html',
shortCut: `⌥${COMMAND_KEY}J`,
shortCut: `${OPTION_KEY}+${COMMAND_KEY}+J`,
icon: htmlIcon
}, {
title: 'Code Block',
subTitle: '```java Lorem Ipsum is simply ```',
label: 'pre',
shortCut: `⌥${COMMAND_KEY}C`,
shortCut: `${OPTION_KEY}+${COMMAND_KEY}+C`,
icon: codeIcon
}, {
title: 'Quote Block',
subTitle: '>Lorem Ipsum is simply ...',
label: 'blockquote',
shortCut: `⌥${COMMAND_KEY}Q`,
shortCut: `${OPTION_KEY}+${COMMAND_KEY}+Q`,
icon: quoteIcon
}],
'list block': [{
title: 'Order List',
subTitle: '1. Lorem Ipsum is simply ...',
label: 'ol-order',
shortCut: `⌥${COMMAND_KEY}O`,
shortCut: `${OPTION_KEY}+${COMMAND_KEY}+O`,
icon: orderListIcon
}, {
title: 'Bullet List',
subTitle: '- Lorem Ipsum is simply ...',
label: 'ul-bullet',
shortCut: `⌥${COMMAND_KEY}U`,
shortCut: `${OPTION_KEY}+${COMMAND_KEY}+U`,
icon: bulletListIcon
}, {
title: 'To-do List',
subTitle: '- [x] Lorem Ipsum is simply ...',
label: 'ul-task',
shortCut: `⌥${COMMAND_KEY}X`,
shortCut: `${OPTION_KEY}+${COMMAND_KEY}+X`,
icon: todoListIcon
}],
diagram: [{

4
src/muya/lib/ui/quickInsert/index.css
View File

@ -1,5 +1,5 @@
.ag-quick-insert {
width: 324px;
width: 360px;
max-height: 307px;
padding: 0 0 20px 0;
overflow-y: auto;
@ -80,7 +80,7 @@
}
.ag-quick-insert .short-cut {
width: 40px;
width: 70px;
margin-right: 20px;
flex-shrink: 1;
text-align: right;