Skip to content

Commit 68cc858

Browse files
committed
修改样式
1 parent aadf2fb commit 68cc858

File tree

220 files changed

+31
-18
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

220 files changed

+31
-18
lines changed

.gitignore

100644100755
File mode changed.

MIT-LICENSE.txt

100644100755
File mode changed.

README.md

100644100755
+1-1

assets/css/animation.css

100644100755
+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/css/eater.woff

100644100755
File mode changed.

assets/css/nodeppt.css

100644100755
+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/css/nodeppt2.0.css

100644100755
+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/css/pdf.css

100644100755
+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/css/pen.cur

100644100755
File mode changed.

assets/css/phone.css

100644100755
+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/css/sourcecode.woff

100644100755
File mode changed.

assets/css/tangerine.woff

100644100755
File mode changed.

assets/img/bg.jpg

100644100755
File mode changed.

assets/img/bg1.png

100644100755
File mode changed.

assets/js/event/broadcast.js

100644100755
File mode changed.

assets/js/highlight/default.css

100644100755
File mode changed.

assets/js/highlight/highlight.pack.js

100644100755
File mode changed.

assets/js/highlight/hljs-0.8.js

100644100755
File mode changed.

assets/js/highlight/languages/1c.js

100644100755
File mode changed.

assets/js/highlight/languages/actionscript.js

100644100755
File mode changed.

assets/js/highlight/languages/apache.js

100644100755
File mode changed.

assets/js/highlight/languages/applescript.js

100644100755
File mode changed.

assets/js/highlight/languages/asciidoc.js

100644100755
File mode changed.

assets/js/highlight/languages/autohotkey.js

100644100755
File mode changed.

assets/js/highlight/languages/avrasm.js

100644100755
File mode changed.

assets/js/highlight/languages/axapta.js

100644100755
File mode changed.

assets/js/highlight/languages/bash.js

100644100755
File mode changed.

assets/js/highlight/languages/brainfuck.js

100644100755
File mode changed.

assets/js/highlight/languages/capnproto.js

100644100755
File mode changed.

assets/js/highlight/languages/clojure.js

100644100755
File mode changed.

assets/js/highlight/languages/cmake.js

100644100755
File mode changed.

assets/js/highlight/languages/coffeescript.js

100644100755
File mode changed.

assets/js/highlight/languages/cpp.js

100644100755
File mode changed.

assets/js/highlight/languages/cs.js

100644100755
File mode changed.

assets/js/highlight/languages/css.js

100644100755
File mode changed.

assets/js/highlight/languages/d.js

100644100755
File mode changed.

assets/js/highlight/languages/delphi.js

100644100755
File mode changed.

assets/js/highlight/languages/diff.js

100644100755
File mode changed.

assets/js/highlight/languages/django.js

100644100755
File mode changed.

assets/js/highlight/languages/dos.js

100644100755
File mode changed.

assets/js/highlight/languages/elixir.js

100644100755
File mode changed.

assets/js/highlight/languages/erlang-repl.js

100644100755
File mode changed.

assets/js/highlight/languages/erlang.js

100644100755
File mode changed.

assets/js/highlight/languages/fix.js

100644100755
File mode changed.

assets/js/highlight/languages/fsharp.js

100644100755
File mode changed.

assets/js/highlight/languages/gherkin.js

100644100755
File mode changed.

assets/js/highlight/languages/glsl.js

100644100755
File mode changed.

assets/js/highlight/languages/go.js

100644100755
File mode changed.

assets/js/highlight/languages/gradle.js

100644100755
File mode changed.

assets/js/highlight/languages/haml.js

100644100755
File mode changed.

assets/js/highlight/languages/handlebars.js

100644100755
File mode changed.

assets/js/highlight/languages/haskell.js

100644100755
File mode changed.

assets/js/highlight/languages/haxe.js

100644100755
File mode changed.

assets/js/highlight/languages/http.js

