diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-10-17 13:28:27 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-10-17 13:28:27 +0000 |
| commit | 04892e1de8d7442909df6d60c90870ebab39f303 (patch) | |
| tree | 63a0b86a5e4f928b98a968531dd4c3a00c3ddfaf /app/assets | |
| parent | f69b54682fc1770a73c528032b1a86f3e7d547a1 (diff) | |
| download | gitlab-ce-04892e1de8d7442909df6d60c90870ebab39f303.tar.gz | |
Adds collapsible sections in cluster page
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/clusters.js | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/clusters.scss | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/clusters.js b/app/assets/javascripts/clusters.js index 50dbeb06362..180aa30e98c 100644 --- a/app/assets/javascripts/clusters.js +++ b/app/assets/javascripts/clusters.js @@ -3,7 +3,8 @@ import Visibility from 'visibilityjs'; import axios from 'axios'; import Poll from './lib/utils/poll'; import { s__ } from './locale'; -import './flash'; +import initSettingsPanels from './settings_panels'; +import Flash from './flash'; /** * Cluster page has 2 separate parts: @@ -24,6 +25,8 @@ class ClusterService { export default class Clusters { constructor() { + initSettingsPanels(); + const dataset = document.querySelector('.js-edit-cluster-form').dataset; this.state = { diff --git a/app/assets/stylesheets/pages/clusters.scss b/app/assets/stylesheets/pages/clusters.scss index 5538e46a6c4..8d6f30e3b84 100644 --- a/app/assets/stylesheets/pages/clusters.scss +++ b/app/assets/stylesheets/pages/clusters.scss @@ -4,6 +4,6 @@ } .alert-block { - margin-bottom: 20px; + margin-bottom: 10px; } } |