From 03bf9a3af684e07fed3ce1ced1a2227bd8e9871c Mon Sep 17 00:00:00 2001 From: 1ambda <1amb4a@gmail.com> Date: Wed, 10 May 2017 06:40:26 +0900 Subject: [PATCH 1/3] fix: Use github-markdown-css 2.6.0 from npm --- zeppelin-distribution/src/bin_license/LICENSE | 2 +- zeppelin-web/bower.json | 1 - zeppelin-web/package.json | 1 + zeppelin-web/src/index.html | 1 - zeppelin-web/src/index.js | 3 +++ 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/zeppelin-distribution/src/bin_license/LICENSE b/zeppelin-distribution/src/bin_license/LICENSE index d9410936371..60fe5c08c54 100644 --- a/zeppelin-distribution/src/bin_license/LICENSE +++ b/zeppelin-distribution/src/bin_license/LICENSE @@ -254,7 +254,7 @@ The text of each license is also included at licenses/LICENSE-[project]-[version (The MIT License) bcprov-jdk15on v1.51 (org.bouncycastle:bcprov-jdk15on:jar:1.51 - http://www.bouncycastle.org/java.html) - http://www.bouncycastle.org/licence.html (The MIT License) AnchorJS (https://github.com/bryanbraun/anchorjs) - https://github.com/bryanbraun/anchorjs/blob/master/README.md#license (The MIT License) moment-duration-format v1.3.0 (https://github.com/jsmreese/moment-duration-format) - https://github.com/jsmreese/moment-duration-format/blob/master/LICENSE - (The MIT License) github-markdown-css 2.4.0 (https://github.com/sindresorhus/github-markdown-css) - https://github.com/sindresorhus/github-markdown-css/blob/gh-pages/license + (The MIT License) github-markdown-css 2.6.0 (https://github.com/sindresorhus/github-markdown-css) - https://github.com/sindresorhus/github-markdown-css/blob/v2.6.0/license (The MIT License) scopt (com.github.scopt:scopt_2.10:3.2.0 - https://github.com/scopt/scopt) (The MIT License) Objenesis (org.objenesis:objenesis:2.1 - https://github.com/easymock/objenesis) - Copyright (c) 2006-2015 the original author and authors (The MIT License) JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.16 - http://www.slf4j.org) diff --git a/zeppelin-web/bower.json b/zeppelin-web/bower.json index 690cd155190..30fc5f02687 100644 --- a/zeppelin-web/bower.json +++ b/zeppelin-web/bower.json @@ -33,7 +33,6 @@ "handsontable": "~0.24.2", "moment-duration-format": "^1.3.0", "select2": "^4.0.3", - "github-markdown-css": "^2.4.0", "MathJax": "2.7.0", "ngclipboard": "^1.1.1" }, diff --git a/zeppelin-web/package.json b/zeppelin-web/package.json index e25254eb687..a992a0f79d2 100644 --- a/zeppelin-web/package.json +++ b/zeppelin-web/package.json @@ -22,6 +22,7 @@ "test": "karma start karma.conf.js" }, "dependencies": { + "github-markdown-css": "2.6.0", "grunt-angular-templates": "^0.5.7", "grunt-dom-munger": "^3.4.0", "headroom.js": "^0.9.3" diff --git a/zeppelin-web/src/index.html b/zeppelin-web/src/index.html index 003ad5be569..fc7a21f4b66 100644 --- a/zeppelin-web/src/index.html +++ b/zeppelin-web/src/index.html @@ -46,7 +46,6 @@ - diff --git a/zeppelin-web/src/index.js b/zeppelin-web/src/index.js index 314be64dabf..fc2d65b8c87 100644 --- a/zeppelin-web/src/index.js +++ b/zeppelin-web/src/index.js @@ -12,6 +12,9 @@ * limitations under the License. */ +// import globally uses css here +import 'github-markdown-css/github-markdown.css' + import './app/app.js' import './app/app.controller.js' import './app/home/home.controller.js' From 49ea902a05d6f7ac3ee2e5df44faf2c783bd4c5e Mon Sep 17 00:00:00 2001 From: 1ambda <1amb4a@gmail.com> Date: Wed, 10 May 2017 06:40:42 +0900 Subject: [PATCH 2/3] fix: DON'T set bottom-margin for markdown table --- zeppelin-web/src/app/notebook/paragraph/paragraph.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.css b/zeppelin-web/src/app/notebook/paragraph/paragraph.css index 1c5e560212a..6c46197123d 100644 --- a/zeppelin-web/src/app/notebook/paragraph/paragraph.css +++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.css @@ -44,7 +44,7 @@ word-wrap: break-word !important; } -.paragraph table { +.paragraph table:not(.markdown-body table) { margin-bottom: 0; } From 2c54b667b5a0beb48012684caf675486a722b848 Mon Sep 17 00:00:00 2001 From: 1ambda <1amb4a@gmail.com> Date: Wed, 10 May 2017 10:47:15 +0900 Subject: [PATCH 3/3] fix: use css loader for test --- zeppelin-web/webpack.config.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/zeppelin-web/webpack.config.js b/zeppelin-web/webpack.config.js index 2011440b2e5..201649c99df 100644 --- a/zeppelin-web/webpack.config.js +++ b/zeppelin-web/webpack.config.js @@ -165,7 +165,7 @@ module.exports = function makeWebpackConfig () { // // Reference: https://github.com/webpack/style-loader // Use style-loader in development. - loader: isTest ? 'null' : ExtractTextPlugin.extract('style-loader', 'css-loader?sourceMap!postcss-loader') + loader: ExtractTextPlugin.extract('style-loader', 'css-loader?sourceMap!postcss-loader') }, { // ASSET LOADER // Reference: https://github.com/webpack/file-loader @@ -215,6 +215,10 @@ module.exports = function makeWebpackConfig () { * List: http://webpack.github.io/docs/list-of-plugins.html */ config.plugins = [ + // Reference: https://github.com/webpack/extract-text-webpack-plugin + // Extract css files + // Disabled when in test mode or not in build mode + new ExtractTextPlugin('[name].[hash].css', {disable: !isProd}), ]; // Skip rendering index.html in test mode @@ -227,11 +231,6 @@ module.exports = function makeWebpackConfig () { inject: 'body' }), - // Reference: https://github.com/webpack/extract-text-webpack-plugin - // Extract css files - // Disabled when in test mode or not in build mode - new ExtractTextPlugin('[name].[hash].css', {disable: !isProd}), - // Reference: https://webpack.github.io/docs/list-of-plugins.html#defineplugin new webpack.DefinePlugin({ 'process.env': {