100644100755
File mode changed.

assets/js/highlight/languages/ini.js

100644100755
File mode changed.

assets/js/highlight/languages/java.js

100644100755
File mode changed.

assets/js/highlight/languages/javascript.js

100644100755
File mode changed.

assets/js/highlight/languages/json.js

100644100755
File mode changed.

assets/js/highlight/languages/lasso.js

100644100755
File mode changed.

assets/js/highlight/languages/lisp.js

100644100755
File mode changed.

assets/js/highlight/languages/livecodeserver.js

100644100755
File mode changed.

assets/js/highlight/languages/lua.js

100644100755
File mode changed.

assets/js/highlight/languages/makefile.js

100644100755
File mode changed.

assets/js/highlight/languages/markdown.js

100644100755
File mode changed.

assets/js/highlight/languages/mathematica.js

100644100755
File mode changed.

assets/js/highlight/languages/matlab.js

100644100755
File mode changed.

assets/js/highlight/languages/mel.js

100644100755
File mode changed.

assets/js/highlight/languages/mizar.js

100644100755
File mode changed.

assets/js/highlight/languages/monkey.js

100644100755
File mode changed.

assets/js/highlight/languages/nginx.js

100644100755
File mode changed.

assets/js/highlight/languages/nimrod.js

100644100755
File mode changed.

assets/js/highlight/languages/nix.js

100644100755
File mode changed.

assets/js/highlight/languages/nsis.js

100644100755
File mode changed.

assets/js/highlight/languages/objectivec.js

100644100755
File mode changed.

assets/js/highlight/languages/ocaml.js

100644100755
File mode changed.

assets/js/highlight/languages/oxygene.js

100644100755
File mode changed.

assets/js/highlight/languages/parser3.js

100644100755
File mode changed.

assets/js/highlight/languages/perl.js

100644100755
File mode changed.

assets/js/highlight/languages/php.js

100644100755
File mode changed.

assets/js/highlight/languages/profile.js

100644100755
File mode changed.

assets/js/highlight/languages/protobuf.js

100644100755
File mode changed.

assets/js/highlight/languages/python.js

100644100755
File mode changed.

assets/js/highlight/languages/r.js

100644100755
File mode changed.

assets/js/highlight/languages/rib.js

100644100755
File mode changed.

assets/js/highlight/languages/rsl.js

100644100755
File mode changed.

assets/js/highlight/languages/ruby.js

100644100755
File mode changed.

assets/js/highlight/languages/ruleslanguage.js

100644100755
File mode changed.

assets/js/highlight/languages/rust.js

100644100755
File mode changed.

assets/js/highlight/languages/scala.js

100644100755
File mode changed.

assets/js/highlight/languages/scilab.js

100644100755
File mode changed.

assets/js/highlight/languages/scss.js

100644100755
File mode changed.

assets/js/highlight/languages/smalltalk.js

100644100755
File mode changed.

assets/js/highlight/languages/sql.js

100644100755
File mode changed.

assets/js/highlight/languages/swift.js

100644100755
File mode changed.

assets/js/highlight/languages/tex.js

100644100755
File mode changed.

assets/js/highlight/languages/thrift.js

100644100755
File mode changed.

assets/js/highlight/languages/typescript.js

100644100755
File mode changed.

assets/js/highlight/languages/vala.js

100644100755
File mode changed.

assets/js/highlight/languages/vbnet.js

100644100755
File mode changed.

assets/js/highlight/languages/vbscript.js

100644100755
File mode changed.

assets/js/highlight/languages/vhdl.js

100644100755
File mode changed.

assets/js/highlight/languages/vim.js

100644100755
File mode changed.

assets/js/highlight/languages/x86asm.js

100644100755
File mode changed.

assets/js/highlight/languages/xml.js

100644100755
File mode changed.

assets/js/highlight/styles/arta.css

100644100755
File mode changed.

