diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-11 00:10:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-11 00:10:15 +0300 |
| commit | e109a7799eb2c5598211c4cc1e0c83d5beb44018 (patch) | |
| tree | d72aa61dbb5b04bb0f25232660591963bc1f03b8 /app/assets/javascripts/monitoring | |
| parent | cba8ff64401258aa68eebd7603d4022884ed0a45 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/monitoring')
| -rw-r--r-- | app/assets/javascripts/monitoring/components/alert_widget_form.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/monitoring/components/dashboard_panel.vue | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/monitoring/components/alert_widget_form.vue b/app/assets/javascripts/monitoring/components/alert_widget_form.vue index 6f29b34141d..71691429ece 100644 --- a/app/assets/javascripts/monitoring/components/alert_widget_form.vue +++ b/app/assets/javascripts/monitoring/components/alert_widget_form.vue @@ -31,7 +31,7 @@ const SUBMIT_ACTION_TEXT = { const SUBMIT_BUTTON_CLASS = { create: 'btn-success', update: 'btn-success', - delete: 'btn-remove', + delete: 'btn-danger', }; export default { diff --git a/app/assets/javascripts/monitoring/components/dashboard_panel.vue b/app/assets/javascripts/monitoring/components/dashboard_panel.vue index 597600bba07..ad7127d97de 100644 --- a/app/assets/javascripts/monitoring/components/dashboard_panel.vue +++ b/app/assets/javascripts/monitoring/components/dashboard_panel.vue @@ -394,10 +394,10 @@ export default { data-qa-selector="prometheus_graph_widgets" > <div data-testid="dropdown-wrapper" class="d-flex align-items-center"> - <!-- + <!-- This component should be replaced with a variant developed as part of https://gitlab.com/gitlab-org/gitlab-ui/-/issues/936 - The variant will create a dropdown with an icon, no text and no caret + The variant will create a dropdown with an icon, no text and no caret --> <gl-dropdown v-gl-tooltip |