[skip ci] convert label-gray and label-inverse to badge-gray and badge-inverse

12 files changed, 32 insertions, 14 deletions

diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss
index 1def26011d7..f1efed5e578 100644
--- a/app/assets/stylesheets/bootstrap_migration.scss
+++ b/app/assets/stylesheets/bootstrap_migration.scss
@@ -50,3 +50,21 @@ button, html [type="button"], [type="reset"], [type="submit"] {
   // Remove bootstrap's dropdown caret
   display: none;
 }
+
+.badge {
+  padding: 4px 5px;
+  font-size: 12px;
+  font-style: normal;
+  font-weight: $gl-font-weight-normal;
+  display: inline-block;
+
+  &.badge-gray {
+    background-color: $label-gray-bg;
+    color: $gl-text-color;
+    text-shadow: none;
+  }
+
+  &.badge-inverse {
+    background-color: $label-inverse-bg;
+  }
+}
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index 4898867236e..7a4b30351a5 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -62,7 +62,7 @@ module CommitsHelper
 
   # Returns a link formatted as a commit branch link
   def commit_branch_link(url, text)
-    link_to(url, class: 'label label-gray ref-name branch-link') do
+    link_to(url, class: 'badge badge-gray ref-name branch-link') do
       sprite_icon('fork', size: 16, css_class: 'fork-svg') + "#{text}"
     end
   end
@@ -76,7 +76,7 @@ module CommitsHelper
 
   # Returns a link formatted as a commit tag link
   def commit_tag_link(url, text)
-    link_to(url, class: 'label label-gray ref-name') do
+    link_to(url, class: 'badge badge-gray ref-name') do
       icon('tag', class: 'append-right-5') + "#{text}"
     end
   end
diff --git a/app/views/admin/hook_logs/_index.html.haml b/app/views/admin/hook_logs/_index.html.haml
index d10826a20d2..1d7c9930b6a 100644
--- a/app/views/admin/hook_logs/_index.html.haml
+++ b/app/views/admin/hook_logs/_index.html.haml
@@ -19,7 +19,7 @@
             %td
               = render partial: 'shared/hook_logs/status_label', locals: { hook_log: hook_log }
             %td.d-none.d-sm-block
-              %span.badge.label-gray.deploy-project-label
+              %span.badge.badge-gray.deploy-project-label
                 = hook_log.trigger.singularize.titleize
             %td
               = truncate(hook_log.url, length: 50)
diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml
index 97600a566fe..87f9b0e86a7 100644
--- a/app/views/admin/hooks/index.html.haml
+++ b/app/views/admin/hooks/index.html.haml
@@ -29,7 +29,7 @@
               %div
                 - SystemHook.triggers.each_value do |event|
                   - if hook.public_send(event)
-                    %span.badge.label-gray= event.to_s.titleize
-                %span.badge.label-gray SSL Verification: #{hook.enable_ssl_verification ? 'enabled' : 'disabled'}
+                    %span.badge.badge-gray= event.to_s.titleize
+                %span.badge.badge-gray SSL Verification: #{hook.enable_ssl_verification ? 'enabled' : 'disabled'}
 
 = render 'shared/plugins/index'
diff --git a/app/views/projects/commit/branches.html.haml b/app/views/projects/commit/branches.html.haml
index 8fbe46e6088..6eb2d3411b7 100644
--- a/app/views/projects/commit/branches.html.haml
+++ b/app/views/projects/commit/branches.html.haml
@@ -6,7 +6,7 @@
 
 - if @branches.any? || @tags.any? || @tags_limit_exceeded
   %span
-    = link_to "…", "#", class: "js-details-expand label label-gray"
+    = link_to "…", "#", class: "js-details-expand label badge-gray"
     %span.js-details-content.d-none
       = commit_branches_links(@project, @branches)
       - if @tags_limit_exceeded
diff --git a/app/views/projects/hook_logs/_index.html.haml b/app/views/projects/hook_logs/_index.html.haml
index 37ee28e6888..3e54c3ca9f8 100644
--- a/app/views/projects/hook_logs/_index.html.haml
+++ b/app/views/projects/hook_logs/_index.html.haml
@@ -19,7 +19,7 @@
             %td
               = render partial: 'shared/hook_logs/status_label', locals: { hook_log: hook_log }
             %td.d-none.d-sm-block