assets/js/highlight/styles/ascetic.css

100644100755
File mode changed.

assets/js/highlight/styles/atelier-dune.dark.css

100644100755
File mode changed.

assets/js/highlight/styles/atelier-dune.light.css

100644100755
File mode changed.

assets/js/highlight/styles/atelier-forest.dark.css

100644100755
File mode changed.

assets/js/highlight/styles/atelier-forest.light.css

100644100755
File mode changed.

assets/js/highlight/styles/atelier-heath.dark.css

100644100755
File mode changed.

assets/js/highlight/styles/atelier-heath.light.css

100644100755
File mode changed.

assets/js/highlight/styles/atelier-lakeside.dark.css

100644100755
File mode changed.

assets/js/highlight/styles/atelier-lakeside.light.css

100644100755
File mode changed.

assets/js/highlight/styles/atelier-seaside.dark.css

100644100755
File mode changed.

assets/js/highlight/styles/atelier-seaside.light.css

100644100755
File mode changed.

assets/js/highlight/styles/brown_paper.css

100644100755
File mode changed.

assets/js/highlight/styles/brown_papersq.png

100644100755
File mode changed.

assets/js/highlight/styles/codepen-embed.css

100644100755
File mode changed.

assets/js/highlight/styles/color-brewer.css

100644100755
File mode changed.

assets/js/highlight/styles/dark.css

100644100755
File mode changed.

assets/js/highlight/styles/default.css

100644100755
File mode changed.

assets/js/highlight/styles/docco.css

100644100755
File mode changed.

assets/js/highlight/styles/far.css

100644100755
File mode changed.

assets/js/highlight/styles/foundation.css

100644100755
File mode changed.

assets/js/highlight/styles/github.css

100644100755
File mode changed.

assets/js/highlight/styles/googlecode.css

100644100755
File mode changed.

assets/js/highlight/styles/hybrid.css

100644100755
File mode changed.

assets/js/highlight/styles/idea.css

100644100755
File mode changed.

assets/js/highlight/styles/ir_black.css

100644100755
File mode changed.

assets/js/highlight/styles/kimbie.dark.css

100644100755
File mode changed.

assets/js/highlight/styles/kimbie.light.css

100644100755
File mode changed.

assets/js/highlight/styles/magula.css

100644100755
File mode changed.

assets/js/highlight/styles/mono-blue.css

100644100755
File mode changed.

assets/js/highlight/styles/monokai.css

100644100755
File mode changed.

assets/js/highlight/styles/monokai_sublime.css

100644100755
File mode changed.

assets/js/highlight/styles/obsidian.css

100644100755
File mode changed.

assets/js/highlight/styles/paraiso.dark.css

100644100755
File mode changed.

assets/js/highlight/styles/paraiso.light.css

100644100755
File mode changed.

assets/js/highlight/styles/pojoaque.css

100644100755
File mode changed.

assets/js/highlight/styles/pojoaque.jpg

100644100755
File mode changed.

assets/js/highlight/styles/railscasts.css

100644100755
File mode changed.

assets/js/highlight/styles/rainbow.css

100644100755
File mode changed.

assets/js/highlight/styles/school_book.css

100644100755
File mode changed.

assets/js/highlight/styles/school_book.png

100644100755
File mode changed.

assets/js/highlight/styles/solarized_dark.css

100644100755
File mode changed.

assets/js/highlight/styles/solarized_light.css

100644100755
File mode changed.

assets/js/highlight/styles/sunburst.css

100644100755
File mode changed.

assets/js/highlight/styles/tomorrow-night-blue.css

100644100755
File mode changed.

assets/js/highlight/styles/tomorrow-night-bright.css

100644100755
File mode changed.

assets/js/highlight/styles/tomorrow-night-eighties.css

100644100755
File mode changed.

assets/js/highlight/styles/tomorrow-night.css

100644100755
File mode changed.

