NIFI-592: - Fixing scrollbar issue with pages loaded in an iframe. - Updating build process to tweak the rest api documentation layout that is deployed to the website.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/f0a5c11f Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/f0a5c11f Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/f0a5c11f Branch: refs/heads/develop Commit: f0a5c11f1bfa840ebc218d148702c9a716461334 Parents: 81e40d4 Author: Matt Gilman <[email protected]> Authored: Wed May 6 10:32:28 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Wed May 6 10:32:28 2015 -0400 ---------------------------------------------------------------------- nifi-site/Gruntfile.js | 18 +++++++++++++++++- nifi-site/src/scss/app.scss | 2 ++ 2 files changed, 19 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f0a5c11f/nifi-site/Gruntfile.js ---------------------------------------------------------------------- diff --git a/nifi-site/Gruntfile.js b/nifi-site/Gruntfile.js index baa4c21..2a3a5ba 100644 --- a/nifi-site/Gruntfile.js +++ b/nifi-site/Gruntfile.js @@ -145,6 +145,22 @@ module.exports = function (grunt) { "</script>\n" + "</head>" }] + }, + moveTearDrop: { + src: ['dist/docs/rest-api/index.html'], + overwrite: true, + replacements: [{ + from: /<img class="logo" src="images\/bgNifiLogo.png" alt="NiFi Logo"\/>/g, + to: '<img class="logo" src="images/bgNifiLogo.png" alt="NiFi Logo" style="float: right;"/>' + }] + }, + removeVersion: { + src: ['dist/docs/rest-api/index.html'], + overwrite: true, + replacements: [{ + from: /<div class="sub-title">.*<\/div>/g, + to: '<div class="sub-title">NiFi Rest Api</div>' + }] } }, watch: { @@ -184,7 +200,7 @@ module.exports = function (grunt) { grunt.registerTask('img', ['newer:copy']); grunt.registerTask('css', ['clean:css', 'compass']); grunt.registerTask('js', ['clean:js', 'concat']); - grunt.registerTask('generate-docs', ['clean:generated', 'exec:generateDocs', 'exec:generateRestApiDocs', 'copy:generated', 'replace:addGoogleAnalytics']); + grunt.registerTask('generate-docs', ['clean:generated', 'exec:generateDocs', 'exec:generateRestApiDocs', 'copy:generated', 'replace:addGoogleAnalytics', 'replace:moveTearDrop', 'replace:removeVersion']); grunt.registerTask('default', ['clean', 'assemble', 'css', 'js', 'img', 'generate-docs', 'copy:dist']); grunt.registerTask('dev', ['default', 'watch']); }; http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f0a5c11f/nifi-site/src/scss/app.scss ---------------------------------------------------------------------- diff --git a/nifi-site/src/scss/app.scss b/nifi-site/src/scss/app.scss index ddd0c87..70de9e7 100644 --- a/nifi-site/src/scss/app.scss +++ b/nifi-site/src/scss/app.scss @@ -187,6 +187,8 @@ div.external-guide { div.external-guide iframe { width: 100%; height: 100%; + border-width: 0; + display: block; } /*
