diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-03-28 23:01:57 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-03-28 23:01:57 +0300 |
| commit | 11f8940b6f5fe177caf7fcd11054f889f613be88 (patch) | |
| tree | da216b2c366704d1055f7bb069f53bbbe4aeaf56 | |
| parent | fe5f7390f036234192f4bee7f21f7795a0b992e0 (diff) | |
| parent | d79f395782ecf7c8829df045e5db2fa6eefd3f31 (diff) | |
Merge branch 'min-is-better' into 'master'
Use katex min css
See merge request gitlab-org/gitlab-ce!18061
| -rw-r--r-- | app/assets/javascripts/behaviors/markdown/render_math.js | 2 | ||||
| -rw-r--r-- | config/webpack.config.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/behaviors/markdown/render_math.js b/app/assets/javascripts/behaviors/markdown/render_math.js index 7dcf1aeed17..eb4e59d12b1 100644 --- a/app/assets/javascripts/behaviors/markdown/render_math.js +++ b/app/assets/javascripts/behaviors/markdown/render_math.js @@ -31,7 +31,7 @@ export default function renderMath($els) { if (!$els.length) return; Promise.all([ import(/* webpackChunkName: 'katex' */ 'katex'), - import(/* webpackChunkName: 'katex' */ 'katex/dist/katex.css'), + import(/* webpackChunkName: 'katex' */ 'katex/dist/katex.min.css'), ]).then(([katex]) => { renderWithKaTeX($els, katex); }).catch(() => flash(__('An error occurred while rendering KaTeX'))); diff --git a/config/webpack.config.js b/config/webpack.config.js index b74d9dde494..39e9fbbd530 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -104,7 +104,7 @@ const config = { }, }, { - test: /katex.css$/, + test: /katex.min.css$/, include: /node_modules\/katex\/dist/, use: [ { loader: 'style-loader' }, |