summaryrefslogtreecommitdiff
path: root/app/views/projects/triggers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-22 15:09:27 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-22 15:09:27 +0000
commite829ca213b25b49faa619c0363059c6ed0a5a112 (patch)
tree0db00d8f17cf6f278cc68fb6b3739fda8d44fea6 /app/views/projects/triggers
parent6046a605fdbb6d180861c978d17fe3516b2e7507 (diff)
downloadgitlab-ce-e829ca213b25b49faa619c0363059c6ed0a5a112.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/triggers')
-rw-r--r--app/views/projects/triggers/_index.html.haml4
-rw-r--r--app/views/projects/triggers/edit.html.haml2
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/triggers/_index.html.haml b/app/views/projects/triggers/_index.html.haml
index 4ca070cb162..53f55442b01 100644
--- a/app/views/projects/triggers/_index.html.haml
+++ b/app/views/projects/triggers/_index.html.haml
@@ -1,4 +1,4 @@
-.row.prepend-top-default.append-bottom-default.triggers-container
+.row.prepend-top-default.gl-mb-3.triggers-container
.col-lg-12
.card
.card-header
@@ -21,7 +21,7 @@
%th
= render partial: 'projects/triggers/trigger', collection: @triggers, as: :trigger
- else
- %p.settings-message.text-center.append-bottom-default
+ %p.settings-message.text-center.gl-mb-3
No triggers have been created yet. Add one using the form above.
.card-footer
diff --git a/app/views/projects/triggers/edit.html.haml b/app/views/projects/triggers/edit.html.haml
index b1bc9b0f900..67ca4994146 100644
--- a/app/views/projects/triggers/edit.html.haml
+++ b/app/views/projects/triggers/edit.html.haml
@@ -1,6 +1,6 @@
- page_title _("Trigger")
-.row.prepend-top-default.append-bottom-default
+.row.prepend-top-default.gl-mb-3
.col-lg-12
%h4.gl-mt-0
Update trigger