xiguan #135
Merged
xiguan #135
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[ci skip]
Use local version of font-awesome.css
2. 修复同步问题
Conflicts: README.md
建议assets文件夹作为私有文件夹，不要放img， ppts作为用户公用文件夹，可以增加img文件夹放用户图片
修改ppts文件夹导出img，删除assets下的img
键R-红色，B-蓝色，M-洋红色，G-绿色，Y-黄色。数字键1、2、3、4四种粗细。
可改变画笔颜色、粗细
npm ERR! shasum check failed for C:\Users\pc\AppData\Local\Temp\npm-10744-b2a85392\registry.npmjs.org\mathjax\-\mathjax-2.5.1.tgz npm ERR! Expected: 7e9dde72faff8f7248e1d480a6971b4019a61890 npm ERR! Actual: 5f10fb0f11ece5ed28ca8eccc667aad7ccf429ea npm ERR! From: https://registry.npmjs.org/mathjax/-/mathjax-2.5.1.tgz npm ERR! npm ERR! If you need help, you may report this error at: npm ERR! <https://github.com/npm/npm/issues> npm info preuninstall nodeppt@1.4.1 npm info uninstall nodeppt@1.4.1 npm info postuninstall nodeppt@1.4.1 npm ERR! Please include the following file with any support request: npm ERR! C:\Users\pc\Desktop\npm-debug.log
mathjax 2.5.1 无法安装
解决最新版本npm会将依赖扁平化,Mathjax路径失效
|
改了这么多，不敢合并啊 |
添加 asset-path 选项
Update package.json
关于导出pdf的功能说明
图片添加禁止全屏的方法
Update nodePPT/README.md
fixed #148 magic多个子页面列表动效失效bug
添加 main 入口 && 非公共 imgs 文件移动
|
含泪merge了吧，看了基本靠谱 |
ksky521
added a commit
that referenced
this pull request
May 25, 2017
Merge pull request #135 from ksky521/master
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
xiguan