-              %span.badge.label-gray.deploy-project-label
+              %span.badge.badge-gray.deploy-project-label
                 = hook_log.trigger.singularize.titleize
             %td
               = truncate(hook_log.url, length: 50)
diff --git a/app/views/projects/merge_requests/invalid.html.haml b/app/views/projects/merge_requests/invalid.html.haml
index bf4c5ccdd1b..749228a9664 100644
--- a/app/views/projects/merge_requests/invalid.html.haml
+++ b/app/views/projects/merge_requests/invalid.html.haml
@@ -10,11 +10,11 @@
       - if @merge_request.for_fork? && !@merge_request.source_project
         fork project was removed
       - elsif !@merge_request.source_branch_exists?
-        %span.badge.label-inverse= @merge_request.source_branch
+        %span.badge.badge-inverse= @merge_request.source_branch
         does not exist in
         %span.badge.badge-info= @merge_request.source_project_path
       - elsif !@merge_request.target_branch_exists?
-        %span.badge.label-inverse= @merge_request.target_branch
+        %span.badge.badge-inverse= @merge_request.target_branch
         does not exist in
         %span.badge.badge-info= @merge_request.target_project_path
       - else
diff --git a/app/views/projects/pages/_list.html.haml b/app/views/projects/pages/_list.html.haml
index ac0dce60e84..986ca852411 100644
--- a/app/views/projects/pages/_list.html.haml
+++ b/app/views/projects/pages/_list.html.haml
@@ -17,7 +17,7 @@
               = icon('external-link')
             - if domain.subject
               %p
-                %span.badge.label-gray Certificate: #{domain.subject}
+                %span.badge.badge-gray Certificate: #{domain.subject}
                 - if domain.expired?
                   %span.badge.badge-danger Expired
           %div
diff --git a/app/views/projects/settings/integrations/_project_hook.html.haml b/app/views/projects/settings/integrations/_project_hook.html.haml
index dd7fa0cf2d5..77d88aed883 100644
--- a/app/views/projects/settings/integrations/_project_hook.html.haml
+++ b/app/views/projects/settings/integrations/_project_hook.html.haml
@@ -5,7 +5,7 @@
       %div
         - ProjectHook.triggers.each_value do |event|
           - if hook.public_send(event)
-            %span.badge.label-gray.deploy-project-label= event.to_s.titleize
+            %span.badge.badge-gray.deploy-project-label= event.to_s.titleize
     .col-md-4.col-lg-5.text-right-lg.prepend-top-5
       %span.append-right-10.inline
         SSL Verification: #{hook.enable_ssl_verification ? 'enabled' : 'disabled'}
diff --git a/app/views/search/results/_snippet_title.html.haml b/app/views/search/results/_snippet_title.html.haml
index cab95f76304..9c8afb2165b 100644
--- a/app/views/search/results/_snippet_title.html.haml
+++ b/app/views/search/results/_snippet_title.html.haml
@@ -3,7 +3,7 @@
     = link_to reliable_snippet_path(snippet_title) do
       = truncate(snippet_title.title, length: 60)
       - if snippet_title.private?
-        %span.badge.label-gray
+        %span.badge.badge-gray
           %i.fa.fa-lock
           private
     %span.cgray.monospace.tiny.float-right.term
diff --git a/app/views/shared/hook_logs/_content.html.haml b/app/views/shared/hook_logs/_content.html.haml
index ad185e27b3f..532712ee6d1 100644
--- a/app/views/shared/hook_logs/_content.html.haml
+++ b/app/views/shared/hook_logs/_content.html.haml
@@ -7,7 +7,7 @@
 %p
   %strong Trigger:
   %td.d-none.d-sm-block
-    %span.badge.label-gray.deploy-project-label
+    %span.badge.badge-gray.deploy-project-label
       = hook_log.trigger.singularize.titleize
 %p
   %strong Elapsed time:
diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml
index 7cc89a92f03..09bbd04c2bf 100644
--- a/app/views/shared/milestones/_milestone.html.haml
+++ b/app/views/shared/milestones/_milestone.html.haml
@@ -26,7 +26,7 @@
           .projects
             - milestone.milestones.each do |milestone|
               = link_to milestone_path(milestone) do
-                %span.badge.label-gray
+                %span.badge.badge-gray
                   = dashboard ? milestone.project.full_name : milestone.project.name
       - if @group
         .col-sm-6.milestone-actions