Skip to content

Commit 8a4634c

Browse files
committed
change to four space indentation.
Signed-off-by: Bo-Yi Wu <[email protected]>
1 parent 3b57fe4 commit 8a4634c

File tree

9 files changed

+102
-102
lines changed

9 files changed

+102
-102
lines changed

.bowerrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"directory" : "app/assets/vendor"
2+
"directory" : "app/assets/vendor"
33
}

.jshintrc

+28-28
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
{
2-
"node": true,
3-
"esnext": true,
4-
"bitwise": true,
5-
"camelcase": false,
6-
"curly": true,
7-
"eqeqeq": true,
8-
"immed": true,
9-
"indent": 4,
10-
"latedef": true,
11-
"newcap": true,
12-
"noarg": true,
13-
"quotmark": "single",
14-
"regexp": true,
15-
"undef": true,
16-
"unused": true,
17-
"strict": true,
18-
"trailing": true,
19-
"smarttabs": true,
20-
"globals": {
21-
/* MOCHA */
22-
"describe" : false,
23-
"it" : false,
24-
"before" : false,
25-
"beforeEach" : false,
26-
"after" : false,
27-
"afterEach" : false,
28-
"require" : false
29-
}
2+
"node": true,
3+
"esnext": true,
4+
"bitwise": true,
5+
"camelcase": false,
6+
"curly": true,
7+
"eqeqeq": true,
8+
"immed": true,
9+
"indent": 4,
10+
"latedef": true,
11+
"newcap": true,
12+
"noarg": true,
13+
"quotmark": "single",
14+
"regexp": true,
15+
"undef": true,
16+
"unused": true,
17+
"strict": true,
18+
"trailing": true,
19+
"smarttabs": true,
20+
"globals": {
21+
/* MOCHA */
22+
"describe": false,
23+
"it": false,
24+
"before": false,
25+
"beforeEach": false,
26+
"after": false,
27+
"afterEach": false,
28+
"require": false
29+
}
3030
}

.travis.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
language: node_js
22
node_js:
3-
- '0.10'
3+
- '0.10'
44
before_install:
5-
- gem update --system
6-
- gem install sass
7-
- gem install compass
8-
- npm install -g grunt-cli
5+
- gem update --system
6+
- gem install sass
7+
- gem install compass
8+
- npm install -g grunt-cli
99
env:
10-
global:
11-
- secure: "bsDw5Lzf+XL075JPOt4xvaxGpbuUZ9KTIsHStVVG56lTLcnJKo5e8mqIAn6wK+ID6lDVZHpTvV8MZ3WoeqqD9BCoFMXWhmrMOOn+eRjDkkN9adGktU1yctr+6Hmz5mX114F23LqsrhwGgIGlVI8iQmkEgq/inHEDAmmqkn55UiU="
12-
- REPO="[email protected]:appleboy/html5-template-engine"
10+
global:
11+
- secure: "bsDw5Lzf+XL075JPOt4xvaxGpbuUZ9KTIsHStVVG56lTLcnJKo5e8mqIAn6wK+ID6lDVZHpTvV8MZ3WoeqqD9BCoFMXWhmrMOOn+eRjDkkN9adGktU1yctr+6Hmz5mX114F23LqsrhwGgIGlVI8iQmkEgq/inHEDAmmqkn55UiU="
12+
- REPO="[email protected]:appleboy/html5-template-engine"
1313
after_success: build/after_success.sh

app/assets/sass/screen.scss

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
@import "partials/base";
22

33
body {
4-
background-color: #ddd;
4+
background-color: #ddd;
55
}
66

77
#logo {
8-
margin: 0 auto;
8+
margin: 0 auto;
9+
max-width: 250px;
10+
img {
911
max-width: 250px;
10-
img {
11-
max-width: 250px;
12-
}
12+
}
1313
}
1414

1515
#header {
16-
margin: 10px auto;
17-
text-align: center;
16+
margin: 10px auto;
17+
text-align: center;
1818
}
1919

2020
h2 {
21-
color: #555;
21+
color: #555;
2222
}
2323

2424
/* ==========================================================================
2525
Browse Happy prompt
2626
========================================================================== */
2727

2828
.browsehappy {
29-
margin: 0.2em 0;
30-
background: #ccc;
31-
color: #000;
32-
padding: 0.2em 0;
29+
margin: 0.2em 0;
30+
background: #ccc;
31+
color: #000;
32+
padding: 0.2em 0;
3333
}

