Skip to content

Commit 8cf3a8d

Browse files
authored
Merge branch 'master' into foldable-local-toc
2 parents c89d524 + c94af91 commit 8cf3a8d

32 files changed

+576
-681
lines changed

.github/CODE_OF_CONDUCT.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Code of Conduct
2+
3+
A copy of our code of conduct can be found on Read the Docs as seen below.
4+
5+
http://docs.readthedocs.io/en/latest/code-of-conduct.html

.github/ISSUE_TEMPLATE.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
2+
### Problem
3+
4+
Give details on your issue.
5+
6+
### Reproducible Project
7+
8+
Please give a link to a public reproducible project or provide an example of the Restructured Text that gives an issue.
9+
10+
```rst
11+
Place RST code here (if any).
12+
```
13+
14+
#### Error Logs/Results
15+
16+
Place any images or error logs that might be able to help solve the issue here.
17+
18+
#### Expected Results
19+
20+
Please describe how this should work properly.
21+
22+
### Environment Info
23+
24+
- Python Version:
25+
- Sphinx Version:
26+
- RTD Theme Version:

Gemfile

Lines changed: 0 additions & 4 deletions
This file was deleted.

Gemfile.lock

Lines changed: 0 additions & 16 deletions
This file was deleted.

Gruntfile.js

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,26 @@ module.exports = function(grunt) {
111111
dest: 'sphinx_rtd_theme/static/js/theme.js'
112112
}
113113
},
114-
114+
uglify: {
115+
dist: {
116+
options: {
117+
sourceMap: false,
118+
mangle: {
119+
reserved: ['jQuery'] // Leave 'jQuery' identifier unchanged
120+
},
121+
ie8: true // compliance with IE 6-8 quirks
122+
},
123+
files: [{
124+
expand: true,
125+
src: ['sphinx_rtd_theme/static/js/*.js', '!sphinx_rtd_theme/static/js/*.min.js'],
126+
dest: 'sphinx_rtd_theme/static/js/',
127+
rename: function (dst, src) {
128+
// Use unminified file name for minified file
129+
return src;
130+
}
131+
}]
132+
}
133+
},
115134
exec: {
116135
bower_update: {
117136
cmd: 'bower update'
@@ -162,5 +181,5 @@ module.exports = function(grunt) {
162181
grunt.loadNpmTasks('grunt-browserify');
163182

164183
grunt.registerTask('default', ['exec:bower_update','clean','copy:fonts','sass:dev','browserify:dev','exec:build_sphinx','connect','open','watch']);
165-
grunt.registerTask('build', ['exec:bower_update','clean','copy:fonts','sass:build','browserify:build','exec:build_sphinx']);
184+
grunt.registerTask('build', ['exec:bower_update','clean','copy:fonts','sass:build','browserify:build','uglify','exec:build_sphinx']);
166185
}

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2013 Dave Snider
3+
Copyright (c) 2013-2018 Dave Snider, Read the Docs, Inc. & contributors
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of
66
this software and associated documentation files (the "Software"), to deal in

0 commit comments

Comments
 (0)