diff --git a/Makefile b/Makefile index 9ab1da2f3b9..61302fe79a4 100644 --- a/Makefile +++ b/Makefile @@ -92,10 +92,12 @@ test-npm-publish: node apidoc_sources = $(wildcard doc/api/*.markdown) apidocs = $(addprefix out/,$(apidoc_sources:.markdown=.html)) -apidoc_dirs = out/doc out/doc/api/ out/doc/api/assets out/doc/about out/doc/community out/doc/logos +apidoc_dirs = out/doc out/doc/api/ out/doc/api/assets out/doc/about out/doc/community out/doc/logos out/doc/images apiassets = $(subst api_assets,api/assets,$(addprefix out/,$(wildcard doc/api_assets/*))) +doc_images = $(addprefix out/,$(wildcard doc/images/* doc/*.jpg doc/*.png)) + website_files = \ out/doc/index.html \ out/doc/v0.4_announcement.html \ @@ -104,33 +106,12 @@ website_files = \ out/doc/sh_javascript.min.js \ out/doc/sh_vim-dark.css \ out/doc/sh.css \ - out/doc/logo.png \ out/doc/favicon.ico \ out/doc/pipe.css \ out/doc/about/index.html \ - out/doc/close-downloads.png \ out/doc/community/index.html \ - out/doc/community/not-invented-here.png \ out/doc/logos/index.html \ - out/doc/microsoft-logo.png \ - out/doc/ryan-speaker.jpg \ - out/doc/download-logo.png \ - out/doc/ebay-logo.png \ - out/doc/footer-logo-alt.png \ - out/doc/footer-logo.png \ - out/doc/icons-interior.png \ - out/doc/icons.png \ - out/doc/home-icons.png \ - out/doc/joyent-logo_orange_nodeorg-01.png \ - out/doc/linkedin-logo.png \ - out/doc/logo-light.png \ - out/doc/mac_osx_nodejs_installer_logo.png \ - out/doc/microsoft-logo.png \ - out/doc/platform-icons.png \ - out/doc/sponsored.png \ - out/doc/twitter-bird.png \ - out/doc/community-icons.png \ - out/doc/yahoo-logo.png + $(doc_images) doc: node $(apidoc_dirs) $(website_files) $(apiassets) $(apidocs) @@ -141,7 +122,7 @@ out/doc/api/assets/%: doc/api_assets/% out/doc/api/assets/ cp $< $@ out/doc/%: doc/% - cp $< $@ + cp -r $< $@ out/doc/api/%.html: doc/api/%.markdown node $(apidoc_dirs) $(apiassets) tools/doctool/doctool.js out/Release/node tools/doctool/doctool.js doc/template.html $< > $@ @@ -193,7 +174,7 @@ $(TARBALL): node out/doc cp doc/node.1 $(TARNAME)/doc/node.1 cp -r out/doc/api $(TARNAME)/doc/api rm -rf $(TARNAME)/deps/v8/test # too big - rm -rf $(TARNAME)/doc/logos # too big + rm -rf $(TARNAME)/doc/images # too big tar -cf $(TARNAME).tar $(TARNAME) rm -rf $(TARNAME) gzip -f -9 $(TARNAME).tar diff --git a/doc/about/index.html b/doc/about/index.html index bb273a768a0..8277bf05591 100644 --- a/doc/about/index.html +++ b/doc/about/index.html @@ -21,7 +21,7 @@
- +
diff --git a/doc/api_assets/anchor.png b/doc/api_assets/anchor.png deleted file mode 100644 index 1ed163ee1a1..00000000000 Binary files a/doc/api_assets/anchor.png and /dev/null differ diff --git a/doc/api_assets/style.css b/doc/api_assets/style.css index 5fc1eaa31ee..7a2899a5bda 100644 --- a/doc/api_assets/style.css +++ b/doc/api_assets/style.css @@ -242,7 +242,7 @@ code.pre { color: #d2d8ba; /* preload platform-icons.png */ - background-image: url(platform-icons.png); + background-image: url(http://nodejs.org/images/platform-icons.png); background-repeat: no-repeat; background-position: -999em -999em; } @@ -341,15 +341,15 @@ p tt, p code { line-height: 23px; } -#column2.interior li a.home { background: url(icons-interior.png) no-repeat -156px 3px; } -#column2.interior li a.download { background: url(icons-interior.png) no-repeat -156px -21px; } -#column2.interior li a.about { background: url(icons-interior.png) no-repeat -156px -45px; } -#column2.interior li a.npm { background: url(icons-interior.png) no-repeat -156px -69px; } -#column2.interior li a.docs { background: url(icons-interior.png) no-repeat -156px -93px; } -#column2.interior li a.blog { background: url(icons-interior.png) no-repeat -156px -117px; } -#column2.interior li a.community { background: url(icons-interior.png) no-repeat -156px -141px; } -#column2.interior li a.logos { background: url(icons-interior.png) no-repeat -156px -165px; } -#column2.interior li a.jobs { background: url(icons-interior.png) no-repeat -156px -189px; } +#column2.interior li a.home { background: url(http://nodejs.org/images/icons-interior.png) no-repeat -156px 3px; } +#column2.interior li a.download { background: url(http://nodejs.org/images/icons-interior.png) no-repeat -156px -21px; } +#column2.interior li a.about { background: url(http://nodejs.org/images/icons-interior.png) no-repeat -156px -45px; } +#column2.interior li a.npm { background: url(http://nodejs.org/images/icons-interior.png) no-repeat -156px -69px; } +#column2.interior li a.docs { background: url(http://nodejs.org/images/icons-interior.png) no-repeat -156px -93px; } +#column2.interior li a.blog { background: url(http://nodejs.org/images/icons-interior.png) no-repeat -156px -117px; } +#column2.interior li a.community { background: url(http://nodejs.org/images/icons-interior.png) no-repeat -156px -141px; } +#column2.interior li a.logos { background: url(http://nodejs.org/images/icons-interior.png) no-repeat -156px -165px; } +#column2.interior li a.jobs { background: url(http://nodejs.org/images/icons-interior.png) no-repeat -156px -189px; } #column2.interior li a.home.current { background-position: 2px 3px; } #column2.interior li a.download.current { background-position: 2px -21px; } @@ -381,7 +381,7 @@ p tt, p code { } #column2.interior p.twitter a { - background: url(twitter-bird.png) no-repeat 0 4px; + background: url(http://nodejs.org/images/twitter-bird.png) no-repeat 0 4px; padding-left: 37px; text-decoration: none; } @@ -394,7 +394,7 @@ a.totop { font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Verdana, Tahoma, sans-serif; font-weight: bold; text-indent: -9999999px; - background: url(anchor.png) no-repeat top left; + background: url(http://nodejs.org/images/anchor.png) no-repeat top left; margin-right: 7px; display: block; width: 13px; @@ -405,7 +405,7 @@ a.anchor { font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Verdana, Tahoma, sans-serif; font-weight: bold; text-indent: -9999999px; - background: url(anchor.png) no-repeat top right; + background: url(http://nodejs.org/images/anchor.png) no-repeat top right; display: block; width: 13px; border-bottom: 1px solid #cccccc; @@ -442,7 +442,7 @@ a.anchor { } #footer ul { - background: url(footer-logo-alt.png) left 17px no-repeat; + background: url(http://nodejs.org/images/footer-logo-alt.png) left 17px no-repeat; padding: 23px 0 0 195px; height: 26px; margin-left: -1px; @@ -476,7 +476,7 @@ a.anchor { } #footer ul li a.twitter { - background: url(twitter-bird.png) no-repeat 5px 0px; + background: url(http://nodejs.org/images/twitter-bird.png) no-repeat 5px 0px; padding-left: 25px; } diff --git a/doc/community/index.html b/doc/community/index.html index 7b643332520..833ba2fb69e 100644 --- a/doc/community/index.html +++ b/doc/community/index.html @@ -23,7 +23,7 @@
- +
@@ -163,7 +163,7 @@

+ src="http://nodejs.org/images/not-invented-here.png" width="100%">