docs styles as customized mdb is working

This commit is contained in:
Kevin Ross 2015-12-02 16:31:26 -06:00
parent e9f523476d
commit 1685cf956d
6 changed files with 18 additions and 14 deletions

View File

@ -258,7 +258,7 @@ module.exports = function (grunt) {
autoprefixer
]
},
src: 'docs/assets/css/docs.min.css'
src: 'docs/assets/css/*.css'
},
examples: {
options: {
@ -294,7 +294,7 @@ module.exports = function (grunt) {
]
},
docs: {
src: 'docs/assets/css/docs.min.css',
src: 'docs/assets/css/docs.css',
dest: 'docs/assets/css/docs.min.css'
}
},
@ -378,9 +378,9 @@ module.exports = function (grunt) {
files: 'scss/**/*.scss',
tasks: ['dist-css', 'docs']
},
docs: {
files: 'docs/assets/scss/**/*.scss',
tasks: ['dist-css', 'docs']
docs: { // watch both the source and docs scss
files: ['docs/assets/scss/**/*.scss', 'scss/**/*.scss'],
tasks: ['docs-css'] //['dist-css', 'docs']
}
},
@ -501,7 +501,7 @@ module.exports = function (grunt) {
// Version numbering task.
// grunt change-version-number --oldver=A.B.C --newver=X.Y.Z
// This can be overzealous, so its changes should always be manually reviewed!
grunt.registerTask('change-version-number', 'sed');
//grunt.registerTask('change-version-number', 'sed');
grunt.registerTask('commonjs', ['babel:umd', 'npm-js']);
@ -514,7 +514,7 @@ module.exports = function (grunt) {
});
// Docs task.
grunt.registerTask('docs-css', ['postcss:docs', 'postcss:examples', 'csscomb:docs', 'csscomb:examples', 'cssmin:docs']);
grunt.registerTask('docs-css', ['sass:docs', 'postcss:docs', 'postcss:examples', 'csscomb:docs', 'csscomb:examples', 'cssmin:docs']);
grunt.registerTask('docs-js', ['uglify:docsJs']);
grunt.registerTask('lint-docs-js', ['jscs:assets']);
grunt.registerTask('docs', ['docs-css', 'docs-js', 'lint-docs-js', 'clean:docs', 'copy:docs']);

View File

@ -14,10 +14,15 @@
</title>
<!-- Material Design for Bootstrap CSS (includes a compiled/customized version of Bootstrap) -->
<link href="{{ site.baseurl }}/dist/css/bootstrap-material-design.min.css" rel="stylesheet">
<!--<link href="{{ site.baseurl }}/dist/css/bootstrap-material-design.min.css" rel="stylesheet">-->
<!-- Documentation extras -->
<!-- Material Design for Bootstrap customization for Documentation (consider Documentation the application) -->
{% if site.github %}
<link href="{{ site.baseurl }}/assets/css/docs.min.css" rel="stylesheet">
{% else %}
<link href="{{ site.baseurl }}/assets/css/docs.css" rel="stylesheet">
{% endif %}
<!-- Favicons -->
<link rel="apple-touch-icon" href="{{ site.baseurl }}/apple-touch-icon.png">

View File

@ -25,7 +25,7 @@ module.exports = function configureLibsass(grunt) {
},
docs: {
files: {
'docs/assets/css/docs.min.css': 'docs/assets/scss/docs.scss'
'docs/assets/css/docs.css': 'docs/assets/scss/docs.scss'
}
}
}

View File

@ -29,7 +29,7 @@ module.exports = function configureRubySass(grunt) {
docs: {
options: options,
files: {
'docs/assets/css/docs.min.css': 'docs/assets/scss/docs.scss'
'docs/assets/css/docs.css': 'docs/assets/scss/docs.scss'
}
}
}

View File

@ -1,12 +1,10 @@
// This is the main scss file, provided as an underscored file so that variable contexts remain in-tact when importing from the source.
@import 'colors';
@import 'variables';
// FIXME: V4 SCSS inclusion via an underscored file https://github.com/twbs/bootstrap/issues/18350
@import 'bootstrap';
@import 'mixins';
@import 'mixins/shadows'; // these are mixins only, and must be placed at the top before use (sass requiremnt)
@import 'scaffolding'; // include the material content given the mixins above (sass requirement for inclusion order of mixins)
@import 'welljumbo';
@import 'buttons';

View File

@ -1,4 +1,5 @@
@import '_colors';
@import 'colors';
// Typography elements FIXME: review to see if we actually need these
$mdb-text-color-light: unquote("rgba(#{$rgb-white}, 0.84)") !default;