assets/js/highlight/styles/tomorrow.css

100644100755
File mode changed.

assets/js/highlight/styles/vs.css

100644100755
File mode changed.

assets/js/highlight/styles/xcode.css

100644100755
File mode changed.

assets/js/highlight/styles/zenburn.css

100644100755
File mode changed.

assets/js/img.screenfull.js

100644100755
File mode changed.

assets/js/mixjs/.gitignore

100644100755
File mode changed.

assets/js/mixjs/Gruntfile.js

100644100755
File mode changed.

assets/js/mixjs/MIT-LICENSE.txt

100644100755
File mode changed.

assets/js/mixjs/README.md

100644100755
File mode changed.

assets/js/mixjs/lib/event/broadcast.js

100644100755
File mode changed.

assets/js/mixjs/lib/event/wait.js

100644100755
File mode changed.

assets/js/mixjs/lib/mix-0.2.js

100644100755
File mode changed.

assets/js/mixjs/lib/mix.0.3.0.js

100644100755
File mode changed.

assets/js/mixjs/lib/mix.0.3.0.map

100644100755
File mode changed.

assets/js/mixjs/lib/mix.0.3.0.min.js

100644100755
File mode changed.

assets/js/mixjs/package.json

100644100755
File mode changed.

assets/js/mixjs/research/js.php

100644100755
File mode changed.

assets/js/mixjs/research/load-test.html

100644100755
File mode changed.

assets/js/mixjs/research/loadjs.html

100644100755
File mode changed.

assets/js/mixjs/research/userAgent.html

100644100755
File mode changed.

assets/js/mixjs/src/Module.js

100644100755
File mode changed.

assets/js/mixjs/src/Promise.js

100644100755
File mode changed.

assets/js/mixjs/src/browser.js

100644100755
File mode changed.

assets/js/mixjs/src/core.js

100644100755
File mode changed.

assets/js/mixjs/src/getCurrentScript.js

100644100755
File mode changed.

assets/js/mixjs/src/getPath.js

100644100755
File mode changed.

assets/js/mixjs/src/intro.js

100644100755
File mode changed.

assets/js/mixjs/src/loadcss-img.js

100644100755
File mode changed.

assets/js/mixjs/src/loadcss.js

100644100755
File mode changed.

assets/js/mixjs/src/loadjs.js

100644100755
File mode changed.

assets/js/mixjs/src/outro.js

100644100755
File mode changed.

assets/js/mixjs/src/typeof.js

100644100755
File mode changed.

assets/js/mixjs/src/vars.js

100644100755
File mode changed.

assets/js/nodeppt.control.js

100644100755
File mode changed.

assets/js/nodeppt.control.postMessage.js

100644100755
File mode changed.

assets/js/nodeppt.control.socket.js

100644100755
File mode changed.

assets/js/nodeppt.js

100644100755
File mode changed.

assets/js/prettify.js

100644100755
File mode changed.

assets/js/qrcode.js

100644100755
File mode changed.

assets/js/shake.js

100644100755
File mode changed.

assets/js/socket.io.js

100644100755
File mode changed.

assets/scss/_base.scss

100644100755
File mode changed.

assets/scss/animation.scss

100644100755
File mode changed.

assets/scss/nodeppt.scss

100644100755
File mode changed.

assets/scss/nodeppt2.0.scss

100644100755
+23-10
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ slides > slide .slide-wrapper{
225225
}
226226
}
227227
img{
228-
max-width: $slide-width-widescreen - $slide-left-right-padding*2;
228+
max-width: 100%;
229229
max-height: $slide-height - $slide-top-bottom-padding*2;
230230
}
231231

