Skip to content

Commit 39eb432

Browse files
committed
Merge branch '0.1.x'
2 parents f68199a + 5406c91 commit 39eb432

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
language: node_js
22
node_js:
33
- "0.10"
4+
sudo: false

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
"license": "MIT",
88
"dependencies": {
99
"adm-zip": "0.4.7",
10-
"chalk": "1.0.0",
10+
"chalk": "1.1.0",
1111
"dox": "0.8.0",
1212
"handlebars": "3.0.3",
13-
"highlight.js": "8.6.0",
14-
"markdown-it": "4.2.1",
15-
"promise": "7.0.1",
16-
"sqlite3": "3.0.8",
17-
"temp": "0.8.1"
13+
"highlight.js": "8.7.0",
14+
"markdown-it": "4.4.0",
15+
"promise": "7.0.3",
16+
"sqlite3": "3.0.9",
17+
"temp": "0.8.3"
1818
},
1919
"devDependencies": {
2020
"mocha": "2.2.5"

templates/bootstrap.hbs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@ pre .hljs {
115115
116116
var protocol = w.location.protocol === 'file:' ? 'http:' : w.location.protocol,
117117
resource = [
118-
'//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css',
119-
'//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/styles/github.min.css',
118+
'//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css',
119+
'//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.7/styles/github.min.css',
120120
'//code.jquery.com/jquery-2.1.4.js',
121-
'//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/highlight.min.js'
121+
'//cdnjs.cloudflare.com/ajax/libs/highlight.js/8.7/highlight.min.js'
122122
];
123123
124124
function loadResource(url) {

templates/dash/resources/bootstrap/bootstrap.min.css

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

templates/dash/resources/highlight.js/github.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)