Skip to content

Commit 8812856

Browse files
mdomdo
committed
Merge pull request twbs#12037 from twbs/docs_dir
Bring back the `/docs` directory
2 parents 295736a + 05cc208 commit 8812856

File tree

105 files changed

+326
-81
lines changed

Some content is hidden

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

105 files changed

+326
-81
lines changed

‎Gruntfile.js‎

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ module.exports = function (grunt) {
4444
src: ['js/tests/unit/*.js']
4545
},
4646
assets: {
47-
src: ['docs-assets/js/application.js', 'docs-assets/js/customizer.js']
47+
src: ['docs/assets/js/application.js', 'docs/assets/js/customizer.js']
4848
}
4949
},
5050

@@ -65,12 +65,12 @@ module.exports = function (grunt) {
6565

6666
csslint: {
6767
options: {
68-
csslintrc: '.csslintrc'
68+
csslintrc: 'less/.csslintrc'
6969
},
7070
src: [
7171
'dist/css/bootstrap.css',
7272
'dist/css/bootstrap-theme.css',
73-
'docs-assets/css/docs.css'
73+
'docs/assets/css/docs.css'
7474
]
7575
},
7676

@@ -118,13 +118,13 @@ module.exports = function (grunt) {
118118
report: 'min'
119119
},
120120
src: [
121-
'docs-assets/js/less.js',
122-
'docs-assets/js/jszip.js',
123-
'docs-assets/js/uglify.js',
124-
'docs-assets/js/filesaver.js',
125-
'docs-assets/js/customizer.js'
121+
'docs/assets/js/less.js',
122+
'docs/assets/js/jszip.js',
123+
'docs/assets/js/uglify.js',
124+
'docs/assets/js/filesaver.js',
125+
'docs/assets/js/customizer.js'
126126
],
127-
dest: 'docs-assets/js/customize.js'
127+
dest: 'docs/assets/js/customize.js'
128128
}
129129
},
130130

@@ -185,7 +185,7 @@ module.exports = function (grunt) {
185185
csscomb: {
186186
sort: {
187187
options: {
188-
sortOrder: '.csscomb.json'
188+
config: 'less/.csscomb.json'
189189
},
190190
files: {
191191
'dist/css/<%= pkg.name %>.css': ['dist/css/<%= pkg.name %>.css'],
@@ -199,6 +199,16 @@ module.exports = function (grunt) {
199199
expand: true,
200200
src: ['fonts/*'],
201201
dest: 'dist/'
202+
},
203+
docs: {
204+
expand: true,
205+
cwd: './dist',
206+
src: [
207+
'{css,js}/*.min.*',
208+
'{css}/*.map',
209+
'fonts/*'
210+
],
211+
dest: 'docs/dist'
202212
}
203213
},
204214

@@ -309,10 +319,10 @@ module.exports = function (grunt) {
309319
grunt.registerTask('dist-css', ['less', 'csscomb', 'usebanner']);
310320

311321
// Fonts distribution task.
312-
grunt.registerTask('dist-fonts', ['copy']);
322+
grunt.registerTask('dist-docs', ['copy:docs']);
313323

314324
// Full distribution task.
315-
grunt.registerTask('dist', ['clean', 'dist-css', 'dist-fonts', 'dist-js']);
325+
grunt.registerTask('dist', ['clean', 'dist-css', 'copy:fonts', 'dist-js']);
316326

317327
// Default task.
318328
grunt.registerTask('default', ['test', 'dist', 'build-glyphicons-data', 'build-customizer']);
@@ -341,9 +351,9 @@ module.exports = function (grunt) {
341351
}
342352

343353
// Create the `_data` directory if it doesn't already exist
344-
if (!fs.existsSync('_data')) fs.mkdirSync('_data')
354+
if (!fs.existsSync('docs/_data')) fs.mkdirSync('docs/_data')
345355

346-
fs.writeFileSync('_data/glyphicons.yml', glyphiconsData)
356+
fs.writeFileSync('docs/_data/glyphicons.yml', glyphiconsData)
347357
});
348358

349359
// task for building customizer
@@ -362,6 +372,6 @@ module.exports = function (grunt) {
362372
}
363373

364374
var files = getFiles('js') + getFiles('less') + getFiles('fonts')
365-
fs.writeFileSync('docs-assets/js/raw-files.js', files)
375+
fs.writeFileSync('docs/assets/js/raw-files.js', files)
366376
});
367377
};

‎_config.yml‎

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,26 @@ pygments: true
66
permalink: pretty
77