@@ -291,7 +291,7 @@ slides > slide {
291291
display: none;
292292
font-size: 26px;
293293
color: white;
294-
background-color: #4FC5C7;
294+
background-color: #03C8CB;
295295
width: 100%;
296296
height: 100%;
297297
position: absolute;
@@ -368,16 +368,16 @@ slides > slide {
368368
background-color: #dc6c5f
369369
}
370370
&:nth-child(6n+2){
371-
background-color: #95dc84
371+
background-color: #04AA55
372372
}
373373
&:nth-child(6n+3){
374-
background-color: #60d7a9
374+
background-color: #487BD3
375375
}
376376
&:nth-child(6n+4){
377-
background-color: #fdc162
377+
background-color: #049DBF
378378
}
379379
&:nth-child(6n+5){
380-
background-color: #f68dbb
380+
background-color: #DA4A89
381381
}
382382

383383
.note{
@@ -466,7 +466,7 @@ h1, h2, h3 {
466466

467467
h1 {
468468
font-size: 45px;
469-
line-height: 45px;
469+
line-height: 1.5;
470470
color: white;
471471
margin-bottom: 0.5em;
472472
@include text-shadow(2px 3px 4px black);
@@ -515,7 +515,8 @@ ul {
515515
}
516516

517517
// Code highlighting only effects the current slide.
518-
.highlight-code slide.current {
518+
.highlight-code slide.current,
519+
slide.current .hljs{
519520
b,strong{
520521
@include shake();
521522
-webkit-animation-duration: 1.5s;
@@ -527,10 +528,22 @@ ul {
527528
animation-duration: 1.5s;
528529
}
529530
}
531+
.highlight-code slide.current .hljs{
532+
b,strong{
533+
@include flash();
534+
-webkit-animation-duration: 1.5s;
535+
animation-duration: 1.5s;
536+
}
537+
em{
538+
@include shake();
539+
-webkit-animation-duration: 1.5s;
540+
animation-duration: 1.5s;
541+
}
530542

543+
}
531544
pre {
532-
display: inline-block;
533-
overflow: auto;
545+
// display: inline-block;
546+
// overflow: auto;
534547
font-family: 'Source Code Pro', 'Courier New', monospace;
535548
font-size: 20px;
536549
line-height: 1.2em;

assets/scss/pdf.scss

100644100755
File mode changed.

assets/scss/phone.scss

100644100755
File mode changed.

bin/nodeppt

100644100755
File mode changed.

config.json

100644100755
File mode changed.

config.rb

100644100755
File mode changed.

lib/copy.js

100644100755
File mode changed.

lib/generate.js

100644100755
File mode changed.

lib/helper.js

100644100755
File mode changed.

lib/marked.js

100644100755
File mode changed.

lib/md_parser.js

100644100755
File mode changed.

lib/mime.json

100644100755
File mode changed.

lib/nodePPT.js

100644100755
+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ var ppt = module.exports = {
6161

6262
var dir = argsObj.dir;
6363
if (dir === '') {
64-
dir = path.join(rootDir, 'ppts');
64+
dir = curRoot;//path.join(rootDir, 'ppts');
6565
}
6666

6767
if (!fs.existsSync(dir)) {

lib/pdf.js

100644100755
File mode changed.

lib/server.js

100644100755
File mode changed.

package.json

100644100755
+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "nodeppt",
33
"jsname": "nodeppt",
44
"description": "A simple, in-browser, markdown-driven presentation framework",
5-
"version": "0.8.9-1",
5+
"version": "0.8.10",
66
"site": "https://github.com/ksky521/nodePPT",
77
"author": {
88
"name": "Theo Wang",

ppts/css/demo.css

100644100755
File mode changed.

ppts/demo.md

100644100755
File mode changed.

ppts/girl.jpg

100644100755
File mode changed.

ppts/js/demo.js

100644100755
File mode changed.

template/default.ejs

100644100755
File mode changed.

template/defaultmd.ejs

100644100755
File mode changed.

template/list.ejs

100644100755
File mode changed.

template/markdown.ejs

100644100755
File mode changed.

0 commit comments

Comments
 (0)