Merge branch 'master' into localstorage-plugin

# Conflicts:
#	codex-editor.js
#	codex-editor.js.map
#	example.html
#	package.json
#	whatwg-fetch.js.map
This commit is contained in:
Peter Savchenko 2017-02-11 14:17:58 +03:00
commit 38ac3741b8
13 changed files with 60 additions and 44 deletions

View file

@ -147,6 +147,7 @@
border-radius: 2px;
padding: 6px 5px;
line-height: 1em;
font-size: 14px;
background: #fff;
}
@ -443,6 +444,7 @@
max-width: 100px;
word-wrap: break-word;
font-size: 12px;
line-height: 1.4em;
}