Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

xiguan #135

Merged
merged 121 commits into from
May 25, 2017
Merged

xiguan #135

Changes from 2 commits
Commits
Show all changes
121 commits
Select commit Hold shift + click to select a range
537c2bf
修改换行符~
ksky521 Feb 13, 2015
8c93203
Add docs badge to README
rrrene Feb 20, 2015
81c44f5
修改io不存在的情况js报错
ksky521 Mar 7, 2015
3c5817d
修改background-color导致的页面内置图片出现问题
ksky521 Mar 7, 2015
2d8d609
修改readme
ksky521 Mar 7, 2015
24be9d5
Use local version of font-awesome.css
utensil Mar 11, 2015
3e116c8
Merge pull request #66 from utensil/patch-1
ksky521 Mar 13, 2015
68b4e70
拆分scss文件
ksky521 Mar 13, 2015
fd59270
添加roll in 动画
ksky521 Mar 13, 2015
a2e7853
1. 添加subslide
ksky521 Mar 13, 2015
9b26203
添加zoom.js
ksky521 Mar 13, 2015
f5f513e
sass 文件重新划分，增加更多样式
ksky521 Mar 15, 2015
98be031
pageup bug fix
ksky521 Mar 15, 2015
14507ef
添加皮肤
ksky521 Mar 15, 2015
1bc6f9f
修改theme和transition为js控制
ksky521 Mar 15, 2015
a653115
readme
ksky521 Mar 15, 2015
1878abe
修复 generate不存在文件报错问题
ksky521 Mar 15, 2015
9a3faf9
zoom.js
ksky521 Mar 15, 2015
16cf3f1
readme
ksky521 Mar 15, 2015
eb216b6
修改readme
ksky521 Mar 16, 2015
122b981
Merge branch 'master' of https://github.com/ksky521/nodePPT
ksky521 Apr 10, 2015
370b003
将source pro字体换到线下
ksky521 Jul 23, 2015
f44c737
新版本
ksky521 Jul 23, 2015
22cd5b3
修改ppts文件夹导出img，删除assets
Jul 27, 2015
f6c2ece
Merge pull request #82 from Shafley/patch-1
ksky521 Jul 28, 2015
2e8585e
iframe修改，print修改，中文路径支持
ksky521 Aug 2, 2015
a498e92
可改变画笔颜色、粗细
jmxhyz Aug 11, 2015
39ae36d
Merge pull request #1 from jmxhyz/jmxhyz-patch-1
jmxhyz Aug 11, 2015
a5b29ee
多点触屏，画笔颜色、粗细可选
jmxhyz Aug 11, 2015
97f23dc
多点触屏，画笔颜色、粗细可选
jmxhyz Aug 11, 2015
ab9f9e2
多点触屏，画笔颜色、粗细可选
jmxhyz Aug 11, 2015
7284bc2
Merge pull request #2 from jmxhyz/jmxhyz-patch-2
jmxhyz Aug 11, 2015
bb95b1e
增加：使用MathJax渲染公式
jmxhyz Aug 14, 2015
0b1ed54
增加：使用MathJax渲染公式
jmxhyz Aug 14, 2015
a946d80
增加：使用MathJax渲染公式
jmxhyz Aug 14, 2015
ddd43e9
取消$作为行间公式界定，避免与货币含义冲突。
jmxhyz Aug 14, 2015
b947c3f
增加：使用MathJax渲染公式
jmxhyz Aug 14, 2015
8fbeefa
取消$作为行间公式界定，避免与货币含义冲突。
jmxhyz Aug 14, 2015
7752215
修正计时器
jmxhyz Aug 18, 2015
041756e
修正计时器
jmxhyz Aug 18, 2015
1fb5b4f
画笔颜色、粗细
jmxhyz Aug 18, 2015
e49d9b5
幻灯片跳转：输入索引数字后回车
jmxhyz Aug 18, 2015
8f17ed4
Merge pull request #60 from rrrene/patch-1
ksky521 Sep 16, 2015
acc7ead
Merge pull request #89 from jmxhyz/master
ksky521 Sep 16, 2015
d0fe29a
添加sup、em样式
ksky521 Sep 16, 2015
6ce1fc1
添加mathjax本地化
ksky521 Sep 16, 2015
ab46ff2
添加mathjax本地化
ksky521 Sep 16, 2015
5389ab5
update highlight.js to the latest version; fix dead link in templates
myst729 Oct 21, 2015
d31e2ac
添加mathjax fonts
ksky521 Oct 21, 2015
86c455e
use consistent path style
myst729 Oct 21, 2015
d785129
Merge pull request #99 from myst729/master
ksky521 Oct 26, 2015
3844ba6
1. 修改blackquote内部strong问题
ksky521 Oct 28, 2015
52b6b3f
修改-v命令支持
ksky521 Oct 28, 2015
0fce16c
fix generate break
myst729 Oct 28, 2015
e1243d9
fix generated html 404
myst729 Oct 28, 2015
fee464d
Merge pull request #102 from myst729/master
ksky521 Oct 29, 2015
11e829f
导出的bug，加强导出文件的检测
ksky521 Oct 29, 2015
9f55e7b
修改版本号
ksky521 Oct 29, 2015
d5c23f3
去掉最后一页
ksky521 Oct 30, 2015
c44b6b5
Fix typo
Nov 17, 2015
8b81835
Merge pull request #107 from huanzhang/master
ksky521 Nov 17, 2015
f576250
生成改成相对路径
ksky521 Nov 29, 2015
e465efb
remove highlight
ksky521 Nov 29, 2015
3232d41
add highlight
ksky521 Nov 29, 2015
30dd446
list样式修改
ksky521 Nov 29, 2015
0137ec9
remove hightlight
ksky521 Nov 29, 2015
5677b31
remove highlight
ksky521 Nov 29, 2015
427999e
highlight
ksky521 Nov 29, 2015
f8b5b82
remove highlight
ksky521 Nov 29, 2015
8047722
highlight
ksky521 Nov 29, 2015
a574776
postmessage 双屏互动
ksky521 Dec 1, 2015
a1c13d4
修改postmsg的报错
ksky521 Dec 1, 2015
3e541d9
controll重新梳理
ksky521 Dec 1, 2015
0976512
socket
ksky521 Dec 1, 2015
1d14222
双向通信
ksky521 Dec 1, 2015
b6a213e
修改alias
ksky521 Dec 6, 2015
56ee0ac
修改readme
ksky521 Dec 6, 2015
3c456d5
增加事件build和keypress
ksky521 Dec 9, 2015
be8fb01
修改readme
ksky521 Dec 9, 2015
422029e
解决冲突
ksky521 Dec 9, 2015
024bbf9
添加magic效果，todo：垂直居中；parse
ksky521 Dec 10, 2015
f030a26
todo完成~ 支持magic垂直居中和隐藏
ksky521 Dec 10, 2015
d421b15
magic parser hgroup
ksky521 Dec 10, 2015
5c15237
nodeppt earthbreak
ksky521 Dec 11, 2015
b06beee
README
ksky521 Dec 11, 2015
f2dcf01
动效调整
ksky521 Dec 11, 2015
ff97398
1.4.0-beta release
ksky521 Dec 11, 2015
1a3b7b6
调整magic
ksky521 Dec 12, 2015
3303cb4
发布1.4.0版本
ksky521 Dec 12, 2015
174dc0b
readme+demo
ksky521 Dec 12, 2015
dc0dc19
readme
ksky521 Dec 12, 2015
6fc22a4
修改动效
ksky521 Dec 13, 2015
89eb60b
修改动效
ksky521 Dec 13, 2015
c8c353e
修改readme
ksky521 Dec 13, 2015
8425493
解决最新版本npm会将依赖扁平化,Mathjax路径时效
zl810881283 Apr 24, 2016
876e2fe
mathjax 2.5.1 无法安装
jincdream May 3, 2016
73713e4
Merge pull request #128 from jincdream/master
ksky521 May 18, 2016
6e7aa80
Merge pull request #127 from zl810881283/master
ksky521 May 18, 2016
a5515b4
mathjax依赖
ksky521 May 18, 2016
b377c66
增加debug，删除pdf支持
ksky521 May 18, 2016
92d326b
add support of option asset-path
HakurouKen Sep 16, 2016
dad1230
update desc
HakurouKen Sep 17, 2016
ef494a8
Remove useless type convert
HakurouKen Sep 17, 2016
648f766
Fix error script path loaded by MixJS
HakurouKen Sep 17, 2016
5040361
Merge pull request #143 from HakurouKen/master
ksky521 Sep 27, 2016
feaff81
fixed #148 magic多个子页面列表动效失效bug
daviscai Oct 27, 2016
cd7e790
Fix typos.
HakurouKen Nov 30, 2016
cfe2d3c
Add main entry point.
HakurouKen Nov 30, 2016
bff6712
Move demo images out of public assets.
HakurouKen Dec 2, 2016
869ce00
Update package.json
moyi497475207 Feb 25, 2017
1fd3d66
Merge pull request #157 from moyi497475207/patch-1
ksky521 Feb 25, 2017
422523d
图片添加禁止全屏的方法
XinHuaLuFang Mar 7, 2017
93cf6be
Update nodePPT/README.md
xiaohaoliang Mar 9, 2017
1588633
Merge pull request #158 from XinHuaLuFang/master
ksky521 Mar 23, 2017
1a664a3
Merge pull request #159 from xiaohaoliang/patch-1
ksky521 Mar 23, 2017
367dfe7
Merge pull request #150 from daviscai/master
ksky521 Mar 23, 2017
a375964
Merge pull request #152 from HakurouKen/master
ksky521 Mar 23, 2017
df7ea92
修改类名
XinHuaLuFang Mar 24, 2017
afc29a3
是否是目录-逻辑错误
WJer Mar 24, 2017
7213f18
Merge pull request #161 from XinHuaLuFang/master
ksky521 Mar 29, 2017
a8cf089
Merge pull request #162 from WJer/master
ksky521 Mar 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion template/markdown.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<link rel="stylesheet" media="only screen and (max-device-width: 480px)" href="/css/phone.css">
<link rel="stylesheet" media="print" href="/css/pdf.css">
<link rel="stylesheet" href="/js/highlight/styles/<%if (hasOwnProperty('highlightStyle') && highlightStyle!=='') { %><%- highlightStyle %><% }else{%>monokai_sublime<%}%>.css">
<link rel="stylesheet" href="http://apps.bdimg.com/libs/fontawesome/4.2.0/css/font-awesome.min.css">
<link rel="stylesheet" href="/css/font-awesome.css">
</head>
<body>
<div class="slides">
Expand Down