diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-08-01 15:26:00 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-08-04 15:52:55 -0500 |
| commit | f075e6d23d9b05acc6055ab8393d318a9d523088 (patch) | |
| tree | 3af3db04f9d28527115ba06d48f4158e86906ac1 | |
| parent | db271a6b051f9630d5dfb3acbbd78f150cb3f23f (diff) | |
| download | gitlab-ce-f075e6d23d9b05acc6055ab8393d318a9d523088.tar.gz | |
remove niceScroll from job trigger variables list
| -rw-r--r-- | app/assets/javascripts/build_variables.js | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/builds.scss | 8 | ||||
| -rw-r--r-- | app/views/projects/jobs/_sidebar.html.haml | 9 |
3 files changed, 13 insertions, 6 deletions
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/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss index 28c99d8e57c..214372928d8 100644 --- a/app/assets/stylesheets/pages/builds.scss +++ b/app/assets/stylesheets/pages/builds.scss @@ -259,7 +259,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; } diff --git a/app/views/projects/jobs/_sidebar.html.haml b/app/views/projects/jobs/_sidebar.html.haml index f2db71e8838..c876c419664 100644 --- a/app/views/projects/jobs/_sidebar.html.haml +++ b/app/views/projects/jobs/_sidebar.html.haml @@ -49,11 +49,10 @@ %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 |