Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ksky521/nodePPT
Browse files Browse the repository at this point in the history
  • Loading branch information
ksky521 committed Oct 15, 2014
2 parents e1a306a + 68cc858 commit 09e699a
Show file tree
Hide file tree
Showing 220 changed files with 31 additions and 18 deletions.
Empty file modified .gitignore
100644 → 100755
Empty file.
Empty file modified MIT-LICENSE.txt
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion README.md
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ nodePPT - 让你爱上做分享!
* 支持单页背景图片
* 多种模式:overview模式,[双屏模式](#postmessage)[socket远程控制](#socket),摇一摇换页,使用ipad控制做分享更酷哦~
* 可以使用画板,可以使用note做备注
* 支持语法高亮,自由选择highlight样式
* 支持语法高亮,自由选择[highlight样式](https://highlightjs.org/)
* 可以单页ppt内部动画,单步动画
* [支持进入/退出回调](#callback),做在线demo很方便

Expand Down
2 changes: 1 addition & 1 deletion assets/css/animation.css
100644 → 100755

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file modified assets/css/eater.woff
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion assets/css/nodeppt.css
100644 → 100755

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/nodeppt2.0.css
100644 → 100755

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/pdf.css
100644 → 100755

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file modified assets/css/pen.cur
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion assets/css/phone.css
100644 → 100755

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file modified assets/css/sourcecode.woff
100644 → 100755
Empty file.
Empty file modified assets/css/tangerine.woff
100644 → 100755
Empty file.
Empty file modified assets/img/bg.jpg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/img/bg1.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/js/event/broadcast.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/default.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/highlight.pack.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/hljs-0.8.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/1c.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/actionscript.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/apache.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/applescript.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/asciidoc.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/autohotkey.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/avrasm.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/axapta.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/bash.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/brainfuck.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/capnproto.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/clojure.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/cmake.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/coffeescript.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/cpp.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/cs.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/css.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/d.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/delphi.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/diff.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/django.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/dos.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/elixir.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/erlang-repl.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/erlang.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/fix.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/fsharp.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/gherkin.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/glsl.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/go.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/gradle.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/haml.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/handlebars.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/haskell.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/haxe.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/http.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/ini.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/java.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/javascript.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/json.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/lasso.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/lisp.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/livecodeserver.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/lua.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/makefile.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/markdown.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/mathematica.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/matlab.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/mel.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/mizar.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/monkey.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/nginx.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/nimrod.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/nix.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/nsis.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/objectivec.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/ocaml.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/oxygene.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/parser3.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/perl.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/php.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/profile.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/protobuf.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/python.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/r.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/rib.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/rsl.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/ruby.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/ruleslanguage.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/rust.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/scala.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/scilab.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/scss.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/smalltalk.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/sql.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/swift.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/tex.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/thrift.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/typescript.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/vala.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/vbnet.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/vbscript.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/vhdl.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/vim.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/x86asm.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/languages/xml.js
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/arta.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/ascetic.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/atelier-dune.dark.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/atelier-dune.light.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/atelier-forest.dark.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/atelier-forest.light.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/atelier-heath.dark.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/atelier-heath.light.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/atelier-lakeside.dark.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/atelier-lakeside.light.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/atelier-seaside.dark.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/atelier-seaside.light.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/brown_paper.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/brown_papersq.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/js/highlight/styles/codepen-embed.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/color-brewer.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/dark.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/default.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/docco.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/far.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/foundation.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/github.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/googlecode.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/hybrid.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/idea.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/ir_black.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/kimbie.dark.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/kimbie.light.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/magula.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/mono-blue.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/monokai.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/monokai_sublime.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/obsidian.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/paraiso.dark.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/paraiso.light.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/pojoaque.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/pojoaque.jpg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/js/highlight/styles/railscasts.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/rainbow.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/school_book.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/school_book.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified assets/js/highlight/styles/solarized_dark.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/solarized_light.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/sunburst.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/tomorrow-night-blue.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/tomorrow-night-bright.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/tomorrow-night-eighties.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/tomorrow-night.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/tomorrow.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/vs.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/xcode.css
100644 → 100755
Empty file.
Empty file modified assets/js/highlight/styles/zenburn.css
100644 → 100755
Empty file.
Empty file modified assets/js/img.screenfull.js
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/.gitignore
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/Gruntfile.js
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/MIT-LICENSE.txt
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/README.md
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/lib/event/broadcast.js
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/lib/event/wait.js
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/lib/mix-0.2.js
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/lib/mix.0.3.0.js
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/lib/mix.0.3.0.map
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/lib/mix.0.3.0.min.js
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/package.json
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/research/js.php
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/research/load-test.html
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/research/loadjs.html
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/research/userAgent.html
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/src/Module.js
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/src/Promise.js
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/src/browser.js
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/src/core.js
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/src/getCurrentScript.js
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/src/getPath.js
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/src/intro.js
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/src/loadcss-img.js
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/src/loadcss.js
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/src/loadjs.js
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/src/outro.js
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/src/typeof.js
100644 → 100755
Empty file.
Empty file modified assets/js/mixjs/src/vars.js
100644 → 100755
Empty file.
Empty file modified assets/js/nodeppt.control.js
100644 → 100755
Empty file.
Empty file modified assets/js/nodeppt.control.postMessage.js
100644 → 100755
Empty file.
Empty file modified assets/js/nodeppt.control.socket.js
100644 → 100755
Empty file.
Empty file modified assets/js/nodeppt.js
100644 → 100755
Empty file.
Empty file modified assets/js/prettify.js
100644 → 100755
Empty file.
Empty file modified assets/js/qrcode.js
100644 → 100755
Empty file.
Empty file modified assets/js/shake.js
100644 → 100755
Empty file.
Empty file modified assets/js/socket.io.js
100644 → 100755
Empty file.
Empty file modified assets/scss/_base.scss
100644 → 100755
Empty file.
Empty file modified assets/scss/animation.scss
100644 → 100755
Empty file.
Empty file modified assets/scss/nodeppt.scss
100644 → 100755
Empty file.
33 changes: 23 additions & 10 deletions assets/scss/nodeppt2.0.scss
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ slides > slide .slide-wrapper{
}
}
img{
max-width: $slide-width-widescreen - $slide-left-right-padding*2;
max-width: 100%;
max-height: $slide-height - $slide-top-bottom-padding*2;
}

Expand Down Expand Up @@ -291,7 +291,7 @@ slides > slide {
display: none;
font-size: 26px;
color: white;
background-color: #4FC5C7;
background-color: #03C8CB;
width: 100%;
height: 100%;
position: absolute;
Expand Down Expand Up @@ -368,16 +368,16 @@ slides > slide {
background-color: #dc6c5f
}
&:nth-child(6n+2){
background-color: #95dc84
background-color: #04AA55
}
&:nth-child(6n+3){
background-color: #60d7a9
background-color: #487BD3
}
&:nth-child(6n+4){
background-color: #fdc162
background-color: #049DBF
}
&:nth-child(6n+5){
background-color: #f68dbb
background-color: #DA4A89
}

.note{
Expand Down Expand Up @@ -466,7 +466,7 @@ h1, h2, h3 {

h1 {
font-size: 45px;
line-height: 45px;
line-height: 1.5;
color: white;
margin-bottom: 0.5em;
@include text-shadow(2px 3px 4px black);
Expand Down Expand Up @@ -515,7 +515,8 @@ ul {
}

// Code highlighting only effects the current slide.
.highlight-code slide.current {
.highlight-code slide.current,
slide.current .hljs{
b,strong{
@include shake();
-webkit-animation-duration: 1.5s;
Expand All @@ -527,10 +528,22 @@ ul {
animation-duration: 1.5s;
}
}
.highlight-code slide.current .hljs{
b,strong{
@include flash();
-webkit-animation-duration: 1.5s;
animation-duration: 1.5s;
}
em{
@include shake();
-webkit-animation-duration: 1.5s;
animation-duration: 1.5s;
}

}
pre {
display: inline-block;
overflow: auto;
// display: inline-block;
// overflow: auto;
font-family: 'Source Code Pro', 'Courier New', monospace;
font-size: 20px;
line-height: 1.2em;
Expand Down
Empty file modified assets/scss/pdf.scss
100644 → 100755
Empty file.
Empty file modified assets/scss/phone.scss
100644 → 100755
Empty file.
Empty file modified bin/nodeppt
100644 → 100755
Empty file.
Empty file modified config.json
100644 → 100755
Empty file.
Empty file modified config.rb
100644 → 100755
Empty file.
Empty file modified lib/copy.js
100644 → 100755
Empty file.
Empty file modified lib/generate.js
100644 → 100755
Empty file.
Empty file modified lib/helper.js
100644 → 100755
Empty file.
Empty file modified lib/marked.js
100644 → 100755
Empty file.
Empty file modified lib/md_parser.js
100644 → 100755
Empty file.
Empty file modified lib/mime.json
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion lib/nodePPT.js
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ var ppt = module.exports = {

var dir = argsObj.dir;
if (dir === '') {
dir = path.join(rootDir, 'ppts');
dir = curRoot;//path.join(rootDir, 'ppts');
}

if (!fs.existsSync(dir)) {
Expand Down
Empty file modified lib/pdf.js
100644 → 100755
Empty file.
Empty file modified lib/server.js
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion package.json
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "nodeppt",
"jsname": "nodeppt",
"description": "A simple, in-browser, markdown-driven presentation framework",
"version": "0.8.9-1",
"version": "0.8.10",
"site": "https://github.com/ksky521/nodePPT",
"author": {
"name": "Theo Wang",
Expand Down
Empty file modified ppts/css/demo.css
100644 → 100755
Empty file.
Empty file modified ppts/demo.md
100644 → 100755
Empty file.
Empty file modified ppts/girl.jpg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified ppts/js/demo.js
100644 → 100755
Empty file.
Empty file modified template/default.ejs
100644 → 100755
Empty file.
Empty file modified template/defaultmd.ejs
100644 → 100755
Empty file.
Empty file modified template/list.ejs
100644 → 100755
Empty file.
Empty file modified template/markdown.ejs
100644 → 100755
Empty file.

0 comments on commit 09e699a

Please sign in to comment.