Commit 43de46e2 authored by Clement Ho's avatar Clement Ho

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

parent 1968191c
...@@ -50,3 +50,21 @@ button, html [type="button"], [type="reset"], [type="submit"] { ...@@ -50,3 +50,21 @@ button, html [type="button"], [type="reset"], [type="submit"] {
// Remove bootstrap's dropdown caret // Remove bootstrap's dropdown caret
display: none; 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;
}
}
...@@ -62,7 +62,7 @@ module CommitsHelper ...@@ -62,7 +62,7 @@ module CommitsHelper
# Returns a link formatted as a commit branch link # Returns a link formatted as a commit branch link
def commit_branch_link(url, text) 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}" sprite_icon('fork', size: 16, css_class: 'fork-svg') + "#{text}"
end end
end end
...@@ -76,7 +76,7 @@ module CommitsHelper ...@@ -76,7 +76,7 @@ module CommitsHelper
# Returns a link formatted as a commit tag link # Returns a link formatted as a commit tag link
def commit_tag_link(url, text) 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}" icon('tag', class: 'append-right-5') + "#{text}"
end end
end end
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
%td %td
= render partial: 'shared/hook_logs/status_label', locals: { hook_log: hook_log } = render partial: 'shared/hook_logs/status_label', locals: { hook_log: hook_log }
%td.d-none.d-sm-block %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 = hook_log.trigger.singularize.titleize
%td %td
= truncate(hook_log.url, length: 50) = truncate(hook_log.url, length: 50)
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
%div %div
- SystemHook.triggers.each_value do |event| - SystemHook.triggers.each_value do |event|
- if hook.public_send(event) - if hook.public_send(event)
%span.badge.label-gray= event.to_s.titleize %span.badge.badge-gray= event.to_s.titleize
%span.badge.label-gray SSL Verification: #{hook.enable_ssl_verification ? 'enabled' : 'disabled'} %span.badge.badge-gray SSL Verification: #{hook.enable_ssl_verification ? 'enabled' : 'disabled'}
= render 'shared/plugins/index' = render 'shared/plugins/index'
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
- if @branches.any? || @tags.any? || @tags_limit_exceeded - if @branches.any? || @tags.any? || @tags_limit_exceeded
%span %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 %span.js-details-content.d-none
= commit_branches_links(@project, @branches) = commit_branches_links(@project, @branches)
- if @tags_limit_exceeded - if @tags_limit_exceeded
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
%td %td
= render partial: 'shared/hook_logs/status_label', locals: { hook_log: hook_log } = render partial: 'shared/hook_logs/status_label', locals: { hook_log: hook_log }
%td.d-none.d-sm-block %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 = hook_log.trigger.singularize.titleize
%td %td
= truncate(hook_log.url, length: 50) = truncate(hook_log.url, length: 50)
......
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
- if @merge_request.for_fork? && !@merge_request.source_project - if @merge_request.for_fork? && !@merge_request.source_project
fork project was removed fork project was removed
- elsif !@merge_request.source_branch_exists? - 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 does not exist in
%span.badge.badge-info= @merge_request.source_project_path %span.badge.badge-info= @merge_request.source_project_path
- elsif !@merge_request.target_branch_exists? - 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 does not exist in
%span.badge.badge-info= @merge_request.target_project_path %span.badge.badge-info= @merge_request.target_project_path
- else - else
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
= icon('external-link') = icon('external-link')
- if domain.subject - if domain.subject
%p %p
%span.badge.label-gray Certificate: #{domain.subject} %span.badge.badge-gray Certificate: #{domain.subject}
- if domain.expired? - if domain.expired?
%span.badge.badge-danger Expired %span.badge.badge-danger Expired
%div %div
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
%div %div
- ProjectHook.triggers.each_value do |event| - ProjectHook.triggers.each_value do |event|
- if hook.public_send(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 .col-md-4.col-lg-5.text-right-lg.prepend-top-5
%span.append-right-10.inline %span.append-right-10.inline
SSL Verification: #{hook.enable_ssl_verification ? 'enabled' : 'disabled'} SSL Verification: #{hook.enable_ssl_verification ? 'enabled' : 'disabled'}
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
= link_to reliable_snippet_path(snippet_title) do = link_to reliable_snippet_path(snippet_title) do
= truncate(snippet_title.title, length: 60) = truncate(snippet_title.title, length: 60)
- if snippet_title.private? - if snippet_title.private?
%span.badge.label-gray %span.badge.badge-gray
%i.fa.fa-lock %i.fa.fa-lock
private private
%span.cgray.monospace.tiny.float-right.term %span.cgray.monospace.tiny.float-right.term
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
%p %p
%strong Trigger: %strong Trigger:
%td.d-none.d-sm-block %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 = hook_log.trigger.singularize.titleize
%p %p
%strong Elapsed time: %strong Elapsed time:
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
.projects .projects
- milestone.milestones.each do |milestone| - milestone.milestones.each do |milestone|
= link_to milestone_path(milestone) do = link_to milestone_path(milestone) do
%span.badge.label-gray %span.badge.badge-gray
= dashboard ? milestone.project.full_name : milestone.project.name = dashboard ? milestone.project.full_name : milestone.project.name
- if @group - if @group
.col-sm-6.milestone-actions .col-sm-6.milestone-actions
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment