Merge branch '15664-remove-jquery-nicescroll' into 'master'

Resolve "Remove jQuery Nicescroll"

Closes #15664, #30860, and #35885

See merge request !13262

12 files changed, 135 insertions, 121 deletions

diff --git a/app/assets/javascripts/build.js b/app/assets/javascripts/build.js
index b3d3bbcf84f..940326dcd33 100644
--- a/app/assets/javascripts/build.js
+++ b/app/assets/javascripts/build.js
@@ -164,7 +164,6 @@ window.Build = (function () {
 
   Build.prototype.initSidebar = function () {
     this.$sidebar = $('.js-build-sidebar');
-    this.$sidebar.niceScroll();
   };
 
   Build.prototype.getBuildTrace = function () {
diff --git a/app/assets/javascripts/build_variables.js b/app/assets/javascripts/build_variables.js
index 99082b412e2..c955a9ac2ea 100644
--- a/app/assets/javascripts/build_variables.js
+++ b/app/assets/javascripts/build_variables.js
@@ -2,7 +2,7 @@
 
 $(function() {
   $('.reveal-variables').off('click').on('click', function() {
-    $('.js-build').toggle().niceScroll();
+    $('.js-build-variables').toggle();
     $(this).hide();
   });
 });
diff --git a/app/assets/javascripts/commons/jquery.js b/app/assets/javascripts/commons/jquery.js
index b53f6284afc..b93e94a3c97 100644
--- a/app/assets/javascripts/commons/jquery.js
+++ b/app/assets/javascripts/commons/jquery.js
@@ -6,6 +6,5 @@ import 'vendor/jquery.endless-scroll';
 import 'vendor/jquery.caret';
 import 'vendor/jquery.atwho';
 import 'vendor/jquery.scrollTo';
-import 'vendor/jquery.nicescroll';
 import 'vendor/jquery.waitforimages';
 import 'select2/select2';
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index b72259b86b5..e95892a6189 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -577,7 +577,6 @@ import GpgBadges from './gpg_badges';
               shortcut_handler = new ShortcutsWiki();
               new ZenMode();
               new gl.GLForm($('.wiki-form'), true);
-              new Sidebar();
               break;
             case 'snippets':
               shortcut_handler = new ShortcutsNavigation();
diff --git a/app/assets/javascripts/wikis.js b/app/assets/javascripts/wikis.js
index 00676bcb0b3..51ed2b4fd15 100644
--- a/app/assets/javascripts/wikis.js
+++ b/app/assets/javascripts/wikis.js
@@ -1,6 +1,5 @@
 /* global Breakpoints */
 
-import 'vendor/jquery.nicescroll';
 import './breakpoints';
 
 export default class Wikis {
@@ -8,7 +7,6 @@ export default class Wikis {
     this.bp = Breakpoints.get();
     this.sidebarEl = document.querySelector('.js-wiki-sidebar');
     this.sidebarExpanded = false;
-    $(this.sidebarEl).niceScroll();
 
     const sidebarToggles = document.querySelectorAll('.js-sidebar-wiki-toggle');
     for (let i = 0; i < sidebarToggles.length; i += 1) {
diff --git a/app/assets/stylesheets/framework/layout.scss b/app/assets/stylesheets/framework/layout.scss
index 67c3287ed74..0d8827bec11 100644
--- a/app/assets/stylesheets/framework/layout.scss
+++ b/app/assets/stylesheets/framework/layout.scss
@@ -109,16 +109,8 @@ body {
   }
 }
 
-
-/* The following prevents side effects related to iOS Safari's implementation of -webkit-overflow-scrolling: touch,
-which is applied to the body by jquery.nicescroling plugin to force hardware acceleration for momentum scrolling. Side
-effects are commonly related to inconsisent z-index behavior (e.g. tooltips). By applying the following to direct children
-of the body element here, we negate cascading side effects but allow momentum scrolling to be applied to the body  */
-
-.navbar,
-.page-gutter,
-.page-with-sidebar {
-  -webkit-overflow-scrolling: auto;
+.page-with-sidebar > .content-wrapper {
+  min-height: calc(100vh - #{$header-height});
 }
 
 .with-performance-bar .page-with-sidebar {
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index 09b60ad1676..40e8a928e6e 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -78,15 +78,12 @@
 
 .right-sidebar {
   border-left: 1px solid $border-color;
+  height: calc(100% - #{$header-height});
 
   &.affix {
     position: fixed;
     top: $header-height;
   }
-
-  &:not(.affix-top) {
-    min-height: 100%;
-  }
 }
 
 .with-performance-bar .right-sidebar.affix {
diff --git a/app/assets/stylesheets/new_sidebar.scss b/app/assets/stylesheets/new_sidebar.scss
index 10c9c97df0e..c82c8a00530 100644
--- a/app/assets/stylesheets/new_sidebar.scss
+++ b/app/assets/stylesheets/new_sidebar.scss
@@ -24,7 +24,7 @@ $new-sidebar-collapsed-width: 50px;
   // Override position: absolute
   .right-sidebar {
     position: fixed;
-    height: 100%;
+    height: calc(100% - #{$header-height});
   }
 
   .issues-bulk-update.right-sidebar.right-sidebar-expanded .issuable-sidebar-header {
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index 28c99d8e57c..486424fb729 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -235,8 +235,18 @@
     display: none;
   }
 
+  .sidebar-container {
+    width: calc(100% + 100px);
+    padding-right: 100px;
+    height: 100%;
+    overflow-y: scroll;
+    overflow-x: hidden;
+    -webkit-overflow-scrolling: touch;
+  }
+
   .blocks-container {
     padding: 0 $gl-padding;
+    width: 289px;
   }
 
   .block {
@@ -259,7 +269,15 @@
     padding: 16px 0;
   }
 
+  .trigger-build-variables {
+    margin: 0;
+    overflow-x: auto;
+    -ms-overflow-style: scrollbar;
+    -webkit-overflow-scrolling: touch;
+  }
+
   .trigger-build-variable {
+    font-weight: normal;
     color: $code-color;
   }
 
@@ -326,6 +344,7 @@
     border-top: 1px solid $border-color;
     border-bottom: 1px solid $border-color;
     max-height: 300px;
+    width: 289px;
     overflow: auto;
 
     svg {
diff --git a/app/assets/stylesheets/pages/wiki.scss b/app/assets/stylesheets/pages/wiki.scss
index 45c21c5d274..fa6bdd297eb 100644
--- a/app/assets/stylesheets/pages/wiki.scss
+++ b/app/assets/stylesheets/pages/wiki.scss
@@ -95,12 +95,22 @@
 }
 
 .right-sidebar.wiki-sidebar {
-  padding: $gl-padding 0;
+  padding: 0;
 
   &.right-sidebar-collapsed {
     display: none;
   }
 
+  .sidebar-container {
+    padding: $gl-padding 0;
+    width: calc(100% + 100px);
+    padding-right: 100px;
+    height: 100%;
+    overflow-y: scroll;
+    overflow-x: hidden;
+    -webkit-overflow-scrolling: touch;
+  }
+
   .blocks-container {
     padding: 0 $gl-padding;
   }
diff --git a/app/views/projects/jobs/_sidebar.html.haml b/app/views/projects/jobs/_sidebar.html.haml
index f2db71e8838..99f4b30d085 100644
--- a/app/views/projects/jobs/_sidebar.html.haml
+++ b/app/views/projects/jobs/_sidebar.html.haml
@@ -1,101 +1,101 @@
 - builds = @build.pipeline.builds.to_a
 
 %aside.right-sidebar.right-sidebar-expanded.build-sidebar.js-build-sidebar.js-right-sidebar{ data: { "offset-top" => "101", "spy" => "affix" } }
-  .blocks-container
-    .block
-      %strong
-        = @build.name
-      %a.gutter-toggle.pull-right.visible-xs-block.visible-sm-block.js-sidebar-build-toggle{ href: "#", 'aria-label': 'Toggle Sidebar', role: 'button' }
-        = icon('angle-double-right')
-
-    #js-details-block-vue
-
-    - if can?(current_user, :read_build, @project) && (@build.artifacts? || @build.artifacts_expired?)
+  .sidebar-container
+    .blocks-container
       .block
-        .title
-          Job artifacts
-        - if @build.artifacts_expired?
-          %p.build-detail-row
-            The artifacts were removed
-            #{time_ago_with_tooltip(@build.artifacts_expire_at)}
-        - elsif @build.has_expiring_artifacts?
-          %p.build-detail-row
-            The artifacts will be removed in
-            %span.js-artifacts-remove= @build.artifacts_expire_at
+        %strong
+          = @build.name
+        %a.gutter-toggle.pull-right.visible-xs-block.visible-sm-block.js-sidebar-build-toggle{ href: "#", 'aria-label': 'Toggle Sidebar', role: 'button' }
+          = icon('angle-double-right')
 
-        - if @build.artifacts?
-          .btn-group.btn-group-justified{ role: :group }
-            - if @build.has_expiring_artifacts? && can?(current_user, :update_build, @build)
-              = link_to keep_project_job_artifacts_path(@project, @build), class: 'btn btn-sm btn-default', method: :post do
-                Keep
+      #js-details-block-vue
 
-            = link_to download_project_job_artifacts_path(@project, @build), rel: 'nofollow', download: '', class: 'btn btn-sm btn-default' do
-              Download
+      - if can?(current_user, :read_build, @project) && (@build.artifacts? || @build.artifacts_expired?)
+        .block
+          .title
+            Job artifacts
+          - if @build.artifacts_expired?
+            %p.build-detail-row
+              The artifacts were removed
+              #{time_ago_with_tooltip(@build.artifacts_expire_at)}
+          - elsif @build.has_expiring_artifacts?
+            %p.build-detail-row
+              The artifacts will be removed in
+              %span.js-artifacts-remove= @build.artifacts_expire_at
 
-            - if @build.artifacts_metadata?
-              = link_to browse_project_job_artifacts_path(@project, @build), class: 'btn btn-sm btn-default' do
-                Browse
+          - if @build.artifacts?
+            .btn-group.btn-group-justified{ role: :group }
+              - if @build.has_expiring_artifacts? && can?(current_user, :update_build, @build)
+                = link_to keep_project_job_artifacts_path(@project, @build), class: 'btn btn-sm btn-default', method: :post do
+                  Keep
 
-    - if @build.trigger_request
-      .build-widget.block
-        %h4.title
-          Trigger
+              = link_to download_project_job_artifacts_path(@project, @build), rel: 'nofollow', download: '', class: 'btn btn-sm btn-default' do
+                Download
 
-        %p
-          %span.build-light-text Token:
-          #{@build.trigger_request.trigger.short_token}
+              - if @build.artifacts_metadata?
+                = link_to browse_project_job_artifacts_path(@project, @build), class: 'btn btn-sm btn-default' do
+                  Browse
+
+      - if @build.trigger_request
+        .build-widget.block
+          %h4.title
+            Trigger
 
-        - if @build.trigger_request.variables
           %p
-            %button.btn.group.btn-group-justified.reveal-variables Reveal Variables
+            %span.build-light-text Token:
+            #{@build.trigger_request.trigger.short_token}
 
+          - if @build.trigger_request.variables
+            %p
+              %button.btn.group.btn-group-justified.reveal-variables Reveal Variables
 
-          - @build.trigger_request.variables.each do |key, value|
-            .hide.js-build
-              .js-build-variable.trigger-build-variable= key
-              .js-build-value.trigger-build-value= value
+            %dl.js-build-variables.trigger-build-variables.hide
+              - @build.trigger_request.variables.each do |key, value|
+                %dt.js-build-variable.trigger-build-variable= key
+                %dd.js-build-value.trigger-build-value= value
 
-    %div{ class: (@build.pipeline.stages_count > 1 ? "block" : "block-last") }
-      %p
-        Commit
-        = link_to @build.pipeline.short_sha, project_commit_path(@project, @build.pipeline.sha), class: 'commit-sha link-commit'
-        = clipboard_button(text: @build.pipeline.short_sha, title: "Copy commit SHA to clipboard")
-        - if @build.merge_request
-          in
-          = link_to "#{@build.merge_request.to_reference}", merge_request_path(@build.merge_request), class: 'link-commit'
+      %div{ class: (@build.pipeline.stages_count > 1 ? "block" : "block-last") }
+        %p
+          Commit
+          = link_to @build.pipeline.short_sha, project_commit_path(@project, @build.pipeline.sha), class: 'commit-sha link-commit'
+          = clipboard_button(text: @build.pipeline.short_sha, title: "Copy commit SHA to clipboard")
+          - if @build.merge_request
+            in
+            = link_to "#{@build.merge_request.to_reference}", merge_request_path(@build.merge_request), class: 'link-commit'
 
-      %p.build-light-text.append-bottom-0
-        #{@build.pipeline.git_commit_title}
+        %p.build-light-text.append-bottom-0
+          #{@build.pipeline.git_commit_title}
 
-    - if @build.pipeline.stages_count > 1
-      .dropdown.build-dropdown
-        %div
-          %span{ class: "ci-status-icon-#{@build.pipeline.status}" }
-            = ci_icon_for_status(@build.pipeline.status)
-          Pipeline
-          = link_to "##{@build.pipeline.id}", project_pipeline_path(@project, @build.pipeline), class: 'link-commit'
-          from
-          = link_to "#{@build.pipeline.ref}", project_branch_path(@project, @build.pipeline.ref), class: 'link-commit'
-        %button.dropdown-menu-toggle{ type: 'button', 'data-toggle' => 'dropdown' }
-          %span.stage-selection More
-          = icon('chevron-down')
-        %ul.dropdown-menu
-          - @build.pipeline.legacy_stages.each do |stage|
-            %li
-              %a.stage-item= stage.name
+      - if @build.pipeline.stages_count > 1
+        .block-last.dropdown.build-dropdown
+          %div
+            %span{ class: "ci-status-icon-#{@build.pipeline.status}" }
+              = ci_icon_for_status(@build.pipeline.status)
+            Pipeline
+            = link_to "##{@build.pipeline.id}", project_pipeline_path(@project, @build.pipeline), class: 'link-commit'
+            from
+            = link_to "#{@build.pipeline.ref}", project_branch_path(@project, @build.pipeline.ref), class: 'link-commit'
+          %button.dropdown-menu-toggle{ type: 'button', 'data-toggle' => 'dropdown' }
+            %span.stage-selection More
+            = icon('chevron-down')
+          %ul.dropdown-menu
+            - @build.pipeline.legacy_stages.each do |stage|
+              %li
+                %a.stage-item= stage.name
 
-  .builds-container
-    - HasStatus::ORDERED_STATUSES.each do |build_status|
-      - builds.select{|build| build.status == build_status}.each do |build|
-        .build-job{ class: sidebar_build_class(build, @build), data: { stage: build.stage } }
-          = link_to project_job_path(@project, build) do
-            = icon('arrow-right')
-            %span{ class: "ci-status-icon-#{build.status}" }
-              = ci_icon_for_status(build.status)
-            %span
-              - if build.name
-                = build.name
-              - else
-                = build.id
-            - if build.retried?
-              %i.fa.fa-refresh.has-tooltip{ data: { container: 'body', placement: 'bottom' }, title: 'Job was retried' }
+    .builds-container
+      - HasStatus::ORDERED_STATUSES.each do |build_status|
+        - builds.select{|build| build.status == build_status}.each do |build|
+          .build-job{ class: sidebar_build_class(build, @build), data: { stage: build.stage } }
+            = link_to project_job_path(@project, build) do
+              = icon('arrow-right')
+              %span{ class: "ci-status-icon-#{build.status}" }
+                = ci_icon_for_status(build.status)
+              %span
+                - if build.name
+                  = build.name
+                - else
+                  = build.id
+              - if build.retried?
+                %i.fa.fa-refresh.has-tooltip{ data: { container: 'body', placement: 'bottom' }, title: 'Job was retried' }
diff --git a/app/views/projects/wikis/_sidebar.html.haml b/app/views/projects/wikis/_sidebar.html.haml
index e71ce1f357f..f7283ae4739 100644
--- a/app/views/projects/wikis/_sidebar.html.haml
+++ b/app/views/projects/wikis/_sidebar.html.haml
@@ -1,21 +1,22 @@
 %aside.right-sidebar.right-sidebar-expanded.wiki-sidebar.js-wiki-sidebar.js-right-sidebar{ data: { "offset-top" => "50", "spy" => "affix" } }
-  .block.wiki-sidebar-header.append-bottom-default
-    %a.gutter-toggle.pull-right.visible-xs-block.visible-sm-block.js-sidebar-wiki-toggle{ href: "#" }
-      = icon('angle-double-right')
+  .sidebar-container
+    .block.wiki-sidebar-header.append-bottom-default
+      %a.gutter-toggle.pull-right.visible-xs-block.visible-sm-block.js-sidebar-wiki-toggle{ href: "#" }
+        = icon('angle-double-right')
 
-    - git_access_url = project_wikis_git_access_path(@project)
-    = link_to git_access_url, class: active_nav_link?(path: 'wikis#git_access') ? 'active' : '' do
-      = succeed '&nbsp;' do
-        = icon('cloud-download')
-      Clone repository
+      - git_access_url = project_wikis_git_access_path(@project)
+      = link_to git_access_url, class: active_nav_link?(path: 'wikis#git_access') ? 'active' : '' do
+        = succeed '&nbsp;' do
+          = icon('cloud-download')
+        Clone repository
 
-  .blocks-container
-    .block.block-first
-      %ul.wiki-pages
-        = render @sidebar_wiki_entries, context: 'sidebar'
+    .blocks-container
+      .block.block-first
+        %ul.wiki-pages
+          = render @sidebar_wiki_entries, context: 'sidebar'
 
-    .block
-      = link_to project_wikis_pages_path(@project), class: 'btn btn-block' do
-        More Pages
+      .block
+        = link_to project_wikis_pages_path(@project), class: 'btn btn-block' do
+          More Pages
 
 = render 'projects/wikis/new'