From 5ad7378fc7ed27bad7bd7fe33ac39754119ed6a5 Mon Sep 17 00:00:00 2001 From: Mayra Cabrera Date: Wed, 14 Mar 2018 09:40:09 -0600 Subject: Change ci/lint page to use a template structure - Removes duplicated CSS - Includes translations for strings --- app/assets/javascripts/pages/ci/lints/new/index.js | 3 --- .../javascripts/pages/projects/ci/lints/create/index.js | 3 --- .../javascripts/pages/projects/ci/lints/new/index.js | 3 +++ app/assets/stylesheets/pages/lint.scss | 13 ------------- app/views/ci/lints/show.html.haml | 14 +++++++++----- 5 files changed, 12 insertions(+), 24 deletions(-) delete mode 100644 app/assets/javascripts/pages/ci/lints/new/index.js delete mode 100644 app/assets/javascripts/pages/projects/ci/lints/create/index.js create mode 100644 app/assets/javascripts/pages/projects/ci/lints/new/index.js diff --git a/app/assets/javascripts/pages/ci/lints/new/index.js b/app/assets/javascripts/pages/ci/lints/new/index.js deleted file mode 100644 index 8e8a843da0b..00000000000 --- a/app/assets/javascripts/pages/ci/lints/new/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import CILintEditor from '../ci_lint_editor'; - -document.addEventListener('DOMContentLoaded', () => new CILintEditor()); diff --git a/app/assets/javascripts/pages/projects/ci/lints/create/index.js b/app/assets/javascripts/pages/projects/ci/lints/create/index.js deleted file mode 100644 index 8e8a843da0b..00000000000 --- a/app/assets/javascripts/pages/projects/ci/lints/create/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import CILintEditor from '../ci_lint_editor'; - -document.addEventListener('DOMContentLoaded', () => new CILintEditor()); diff --git a/app/assets/javascripts/pages/projects/ci/lints/new/index.js b/app/assets/javascripts/pages/projects/ci/lints/new/index.js new file mode 100644 index 00000000000..8e8a843da0b --- /dev/null +++ b/app/assets/javascripts/pages/projects/ci/lints/new/index.js @@ -0,0 +1,3 @@ +import CILintEditor from '../ci_lint_editor'; + +document.addEventListener('DOMContentLoaded', () => new CILintEditor()); diff --git a/app/assets/stylesheets/pages/lint.scss b/app/assets/stylesheets/pages/lint.scss index 5da774828d9..9eb3a472458 100644 --- a/app/assets/stylesheets/pages/lint.scss +++ b/app/assets/stylesheets/pages/lint.scss @@ -1,16 +1,3 @@ -.ci-linter-container { - align-items: center; - display: flex; - height: calc(100vh - #{$header-height + $performance-bar-height}); - justify-content: center; - text-align: center; -} - -.ci-linter-inner { - width: auto; -} - .ci-linter-description { color: $common-gray-light; - width: 500px; } diff --git a/app/views/ci/lints/show.html.haml b/app/views/ci/lints/show.html.haml index ffd44c2af8d..2cca0e37314 100644 --- a/app/views/ci/lints/show.html.haml +++ b/app/views/ci/lints/show.html.haml @@ -1,5 +1,9 @@ -.ci-linter-container - .ci-linter-inner - = image_tag 'illustrations/feature_moved.svg' - %h3 GitLab CI Linter has been moved - %p.ci-linter-description To validate your GitLab CI configurations, go to 'CI/CD → Pipelines' inside your project, and click on the 'CI Lint' button. +.row.empty-state + .col-xs-12 + .svg-content + = image_tag 'illustrations/feature_moved.svg' + .col-xs-12 + .text-content.text-center + %h4= _("GitLab CI Linter has been moved") + %p.ci-linter-description + = _("To validate your GitLab CI configurations, go to 'CI/CD → Pipelines' inside your project, and click on the 'CI Lint' button.") -- cgit v1.2.1