Skip to content

Commit ce429bd

Browse files
authored
Added and ran prettier (#7)
* Added and ran prettier
1 parent 75ca359 commit ce429bd

Some content is hidden

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

49 files changed

+8928
-7885
lines changed

.jshintrc

+2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
{
2+
"asi": true,
23
"funcscope": true,
34
"lastsemic": true,
45
"loopfunc": true,
6+
"laxbreak": true,
57
"eqnull": true,
68
"expr": true,
79
"undef": true,

.prettierrc

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"semi": false,
3+
"singleQuote": true
4+
}

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ rickshaw.css: $(CSS_FILES)
8989
cat $(CSS_FILES) > rickshaw.css
9090

9191
rickshaw.js: $(JS_FILES) $(JS_HINT)
92-
$(JS_HINT) src/js
92+
$(JS_HINT) --verbose src/js
9393
cat $(JS_FILES) > rickshaw.js
9494

9595
rickshaw.min.css: $(CSS_MIN) rickshaw.css

package-lock.json

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

package.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,15 @@
3333
"jshint": "^2.9.7",
3434
"nodemon": "^1.11.0",
3535
"nodeunit": "^0.11.3",
36+
"prettier": "1.15.3",
3637
"sinon": "^2.3.8",
3738
"uglify-js": "^2.8.29"
3839
},
3940
"scripts": {
4041
"build": "make clean && make",
4142
"examples": "open examples/index.html",
42-
"lint": "jshint src/js/*",
43+
"lint": "jshint --verbose src/js/*",
44+
"lint:prettier": "prettier --config ./.prettierrc --write src/js/*.js",
4345
"test": "make && npx nodeunit tests",
4446
"watch": "nodemon --watch src --exec make rickshaw.js",
4547
"coverage": "npx istanbul cover nodeunit tests --reporter=lcov",

rickshaw.css

-24
Original file line numberDiff line numberDiff line change
@@ -62,30 +62,6 @@
6262
opacity: 1;
6363
background: rgba(0, 0, 0, 0.8);
6464
}
65-
.rickshaw_graph .detail .item:after {
66-
position: absolute;
67-
display: block;
68-
width: 0;
69-
height: 0;
70-
71-
content: "";
72-
73-
border: 5px solid transparent;
74-
}
75-
.rickshaw_graph .detail .item.left:after {
76-
top: 1em;
77-
left: -5px;
78-
margin-top: -5px;
79-
border-right-color: rgba(0, 0, 0, 0.8);
80-
border-left-width: 0;
81-
}
82-
.rickshaw_graph .detail .item.right:after {
83-
top: 1em;
84-
right: -5px;
85-
margin-top: -5px;
86-
border-left-color: rgba(0, 0, 0, 0.8);
87-
border-right-width: 0;
88-
}
8965
.rickshaw_graph .detail .dot {
9066
width: 4px;
9167
height: 4px;

0 commit comments

Comments
 (0)