build/app.build.js

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
({
2-
appDir: "../app/",
3-
baseUrl: "assets/js/",
4-
dir: "../output",
5-
name: "main",
6-
mainConfigFile: "../app/assets/js/main.js",
7-
preserveLicenseComments: false,
8-
// support generate Source Maps, make sure requirejs version in 2.1.2
9-
// optimize: "uglify2",
10-
// generateSourceMaps: true,
11-
fileExclusionRegExp: /^(\.|node_modules)/,
12-
paths: {
13-
jquery: "../vendor/jquery/jquery"
14-
}
2+
appDir: "../app/",
3+
baseUrl: "assets/js/",
4+
dir: "../output",
5+
name: "main",
6+
mainConfigFile: "../app/assets/js/main.js",
7+
preserveLicenseComments: false,
8+
// support generate Source Maps, make sure requirejs version in 2.1.2
9+
// optimize: "uglify2",
10+
// generateSourceMaps: true,
11+
fileExclusionRegExp: /^(\.|node_modules)/,
12+
paths: {
13+
jquery: "../vendor/jquery/jquery"
14+
}
1515
})

build/build.sh

+20-20
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ YELLOW="\033[33m"
99
RESET="\033[0m"
1010

1111
display () {
12-
COLOR=$2
13-
[ -z $2 ] && COLOR=${YELLOW}
14-
echo
15-
echo -e "${COLOR}=> $1 ${RESET}"
12+
COLOR=$2
13+
[ -z $2 ] && COLOR=${YELLOW}
14+
echo
15+
echo -e "${COLOR}=> $1 ${RESET}"
1616
}
1717

1818
##
@@ -21,23 +21,23 @@ display () {
2121

2222
which gem 1> /dev/null 2>&1
2323
if [ $? -ne 0 ]; then
24-
display "Please install gem tool via aptitude command."
25-
display "$ sudo aptitude -y install ruby rake rubygems"
26-
exit
24+
display "Please install gem tool via aptitude command."
25+
display "$ sudo aptitude -y install ruby rake rubygems"
26+
exit
2727
fi
2828

2929
which compass 1> /dev/null 2>&1
3030
if [ $? -ne 0 ]; then
31-
display "update rubygems tool."
32-
sudo gem update --system
33-
display "install compass and sass tool."
34-
sudo gem install sass compass
31+
display "update rubygems tool."
32+
sudo gem update --system
33+
display "install compass and sass tool."
34+
sudo gem install sass compass
3535
fi
3636

3737
which guard 1> /dev/null 2>&1
3838
if [ $? -ne 0 ]; then
39-
display "Install guard livereload tool."
40-
sudo gem install rb-inotify guard-livereload yajl-ruby
39+
display "Install guard livereload tool."
40+
sudo gem install rb-inotify guard-livereload yajl-ruby
4141
fi
4242

4343
##
@@ -46,13 +46,13 @@ fi
4646

4747
which npm 1> /dev/null 2>&1
4848
if [ $? -ne 0 ]; then
49-
display "install nvm tool."
50-
curl https://raw.github.com/appleboy/nvm/develop/install.sh | sh
51-
. ~/.nvm/nvm.sh # This loads NVM
52-
display "install node.js stable version."
53-
nvm install stable
54-
display "use node.js stable version."
55-
nvm use stable
49+
display "install nvm tool."
50+
curl https://raw.github.com/appleboy/nvm/develop/install.sh | sh
51+
. ~/.nvm/nvm.sh # This loads NVM
52+
display "install node.js stable version."
53+
nvm install stable
54+
display "use node.js stable version."
55+
nvm use stable
5656
fi
5757

5858
display "install coffee-script tool"

build/self.build.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
({
2-
baseUrl: "../app/assets/js/",
3-
name: "main",
4-
out: "../app/assets/js/main-built.js",
5-
mainConfigFile: "../app/assets/js/main.js",
6-
preserveLicenseComments: false,
7-
// support generate Source Maps, make sure requirejs version in 2.1.2
8-
// optimize: "uglify2",
9-
// generateSourceMaps: true,
10-
paths: {
11-
jquery: "../vendor/jquery/jquery"
12-
}
2+
baseUrl: "../app/assets/js/",
3+
name: "main",
4+
out: "../app/assets/js/main-built.js",
5+
mainConfigFile: "../app/assets/js/main.js",
6+
preserveLicenseComments: false,
7+
// support generate Source Maps, make sure requirejs version in 2.1.2
8+
// optimize: "uglify2",
9+
// generateSourceMaps: true,
10+
paths: {
11+
jquery: "../vendor/jquery/jquery"
12+
}
1313
})

build/server.coffee

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ app.use express.errorHandler()
1010

1111
# simple logger
1212
app.use (req, res, next) ->
13-
console.log '%s %s', req.method, req.url
14-
next()
13+
console.log '%s %s', req.method, req.url
14+
next()
1515

1616
app.use(app.router)
1717
app.listen(port)

terminal.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
exports.config = {
2-
users: {
3-
admin: {
4-
password: "",
5-
cwd: process.cwd() //working directory
6-
}
7-
},
8-
port: 8080
2+
users: {
3+
admin: {
4+
password: "",
5+
cwd: process.cwd() //working directory
6+
}
7+
},
8+
port: 8080
99
};

0 commit comments

Comments
 (0)