Skip to content

Commit

Permalink
Merge pull request #1019 from filoxo/add-keyboard-markdown
Browse files Browse the repository at this point in the history
Add keyboard markdown
  • Loading branch information
kazup01 authored Oct 25, 2017
2 parents bba7bab + ae3291b commit 88a828c
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 0 deletions.
13 changes: 13 additions & 0 deletions browser/components/markdown.styl
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,16 @@ table
border-color borderColor
&:last-child
border-right solid 1px borderColor
kbd
background-color #fafbfc
border solid 1px borderColor
border-bottom-color btnColor
border-radius 3px
box-shadow inset 0 -1px 0 #959da5
display inline-block
font-size .8em
line-height 1
padding 3px 5px

themeDarkBackground = darken(#21252B, 10%)
themeDarkText = #f9f9f9
Expand Down Expand Up @@ -317,3 +327,6 @@ body[data-theme="dark"]
border-color themeDarkTableBorder
&:last-child
border-right solid 1px themeDarkTableBorder
kbd
background-color themeDarkBorder
color themeDarkText
1 change: 1 addition & 0 deletions browser/lib/markdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ md.use(require('markdown-it-named-headers'), {
.replace(/\-+$/, '')
}
})
md.use(require('markdown-it-kbd'))
// Override task item
md.block.ruler.at('paragraph', function (state, startLine/*, endLine */) {
let content, terminate, i, l, token
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
"markdown-it-emoji": "^1.1.1",
"markdown-it-footnote": "^3.0.0",
"markdown-it-imsize": "^2.0.1",
"markdown-it-kbd": "^1.1.0",
"markdown-it-multimd-table": "^2.0.1",
"markdown-it-named-headers": "^0.0.4",
"md5": "^2.0.0",
Expand Down
1 change: 1 addition & 0 deletions webpack-skeleton.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ var config = {
'fs-jetpack',
'@rokt33r/markdown-it-math',
'markdown-it-checkbox',
'markdown-it-kbd',
'devtron',
'mixpanel',
'@rokt33r/season',
Expand Down
4 changes: 4 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4034,6 +4034,10 @@ markdown-it-imsize:
version "2.0.1"
resolved "https://registry.yarnpkg.com/markdown-it-imsize/-/markdown-it-imsize-2.0.1.tgz#cca0427905d05338a247cb9ca9d968c5cddd5170"

markdown-it-kbd@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/markdown-it-kbd/-/markdown-it-kbd-1.1.0.tgz#d3faf5c30d494796b9cc540ab1f1a8a53dbc5d3b"

markdown-it-multimd-table@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/markdown-it-multimd-table/-/markdown-it-multimd-table-2.0.1.tgz#2e246dc2ec4ca093cbf05d43c9c1cc64e31f255d"
Expand Down

0 comments on commit 88a828c

Please sign in to comment.