diff options
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/no-multi-assign-enable.yml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/no-restricted-globals-enable.yml | 5 | ||||
| -rw-r--r-- | config/karma.config.js | 1 | ||||
| -rw-r--r-- | config/webpack.config.js | 1 |
6 files changed, 15 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 65add153606..8e8a879be88 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -65,6 +65,7 @@ .diff-line-num { width: 50px; + position: relative; a { transition: none; diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index dcc42117861..25400d886fb 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -632,20 +632,18 @@ ul.notes { .line_holder .is-over:not(.no-comment-btn) { .add-diff-note { opacity: 1; + z-index: 101; } } .add-diff-note { @include btn-comment-icon; opacity: 0; - margin-top: -2px; margin-left: -55px; position: absolute; + top: 50%; + transform: translateY(-50%); z-index: 10; - - .new & { - margin-top: -10px; - } } .discussion-body, diff --git a/changelogs/unreleased/no-multi-assign-enable.yml b/changelogs/unreleased/no-multi-assign-enable.yml new file mode 100644 index 00000000000..bb9c69b18e7 --- /dev/null +++ b/changelogs/unreleased/no-multi-assign-enable.yml @@ -0,0 +1,5 @@ +--- +title: Enable no-multi-assignment in JS files +merge_request: 19808 +author: gfyoung +type: other diff --git a/changelogs/unreleased/no-restricted-globals-enable.yml b/changelogs/unreleased/no-restricted-globals-enable.yml new file mode 100644 index 00000000000..1fa2eac0d03 --- /dev/null +++ b/changelogs/unreleased/no-restricted-globals-enable.yml @@ -0,0 +1,5 @@ +--- +title: Enable no-restricted globals in JS files +merge_request: 19877 +author: gfyoung +type: other diff --git a/config/karma.config.js b/config/karma.config.js index 28a688797d9..84810332dc2 100644 --- a/config/karma.config.js +++ b/config/karma.config.js @@ -15,6 +15,7 @@ function fatalError(message) { // disable problematic options webpackConfig.entry = undefined; webpackConfig.mode = 'development'; +webpackConfig.optimization.nodeEnv = false; webpackConfig.optimization.runtimeChunk = false; webpackConfig.optimization.splitChunks = false; diff --git a/config/webpack.config.js b/config/webpack.config.js index 79b0df76205..583f05f2fb7 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -174,7 +174,6 @@ module.exports = { }, optimization: { - nodeEnv: false, runtimeChunk: 'single', splitChunks: { maxInitialRequests: 4, |