Skip to content

Commit

Permalink
Merge branch 'release/v0.9.2'
Browse files Browse the repository at this point in the history
* release/v0.9.2:
  update make file
  update npm modules
  #0 update make senario
  update make file
  fixed disqus margin-top
  add .gitignore pattern for built robotskirt files
  update highlight.js v0.7.3 module
  • Loading branch information
rhiokim committed Dec 1, 2012
2 parents 2a0bc31 + 56d096a commit 672dc8e
Show file tree
Hide file tree
Showing 557 changed files with 74,510 additions and 51,208 deletions.
17 changes: 10 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,26 @@ SOURCE_DIR=./source/public
DEPLOY_DIR=./_deploy
PUBLIC_DIR=./_public

init: update setup gh-pages initialize guide
init: initialize setup gh-pages init-data guide

guide:
clear
cat ./lib/haroopress/QUICK.markdown

update:
@echo "========================================"
@echo "= update & initialize git submodules"
@echo "========================================"
initialize:
npm install -g node-gyp
cd ./node_modules/robotskirt;node-gyp rebuild
git submodule update --init --recursive
cd ./node_modules/robotskirt;node-gyp rebuild
cd ./node_modules/locally/;npm install
python ./lib/highlight.js/tools/build.py

initialize:
update:
@echo "========================================"
@echo "= update & initialize git submodules"
@echo "========================================"
git pull origin master

init-data:
@echo "========================================"
@echo "= create default data set"
@echo "========================================"
Expand Down
23 changes: 14 additions & 9 deletions lib/bootstrap/css/haroopress.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
iframe {
border: 0;
}

#disqus_thread {
margin-top: 20px;
}

/**
* layout
*/
Expand Down Expand Up @@ -100,14 +105,6 @@ ul.share li.google #___plusone_0 {
}


/* Fixed subnav on scroll, but only for 980px and up (sorry IE!) */
@media (min-width: 980px) {
.subnav-fixed {
top: 0;
}
}


/**
* 아티클 목록
*/
Expand Down Expand Up @@ -201,4 +198,12 @@ ul.share li.google #___plusone_0 {
-moz-transform: rotate(45deg);
-ms-transform: rotate(45deg);
-o-transform: rotate(45deg);
}​
}​


/* Fixed subnav on scroll, but only for 980px and up (sorry IE!) */
@media (min-width: 980px) {
.subnav-fixed {
top: 0;
}
}
File renamed without changes.
4 changes: 4 additions & 0 deletions node_modules/ejs/.travis.yml

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

36 changes: 36 additions & 0 deletions node_modules/ejs/History.md

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

5 changes: 4 additions & 1 deletion node_modules/ejs/Makefile

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

25 changes: 23 additions & 2 deletions node_modules/ejs/Readme.md

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

30 changes: 23 additions & 7 deletions node_modules/ejs/ejs.js

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

3 changes: 1 addition & 2 deletions node_modules/ejs/ejs.min.js

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

2 changes: 1 addition & 1 deletion node_modules/ejs/examples/client.html

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

Loading

0 comments on commit 672dc8e

Please sign in to comment.