Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-04-13 22:36:22 +0300
committerClement Ho <ClemMakesApps@gmail.com>2018-04-13 22:36:22 +0300
commite3de2ab1b5bc80a2f64d7391dacdddcb26f4ffbc (patch)
treec7cdd37914285be41c4136f2426290337faed9f2 /app/views
parented696df59de0191de7274752e39b3c37727d5c4f (diff)
[skip ci] Convert label-success to badge-success
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/runners/_runner.html.haml2
-rw-r--r--app/views/admin/runners/index.html.haml2
-rw-r--r--app/views/admin/users/_user.html.haml2
-rw-r--r--app/views/profiles/emails/index.html.haml2
-rw-r--r--app/views/projects/branches/_branch.html.haml2
-rw-r--r--app/views/projects/pages_domains/show.html.haml2
-rw-r--r--app/views/projects/runners/_index.html.haml2
-rw-r--r--app/views/projects/tags/_tag.html.haml2
-rw-r--r--app/views/projects/tags/show.html.haml2
-rw-r--r--app/views/shared/hook_logs/_status_label.html.haml2
-rw-r--r--app/views/shared/members/_member.html.haml2
11 files changed, 11 insertions, 11 deletions
diff --git a/app/views/admin/runners/_runner.html.haml b/app/views/admin/runners/_runner.html.haml
index b9ef0e967da..f8d66cc42d8 100644
--- a/app/views/admin/runners/_runner.html.haml
+++ b/app/views/admin/runners/_runner.html.haml
@@ -1,7 +1,7 @@
%tr{ id: dom_id(runner) }
%td
- if runner.shared?
- %span.badge.label-success shared
+ %span.badge.badge-success shared
- else
%span.badge.label-info specific
- if runner.locked?
diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml
index a18e3d2896e..ea6c6134e20 100644
--- a/app/views/admin/runners/index.html.haml
+++ b/app/views/admin/runners/index.html.haml
@@ -14,7 +14,7 @@
%span Each Runner can be in one of the following states:
%ul
%li
- %span.badge.label-success shared
+ %span.badge.badge-success shared
\- Runner runs jobs from all unassigned projects
%li
%span.badge.label-info specific
diff --git a/app/views/admin/users/_user.html.haml b/app/views/admin/users/_user.html.haml
index 796ad2cd69c..6620af5f1ed 100644
--- a/app/views/admin/users/_user.html.haml
+++ b/app/views/admin/users/_user.html.haml
@@ -7,7 +7,7 @@
- if user.blocked?
%span.badge.label-danger blocked
- if user.admin?
- %span.badge.label-success Admin
+ %span.badge.badge-success Admin
- if user.external?
%span.badge.label-default External
- if user == current_user
diff --git a/app/views/profiles/emails/index.html.haml b/app/views/profiles/emails/index.html.haml
index 1dee0a5bdab..917d7247492 100644
--- a/app/views/profiles/emails/index.html.haml
+++ b/app/views/profiles/emails/index.html.haml
@@ -33,7 +33,7 @@
%li
= render partial: 'shared/email_with_badge', locals: { email: @primary_email, verified: current_user.confirmed? }
%span.float-right
- %span.badge.label-success Primary email
+ %span.badge.badge-success Primary email
- if @primary_email === current_user.public_email
%span.badge.label-info Public email
- if @primary_email === current_user.notification_email
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml
index 2b93ed30e69..83b26801474 100644
--- a/app/views/projects/branches/_branch.html.haml
+++ b/app/views/projects/branches/_branch.html.haml
@@ -19,7 +19,7 @@
= s_('Branches|merged')
- if protected_branch?(@project, branch)
- %span.badge.label-success
+ %span.badge.badge-success
= s_('Branches|protected')
.block-truncated
diff --git a/app/views/projects/pages_domains/show.html.haml b/app/views/projects/pages_domains/show.html.haml
index ce27034a22d..72dd6fbca90 100644
--- a/app/views/projects/pages_domains/show.html.haml
+++ b/app/views/projects/pages_domains/show.html.haml
@@ -43,7 +43,7 @@
%td
= form_tag verify_project_pages_domain_path(@project, @domain) do
.status-badge
- - text, status = @domain.unverified? ? [_('Unverified'), 'label-danger'] : [_('Verified'), 'label-success']
+ - text, status = @domain.unverified? ? [_('Unverified'), 'label-danger'] : [_('Verified'), 'badge-success']
.label{ class: status }
= text
%button.btn.has-tooltip{ type: "submit", data: { container: 'body' }, title: _("Retry verification") }
diff --git a/app/views/projects/runners/_index.html.haml b/app/views/projects/runners/_index.html.haml
index 537d38c7858..8f4891d0367 100644
--- a/app/views/projects/runners/_index.html.haml
+++ b/app/views/projects/runners/_index.html.haml
@@ -9,7 +9,7 @@
%div
%ul
%li
- %span.badge.label-success active
+ %span.badge.badge-success active
\- Runner is active and can process any new jobs
%li
%span.badge.label-danger paused
diff --git a/app/views/projects/tags/_tag.html.haml b/app/views/projects/tags/_tag.html.haml
index 783b91effbb..f55202c2c5f 100644
--- a/app/views/projects/tags/_tag.html.haml
+++ b/app/views/projects/tags/_tag.html.haml
@@ -6,7 +6,7 @@
= link_to tag.name, project_tag_path(@project, tag.name), class: 'item-title ref-name prepend-left-4'
- if protected_tag?(@project, tag)
- %span.badge.label-success.prepend-left-4
+ %span.badge.badge-success.prepend-left-4
= s_('TagsPage|protected')
- if tag.message.present?
diff --git a/app/views/projects/tags/show.html.haml b/app/views/projects/tags/show.html.haml
index 3f37c19796f..15a960f81b8 100644
--- a/app/views/projects/tags/show.html.haml
+++ b/app/views/projects/tags/show.html.haml
@@ -11,7 +11,7 @@
= icon('tag')
= @tag.name
- if protected_tag?(@project, @tag)
- %span.badge.label-success
+ %span.badge.badge-success
= s_('TagsPage|protected')
- if @commit
= render 'projects/branches/commit', commit: @commit, project: @project
diff --git a/app/views/shared/hook_logs/_status_label.html.haml b/app/views/shared/hook_logs/_status_label.html.haml
index b4ea8e6f952..fd20d98187d 100644
--- a/app/views/shared/hook_logs/_status_label.html.haml
+++ b/app/views/shared/hook_logs/_status_label.html.haml
@@ -1,3 +1,3 @@
-- label_status = hook_log.success? ? 'label-success' : 'label-danger'
+- label_status = hook_log.success? ? 'badge-success' : 'label-danger'
%span{ class: "label #{label_status}" }
= hook_log.response_status
diff --git a/app/views/shared/members/_member.html.haml b/app/views/shared/members/_member.html.haml
index 3ba848a360a..175ad2c8112 100644
--- a/app/views/shared/members/_member.html.haml
+++ b/app/views/shared/members/_member.html.haml
@@ -14,7 +14,7 @@
%span.cgray= user.to_reference
- if user == current_user
- %span.badge.label-success.prepend-left-5 It's you
+ %span.badge.badge-success.prepend-left-5 It's you
- if user.blocked?
%label.badge.label-danger