88
# Server
9+
source: ./docs
910
destination: ./_gh_pages
11+
host: 0.0.0.0
1012
port: 9001
11-
exclude:
12-
- ".editorconfig"
13-
- ".gitignore"
14-
- "bower.json"
15-
- "CNAME"
16-
- "composer.json"
17-
- "CONTRIBUTING.md"
18-
- "DOCS-LICENSE"
19-
- "Gruntfile.js"
20-
- "less"
21-
- "LICENSE"
22-
- "node_modules"
23-
- "package.json"
24-
- "README.md"
25-
- "sauce_browsers.yml"
26-
- "test-infra"
13+
baseurl: /
14+
url: http://localhost:9001
2715

2816
# Custom vars
2917
current_version: 3.0.3
3018
repo: https://github.com/twbs/bootstrap
3119

32-
download_source: https://github.com/twbs/bootstrap/archive/v3.0.3.zip
33-
download_dist: https://github.com/twbs/bootstrap/releases/download/v3.0.3/bootstrap-3.0.3-dist.zip
20+
download:
21+
source: https://github.com/twbs/bootstrap/archive/v3.0.3.zip
22+
dist: https://github.com/twbs/bootstrap/releases/download/v3.0.3/bootstrap-3.0.3-dist.zip
3423

3524
blog: http://blog.getbootstrap.com
3625
expo: http://expo.getbootstrap.com
3726
sass_repo: https://github.com/twbs/bootstrap-sass
3827

39-
cdn_css: //netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css
40-
cdn_theme_css: //netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap-theme.min.css
41-
cdn_js: //netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js
28+
cdn:
29+
css: //netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css
30+
css_theme: //netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap-theme.min.css
31+
js: //netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js

DOCS-LICENSE renamed to docs/LICENSE-DOCS

File renamed without changes.

_data/glyphicons.yml renamed to docs/_data/glyphicons.yml

File renamed without changes.

_includes/ads.html renamed to docs/_includes/ads.html

File renamed without changes.

_includes/footer.html renamed to docs/_includes/footer.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
================================================== -->
33
<!-- Placed at the end of the document so the pages load faster -->
44
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
5-
<script src="{{ page.base_url }}dist/js/bootstrap.min.js"></script>
5+
<script src="dist/js/bootstrap.min.js"></script>
66

7-
<script src="{{ page.base_url }}docs-assets/js/holder.js"></script>
7+
<script src="assets/js/holder.js"></script>
88

9-
<script src="{{ page.base_url }}docs-assets/js/application.js"></script>
9+
<script src="assets/js/application.js"></script>
1010

1111
{% if page.slug == "customize" %}
12-
<script src="{{ page.base_url }}docs-assets/js/raw-files.js"></script>
13-
<script src="{{ page.base_url }}docs-assets/js/customize.js"></script>
12+
<script src="assets/js/raw-files.js"></script>
13+
<script src="assets/js/customize.js"></script>
1414
{% endif %}
1515

1616
{% comment %}

_includes/header.html renamed to docs/_includes/header.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
</title>
1515

1616
<!-- Bootstrap core CSS -->
17-
<link href="{{ page.base_url }}dist/css/bootstrap.min.css" rel="stylesheet">
17+
<link href="{{ site.baseurl }}dist/css/bootstrap.min.css" rel="stylesheet">
1818

1919
<!-- Documentation extras -->
20-
<link href="{{ page.base_url }}docs-assets/css/docs.css" rel="stylesheet">
21-
<link href="{{ page.base_url }}docs-assets/css/pygments-manni.css" rel="stylesheet">
22-
<!--[if lt IE 9]><script src="{{ page.base_url }}docs-assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
20+
<link href="{{ site.baseurl }}assets/css/docs.css" rel="stylesheet">
21+
<link href="{{ site.baseurl }}assets/css/pygments-manni.css" rel="stylesheet">
22+
<!--[if lt IE 9]><script src="{{ site.baseurl }}assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
2323

2424
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
2525
<!--[if lt IE 9]>
@@ -28,8 +28,8 @@
2828
<![endif]-->
2929

3030
<!-- Favicons -->
31-
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ page.base_url }}docs-assets/ico/apple-touch-icon-144-precomposed.png">
32-
<link rel="shortcut icon" href="{{ page.base_url }}docs-assets/ico/favicon.ico">
31+
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ site.baseurl }}assets/ico/apple-touch-icon-144-precomposed.png">
32+
<link rel="shortcut icon" href="{{ site.baseurl }}assets/ico/favicon.ico">
3333

3434
<script>
3535
var _gaq = _gaq || [];

_includes/nav-about.html renamed to docs/_includes/nav-about.html

File renamed without changes.

_includes/nav-components.html renamed to docs/_includes/nav-components.html

File renamed without changes.

_includes/nav-css.html renamed to docs/_includes/nav-css.html

File renamed without changes.

0 commit comments

Comments
 (0)