Add collapsable sections for Pipeline Settings

3 files changed, 5 insertions, 13 deletions

diff --git a/app/views/ci/variables/_content.html.haml b/app/views/ci/variables/_content.html.haml
index 98f618ca3b8..fbfe3e56588 100644
--- a/app/views/ci/variables/_content.html.haml
+++ b/app/views/ci/variables/_content.html.haml
@@ -1,9 +1,3 @@
-%h4.prepend-top-0
-  Secret variables
-  = link_to icon('question-circle'), help_page_path('ci/variables/README', anchor: 'secret-variables'), target: '_blank'
-%p
-  These variables will be set to environment by the runner, and could be protected by exposing only to protected branches or tags.
-%p
-  So you can use them for passwords, secret keys or whatever you want.
-%p
-  The value of the variable can be visible in job log if explicitly asked to do so.
+%p.append-bottom-default
+  Variables are applied to environments via the runner. They can be protected by only exposing them to protected branches or tags.
+  You can use variables for passwords, secret keys, or whatever you want.
diff --git a/app/views/ci/variables/_index.html.haml b/app/views/ci/variables/_index.html.haml
index 007c2344b5a..2bac69bc536 100644
--- a/app/views/ci/variables/_index.html.haml
+++ b/app/views/ci/variables/_index.html.haml
@@ -1,7 +1,5 @@
 .row.prepend-top-default.append-bottom-default
-  .col-lg-4
-    = render "ci/variables/content"
-  .col-lg-8
+  .col-lg-12
     %h5.prepend-top-0
       Add a variable
     = render "ci/variables/form", btn_text: "Add new variable"
diff --git a/app/views/ci/variables/_show.html.haml b/app/views/ci/variables/_show.html.haml
index 2bfb290629d..6d75ae96124 100644
--- a/app/views/ci/variables/_show.html.haml
+++ b/app/views/ci/variables/_show.html.haml
@@ -4,6 +4,6 @@
   .col-lg-3
     = render "ci/variables/content"
   .col-lg-9
-    %h5.prepend-top-0
+    %h4.prepend-top-0
       Update variable
     = render "ci/variables/form", btn_text: "Save variable"