Skip to content

Commit

Permalink
Merge pull request #9 from editor-js/new-icon
Browse files Browse the repository at this point in the history
Improve icon size to correspond new Toolbar style in 2.16
  • Loading branch information
neSpecc committed Nov 30, 2019
2 parents 522f4bc + db60976 commit 37a5e8d
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 535 deletions.
1 change: 1 addition & 0 deletions assets/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion dist/bundle.js

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@editorjs/inline-code",
"version": "1.3.0",
"version": "1.3.1",
"keywords": [
"codex editor",
"inline",
Expand All @@ -26,6 +26,7 @@
"@babel/preset-env": "^7.3.4",
"babel-loader": "^8.0.5",
"css-loader": "^1.0.0",
"raw-loader": "^3.1.0",
"style-loader": "^0.21.0",
"webpack": "^4.29.5",
"webpack-cli": "^3.2.3"
Expand Down
16 changes: 9 additions & 7 deletions src/index.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
.inline-code {
background: rgba(251,241,241,0.78);
color: #C44545;
padding: 4px 6px;
border-radius: 2px;
margin: 0 2px;
font-family: Menlo, Monaco, Consolas, Courier New, monospace;
font-size: 0.9em;
background: rgba(250, 239, 240, 0.78);
color: #b44437;
padding: 3px 4px;
border-radius: 5px;
margin: 0 1px;
font-family: inherit;
font-size: 0.86em;
font-weight: 500;
letter-spacing: 0.3px;
}
2 changes: 1 addition & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ class InlineCode {
* @return {string}
*/
get toolboxIcon() {
return '<svg width="19" height="13" viewBox="0 0 19 13" xmlns="http://www.w3.org/2000/svg"><path d="M17.839 5.525a1.105 1.105 0 0 1-.015 1.547l-4.943 4.943a1.105 1.105 0 1 1-1.562-1.562l4.137-4.137-4.078-4.078A1.125 1.125 0 1 1 12.97.648l4.796 4.796c.026.026.05.053.074.08zm-14.952.791l4.137 4.137a1.105 1.105 0 1 1-1.562 1.562L.519 7.072a1.105 1.105 0 0 1-.015-1.547c.023-.028.048-.055.074-.081L5.374.647a1.125 1.125 0 0 1 1.591 1.591L2.887 6.316z" id="a"/></svg>';
return require('./../assets/icon.svg').default;
}

/**
Expand Down
8 changes: 8 additions & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@ module.exports = {
'style-loader',
'css-loader'
]
},
{
test: /\.(svg)$/,
use: [
{
loader: 'raw-loader',
}
]
}
]
},
Expand Down
552 changes: 27 additions & 525 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit 37a5e8d

Please sign in to comment.