Commit 8c050582 authored by Olena Horal-Koretska's avatar Olena Horal-Koretska

Merge branch 'justin_ho-refactor-redundant-size-param-in-sprite_icon' into 'master'

Remove redundant `size: 16` from sprite_icon

See merge request gitlab-org/gitlab!38781
parents 9d8801cf 90b73095
...@@ -20,6 +20,6 @@ module ActiveSessionsHelper ...@@ -20,6 +20,6 @@ module ActiveSessionsHelper
'monitor-o' 'monitor-o'
end end
sprite_icon(icon_name, size: 16, css_class: 'gl-mt-2') sprite_icon(icon_name, css_class: 'gl-mt-2')
end end
end end
...@@ -40,7 +40,7 @@ module DashboardHelper ...@@ -40,7 +40,7 @@ module DashboardHelper
end) end)
if doc_href.present? if doc_href.present?
link_to_doc = link_to(sprite_icon('question', size: 16), doc_href, link_to_doc = link_to(sprite_icon('question'), doc_href,
class: 'gl-ml-2', title: _('Documentation'), class: 'gl-ml-2', title: _('Documentation'),
target: '_blank', rel: 'noopener noreferrer') target: '_blank', rel: 'noopener noreferrer')
......
...@@ -205,7 +205,7 @@ module IssuablesHelper ...@@ -205,7 +205,7 @@ module IssuablesHelper
author_output author_output
end end
output << content_tag(:span, (sprite_icon('first-contribution', size: 16, css_class: 'gl-icon gl-vertical-align-middle') if issuable.first_contribution?), class: 'has-tooltip gl-ml-2', title: _('1st contribution!')) output << content_tag(:span, (sprite_icon('first-contribution', css_class: 'gl-icon gl-vertical-align-middle') if issuable.first_contribution?), class: 'has-tooltip gl-ml-2', title: _('1st contribution!'))
output << content_tag(:span, (issuable.task_status if issuable.tasks?), id: "task_status", class: "d-none d-sm-none d-md-inline-block gl-ml-3") output << content_tag(:span, (issuable.task_status if issuable.tasks?), id: "task_status", class: "d-none d-sm-none d-md-inline-block gl-ml-3")
output << content_tag(:span, (issuable.task_status_short if issuable.tasks?), id: "task_status_short", class: "d-md-none") output << content_tag(:span, (issuable.task_status_short if issuable.tasks?), id: "task_status_short", class: "d-md-none")
......
...@@ -41,7 +41,7 @@ module IssuesHelper ...@@ -41,7 +41,7 @@ module IssuesHelper
end end
def confidential_icon(issue) def confidential_icon(issue)
sprite_icon('eye-slash', size: 16, css_class: 'gl-vertical-align-text-bottom') if issue.confidential? sprite_icon('eye-slash', css_class: 'gl-vertical-align-text-bottom') if issue.confidential?
end end
def award_user_list(awards, current_user, limit: 10) def award_user_list(awards, current_user, limit: 10)
......
...@@ -238,7 +238,7 @@ module SortingHelper ...@@ -238,7 +238,7 @@ module SortingHelper
end end
link_to(url, type: 'button', class: link_class, title: s_('SortOptions|Sort direction')) do link_to(url, type: 'button', class: link_class, title: s_('SortOptions|Sort direction')) do
sprite_icon(icon, size: 16) sprite_icon(icon)
end end
end end
......
...@@ -80,7 +80,7 @@ module WikiHelper ...@@ -80,7 +80,7 @@ module WikiHelper
link_to(wiki_path(wiki, action: :pages, sort: sort, direction: reversed_direction), link_to(wiki_path(wiki, action: :pages, sort: sort, direction: reversed_direction),
type: 'button', class: link_class, title: _('Sort direction')) do type: 'button', class: link_class, title: _('Sort direction')) do
sprite_icon("sort-#{icon_class}", size: 16) sprite_icon("sort-#{icon_class}")
end end
end end
......
...@@ -76,7 +76,7 @@ module Gitlab ...@@ -76,7 +76,7 @@ module Gitlab
end end
def versions_sprite_icon def versions_sprite_icon
@versions_sprite_icon ||= sprite_icon('doc-versions', size: 16, css_class: 'doc-versions align-text-bottom') @versions_sprite_icon ||= sprite_icon('doc-versions', css_class: 'doc-versions align-text-bottom')
end end
end end
end end
...@@ -16,7 +16,7 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated ...@@ -16,7 +16,7 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated
MAX_TOPICS_TO_SHOW = 3 MAX_TOPICS_TO_SHOW = 3
def statistic_icon(icon_name = 'plus-square-o') def statistic_icon(icon_name = 'plus-square-o')
sprite_icon(icon_name, size: 16, css_class: 'icon gl-mr-2') sprite_icon(icon_name, css_class: 'icon gl-mr-2')
end end
def statistics_anchors(show_auto_devops_callout:) def statistics_anchors(show_auto_devops_callout:)
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
- if Feature.enabled?(:instance_level_integrations) - if Feature.enabled?(:instance_level_integrations)
- if show_admin_integrations_moved? - if show_admin_integrations_moved?
.gl-alert.gl-alert-info.js-admin-integrations-moved.mt-3{ role: 'alert', data: { feature_id: UserCalloutsHelper::ADMIN_INTEGRATIONS_MOVED, dismiss_endpoint: user_callouts_path } } .gl-alert.gl-alert-info.js-admin-integrations-moved.mt-3{ role: 'alert', data: { feature_id: UserCalloutsHelper::ADMIN_INTEGRATIONS_MOVED, dismiss_endpoint: user_callouts_path } }
= sprite_icon('information-o', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') = sprite_icon('information-o', css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
%button.js-close.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') } %button.js-close.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') }
= sprite_icon('close', size: 16, css_class: 'gl-icon') = sprite_icon('close', css_class: 'gl-icon')
.gl-alert-body .gl-alert-body
%h4.gl-alert-title= s_('AdminSettings|Some settings have moved') %h4.gl-alert-title= s_('AdminSettings|Some settings have moved')
= html_escape_once(s_('AdminSettings|Elasticsearch, PlantUML, Slack application, Third party offers, Snowplow, Amazon EKS have moved to Settings &gt; General.')).html_safe = html_escape_once(s_('AdminSettings|Elasticsearch, PlantUML, Slack application, Third party offers, Snowplow, Amazon EKS have moved to Settings &gt; General.')).html_safe
......
.broadcast-message.broadcast-banner-message.alert-warning.js-broadcast-banner-message-preview.mt-2{ style: broadcast_message_style(@broadcast_message), class: ('hidden' unless @broadcast_message.banner? ) } .broadcast-message.broadcast-banner-message.alert-warning.js-broadcast-banner-message-preview.mt-2{ style: broadcast_message_style(@broadcast_message), class: ('hidden' unless @broadcast_message.banner? ) }
= sprite_icon('bullhorn', size: 16, css_class:'vertical-align-text-top') = sprite_icon('bullhorn', css_class:'vertical-align-text-top')
.js-broadcast-message-preview .js-broadcast-message-preview
- if @broadcast_message.message.present? - if @broadcast_message.message.present?
= render_broadcast_message(@broadcast_message) = render_broadcast_message(@broadcast_message)
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
Your message here Your message here
.d-flex.justify-content-center .d-flex.justify-content-center
.broadcast-message.broadcast-notification-message.preview.js-broadcast-notification-message-preview.mt-2{ class: ('hidden' unless @broadcast_message.notification? ) } .broadcast-message.broadcast-notification-message.preview.js-broadcast-notification-message-preview.mt-2{ class: ('hidden' unless @broadcast_message.notification? ) }
= sprite_icon('bullhorn', size: 16, css_class:'vertical-align-text-top') = sprite_icon('bullhorn', css_class:'vertical-align-text-top')
.js-broadcast-message-preview .js-broadcast-message-preview
- if @broadcast_message.message.present? - if @broadcast_message.message.present?
= render_broadcast_message(@broadcast_message) = render_broadcast_message(@broadcast_message)
......
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
= render_if_exists 'admin/groups/marked_for_deletion_badge', group: group, css_class: 'gl-ml-5' = render_if_exists 'admin/groups/marked_for_deletion_badge', group: group, css_class: 'gl-ml-5'
%span.gl-ml-5 %span.gl-ml-5
= sprite_icon('bookmark', size: 16, css_class: 'gl-vertical-align-text-bottom') = sprite_icon('bookmark', css_class: 'gl-vertical-align-text-bottom')
= number_with_delimiter(group.projects.count) = number_with_delimiter(group.projects.count)
%span.gl-ml-5 %span.gl-ml-5
= sprite_icon('users', size: 16, css_class: 'gl-vertical-align-text-bottom') = sprite_icon('users', css_class: 'gl-vertical-align-text-bottom')
= number_with_delimiter(group.users.count) = number_with_delimiter(group.users.count)
%span.gl-ml-5.visibility-icon.has-tooltip{ data: { container: 'body', placement: 'left' }, title: visibility_icon_description(group) } %span.gl-ml-5.visibility-icon.has-tooltip{ data: { container: 'body', placement: 'left' }, title: visibility_icon_description(group) }
......
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
.btn-group.table-action-buttons .btn-group.table-action-buttons
.btn-group .btn-group
= link_to admin_runner_path(runner), class: 'btn btn-default has-tooltip', title: _('Edit'), ref: 'tooltip', aria: { label: _('Edit') }, data: { placement: 'top', container: 'body'} do = link_to admin_runner_path(runner), class: 'btn btn-default has-tooltip', title: _('Edit'), ref: 'tooltip', aria: { label: _('Edit') }, data: { placement: 'top', container: 'body'} do
= sprite_icon('pencil', size: 16) = sprite_icon('pencil')
.btn-group .btn-group
- if runner.active? - if runner.active?
= link_to [:pause, :admin, runner], method: :get, class: 'btn btn-default btn-svg has-tooltip', title: _('Pause'), ref: 'tooltip', aria: { label: _('Pause') }, data: { placement: 'top', container: 'body', confirm: _('Are you sure?') } do = link_to [:pause, :admin, runner], method: :get, class: 'btn btn-default btn-svg has-tooltip', title: _('Pause'), ref: 'tooltip', aria: { label: _('Pause') }, data: { placement: 'top', container: 'body', confirm: _('Are you sure?') } do
......
- if user.note.present? - if user.note.present?
%span.has-tooltip.user-note{ title: user.note } %span.has-tooltip.user-note{ title: user.note }
= sprite_icon('document', size: 16, css_class: 'gl-vertical-align-middle') = sprite_icon('document', css_class: 'gl-vertical-align-middle')
...@@ -7,16 +7,16 @@ ...@@ -7,16 +7,16 @@
%span.gl-ml-2= s_('ClusterIntegration|Kubernetes cluster is being created...') %span.gl-ml-2= s_('ClusterIntegration|Kubernetes cluster is being created...')
.hidden.row.js-cluster-api-unreachable.gl-alert.gl-alert-warning{ role: 'alert' } .hidden.row.js-cluster-api-unreachable.gl-alert.gl-alert-warning{ role: 'alert' }
= sprite_icon('warning', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') = sprite_icon('warning', css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
%button.js-close-banner.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') } %button.js-close-banner.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') }
= sprite_icon('close', size: 16, css_class: 'gl-icon') = sprite_icon('close', css_class: 'gl-icon')
.gl-alert-body .gl-alert-body
= s_('ClusterIntegration|Your cluster API is unreachable. Please ensure your API URL is correct.') = s_('ClusterIntegration|Your cluster API is unreachable. Please ensure your API URL is correct.')
.hidden.js-cluster-authentication-failure.js-cluster-api-unreachable.gl-alert.gl-alert-warning{ role: 'alert' } .hidden.js-cluster-authentication-failure.js-cluster-api-unreachable.gl-alert.gl-alert-warning{ role: 'alert' }
= sprite_icon('warning', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') = sprite_icon('warning', css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
%button.js-close-banner.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') } %button.js-close-banner.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') }
= sprite_icon('close', size: 16, css_class: 'gl-icon') = sprite_icon('close', css_class: 'gl-icon')
.gl-alert-body .gl-alert-body
= s_('ClusterIntegration|There was a problem authenticating with your cluster. Please ensure your CA Certificate and Token are valid.') = s_('ClusterIntegration|There was a problem authenticating with your cluster. Please ensure your CA Certificate and Token are valid.')
......
...@@ -3,10 +3,9 @@ ...@@ -3,10 +3,9 @@
%button.close.js-close{ type: "button" } &times; %button.close.js-close{ type: "button" } &times;
.gcp-signup-offer--content .gcp-signup-offer--content
.gcp-signup-offer--icon.gl-mr-3 .gcp-signup-offer--icon.gl-mr-3
= sprite_icon("information", size: 16) = sprite_icon("information")
.gcp-signup-offer--copy .gcp-signup-offer--copy
%h4= s_('ClusterIntegration|Did you know?') %h4= s_('ClusterIntegration|Did you know?')
%p= s_('ClusterIntegration|Every new Google Cloud Platform (GCP) account receives $300 in credit upon %{sign_up_link}. In partnership with Google, GitLab is able to offer an additional $200 for both new and existing GCP accounts to get started with GitLab\'s Google Kubernetes Engine Integration.').html_safe % { sign_up_link: link } %p= s_('ClusterIntegration|Every new Google Cloud Platform (GCP) account receives $300 in credit upon %{sign_up_link}. In partnership with Google, GitLab is able to offer an additional $200 for both new and existing GCP accounts to get started with GitLab\'s Google Kubernetes Engine Integration.').html_safe % { sign_up_link: link }
%a.btn.btn-default{ href: 'https://cloud.google.com/partners/partnercredit/?pcn_code=0014M00001h35gDQAQ#contact-form', target: '_blank', rel: 'noopener noreferrer' } %a.btn.btn-default{ href: 'https://cloud.google.com/partners/partnercredit/?pcn_code=0014M00001h35gDQAQ#contact-form', target: '_blank', rel: 'noopener noreferrer' }
= s_("ClusterIntegration|Apply for credit") = s_("ClusterIntegration|Apply for credit")
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
= render 'shared/event_filter' = render 'shared/event_filter'
.controls .controls
= link_to dashboard_projects_path(rss_url_options), class: 'btn gl-button btn-default btn-icon d-none d-sm-inline-flex has-tooltip', title: 'Subscribe' do = link_to dashboard_projects_path(rss_url_options), class: 'btn gl-button btn-default btn-icon d-none d-sm-inline-flex has-tooltip', title: 'Subscribe' do
= sprite_icon('rss', css_class: 'qa-rss-icon gl-icon', size: 16) = sprite_icon('rss', css_class: 'qa-rss-icon gl-icon')
.content_list .content_list
.loading .loading
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
- if cookies[:explore_groups_landing_dismissed] != 'true' - if cookies[:explore_groups_landing_dismissed] != 'true'
.explore-groups.landing.content-block.js-explore-groups-landing.hide .explore-groups.landing.content-block.js-explore-groups-landing.hide
%button.dismiss-button{ type: 'button', 'aria-label' => _('Dismiss') }= sprite_icon('close', size: 16) %button.dismiss-button{ type: 'button', 'aria-label' => _('Dismiss') }= sprite_icon('close')
.svg-container .svg-container
= custom_icon('icon_explore_groups_splash') = custom_icon('icon_explore_groups_splash')
.inner-content .inner-content
......
...@@ -2,9 +2,8 @@ ...@@ -2,9 +2,8 @@
= render 'shared/event_filter', show_group_events: @group.supports_events? = render 'shared/event_filter', show_group_events: @group.supports_events?
.controls .controls
= link_to group_path(@group, rss_url_options), class: 'btn gl-button btn-default btn-icon d-none d-sm-inline-flex has-tooltip' , title: 'Subscribe' do = link_to group_path(@group, rss_url_options), class: 'btn gl-button btn-default btn-icon d-none d-sm-inline-flex has-tooltip' , title: 'Subscribe' do
= sprite_icon('rss', css_class: 'qa-rss-icon gl-icon', size: 16) = sprite_icon('rss', css_class: 'qa-rss-icon gl-icon')
.content_list .content_list
.loading .loading
.spinner.spinner-md .spinner.spinner-md
- page_title _("GitLab.com import") - page_title _("GitLab.com import")
- header_title _("Projects"), root_path - header_title _("Projects"), root_path
%h3.page-title %h3.page-title
= sprite_icon('heart', size: 16, css_class: 'gl-vertical-align-middle') = sprite_icon('heart', css_class: 'gl-vertical-align-middle')
= _('Import projects from GitLab.com') = _('Import projects from GitLab.com')
= render 'import/githubish_status', provider: 'gitlab', filterable: false = render 'import/githubish_status', provider: 'gitlab', filterable: false
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
%h3.page-title.d-flex %h3.page-title.d-flex
.gl-display-flex.gl-align-items-center.gl-justify-content-center .gl-display-flex.gl-align-items-center.gl-justify-content-center
= sprite_icon('tanuki', size: 16, css_class: 'gl-mr-2') = sprite_icon('tanuki', css_class: 'gl-mr-2')
= _('Import an exported GitLab project') = _('Import an exported GitLab project')
%hr %hr
......
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
.js-toast-message{ data: { message: value } } .js-toast-message{ data: { message: value } }
- elsif value - elsif value
%div{ class: "flash-#{key} mb-2" } %div{ class: "flash-#{key} mb-2" }
= sprite_icon(icons[key], size: 16, css_class: 'align-middle mr-1') unless icons[key].nil? = sprite_icon(icons[key], css_class: 'align-middle mr-1') unless icons[key].nil?
%span= value %span= value
- if %w(alert notice success).include?(key) - if %w(alert notice success).include?(key)
%div{ class: "close-icon-wrapper js-close-icon" } %div{ class: "close-icon-wrapper js-close-icon" }
= sprite_icon('close', size: 16, css_class: 'close-icon') = sprite_icon('close', css_class: 'close-icon')
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
%a %a
= _('Loading...') = _('Loading...')
= dropdown_loading = dropdown_loading
= sprite_icon('search', size: 16, css_class: 'search-icon') = sprite_icon('search', css_class: 'search-icon')
= sprite_icon('close', size: 16, css_class: 'clear-icon js-clear-input') = sprite_icon('close', css_class: 'clear-icon js-clear-input')
= hidden_field_tag :group_id, search_context.for_group? ? search_context.group.id : '', class: 'js-search-group-options', data: search_context.group_metadata = hidden_field_tag :group_id, search_context.for_group? ? search_context.group.id : '', class: 'js-search-group-options', data: search_context.group_metadata
= hidden_field_tag :project_id, search_context.for_project? ? search_context.project.id : '', id: 'search_project_id', class: 'js-search-project-options', data: search_context.project_metadata = hidden_field_tag :project_id, search_context.for_project? ? search_context.project.id : '', id: 'search_project_id', class: 'js-search-project-options', data: search_context.project_metadata
......
...@@ -32,32 +32,32 @@ ...@@ -32,32 +32,32 @@
= render 'layouts/search' unless current_controller?(:search) = render 'layouts/search' unless current_controller?(:search)
%li.nav-item.d-inline-block.d-lg-none %li.nav-item.d-inline-block.d-lg-none
= link_to search_context.search_url, title: _('Search'), aria: { label: _('Search') }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do = link_to search_context.search_url, title: _('Search'), aria: { label: _('Search') }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
= sprite_icon('search', size: 16) = sprite_icon('search')
- if header_link?(:issues) - if header_link?(:issues)
= nav_link(path: 'dashboard#issues', html_options: { class: "user-counter" }) do = nav_link(path: 'dashboard#issues', html_options: { class: "user-counter" }) do
= link_to assigned_issues_dashboard_path, title: _('Issues'), class: 'dashboard-shortcuts-issues', aria: { label: _('Issues') }, data: { qa_selector: 'issues_shortcut_button', toggle: 'tooltip', placement: 'bottom', container: 'body' } do = link_to assigned_issues_dashboard_path, title: _('Issues'), class: 'dashboard-shortcuts-issues', aria: { label: _('Issues') }, data: { qa_selector: 'issues_shortcut_button', toggle: 'tooltip', placement: 'bottom', container: 'body' } do
= sprite_icon('issues', size: 16) = sprite_icon('issues')
- issues_count = assigned_issuables_count(:issues) - issues_count = assigned_issuables_count(:issues)
%span.badge.badge-pill.issues-count.green-badge{ class: ('hidden' if issues_count == 0) } %span.badge.badge-pill.issues-count.green-badge{ class: ('hidden' if issues_count == 0) }
= number_with_delimiter(issues_count) = number_with_delimiter(issues_count)
- if header_link?(:merge_requests) - if header_link?(:merge_requests)
= nav_link(path: 'dashboard#merge_requests', html_options: { class: "user-counter" }) do = nav_link(path: 'dashboard#merge_requests', html_options: { class: "user-counter" }) do
= link_to assigned_mrs_dashboard_path, title: _('Merge requests'), class: 'dashboard-shortcuts-merge_requests', aria: { label: _('Merge requests') }, data: { qa_selector: 'merge_requests_shortcut_button', toggle: 'tooltip', placement: 'bottom', container: 'body' } do = link_to assigned_mrs_dashboard_path, title: _('Merge requests'), class: 'dashboard-shortcuts-merge_requests', aria: { label: _('Merge requests') }, data: { qa_selector: 'merge_requests_shortcut_button', toggle: 'tooltip', placement: 'bottom', container: 'body' } do
= sprite_icon('git-merge', size: 16) = sprite_icon('git-merge')
- merge_requests_count = assigned_issuables_count(:merge_requests) - merge_requests_count = assigned_issuables_count(:merge_requests)
%span.badge.badge-pill.merge-requests-count{ class: ('hidden' if merge_requests_count == 0) } %span.badge.badge-pill.merge-requests-count{ class: ('hidden' if merge_requests_count == 0) }
= number_with_delimiter(merge_requests_count) = number_with_delimiter(merge_requests_count)
- if header_link?(:todos) - if header_link?(:todos)
= nav_link(controller: 'dashboard/todos', html_options: { class: "user-counter" }) do = nav_link(controller: 'dashboard/todos', html_options: { class: "user-counter" }) do
= link_to dashboard_todos_path, title: _('To-Do List'), aria: { label: _('To-Do List') }, class: 'shortcuts-todos', data: { qa_selector: 'todos_shortcut_button', toggle: 'tooltip', placement: 'bottom', container: 'body' } do = link_to dashboard_todos_path, title: _('To-Do List'), aria: { label: _('To-Do List') }, class: 'shortcuts-todos', data: { qa_selector: 'todos_shortcut_button', toggle: 'tooltip', placement: 'bottom', container: 'body' } do
= sprite_icon('todo-done', size: 16) = sprite_icon('todo-done')
%span.badge.badge-pill.todos-count{ class: ('hidden' if todos_pending_count == 0) } %span.badge.badge-pill.todos-count{ class: ('hidden' if todos_pending_count == 0) }
= todos_count_format(todos_pending_count) = todos_count_format(todos_pending_count)
%li.nav-item.header-help.dropdown.d-none.d-md-block %li.nav-item.header-help.dropdown.d-none.d-md-block
= link_to help_path, class: 'header-help-dropdown-toggle', data: { toggle: "dropdown" } do = link_to help_path, class: 'header-help-dropdown-toggle', data: { toggle: "dropdown" } do
%span.gl-sr-only %span.gl-sr-only
= s_('Nav|Help') = s_('Nav|Help')
= sprite_icon('question', size: 16) = sprite_icon('question')
= sprite_icon('angle-down', css_class: 'caret-down') = sprite_icon('angle-down', css_class: 'caret-down')
.dropdown-menu.dropdown-menu-right .dropdown-menu.dropdown-menu-right
= render 'layouts/header/help_dropdown' = render 'layouts/header/help_dropdown'
......
%li.header-new.dropdown{ data: { track_label: "new_dropdown", track_event: "click_dropdown", track_value: "" } } %li.header-new.dropdown{ data: { track_label: "new_dropdown", track_event: "click_dropdown", track_value: "" } }
= link_to new_project_path, class: "header-new-dropdown-toggle has-tooltip qa-new-menu-toggle", id: "js-onboarding-new-project-link", title: _("New..."), ref: 'tooltip', aria: { label: _("New...") }, data: { toggle: 'dropdown', placement: 'bottom', container: 'body', display: 'static' } do = link_to new_project_path, class: "header-new-dropdown-toggle has-tooltip qa-new-menu-toggle", id: "js-onboarding-new-project-link", title: _("New..."), ref: 'tooltip', aria: { label: _("New...") }, data: { toggle: 'dropdown', placement: 'bottom', container: 'body', display: 'static' } do
= sprite_icon('plus-square', size: 16) = sprite_icon('plus-square')
= sprite_icon('angle-down', css_class: 'caret-down') = sprite_icon('angle-down', css_class: 'caret-down')
.dropdown-menu.dropdown-menu-right .dropdown-menu.dropdown-menu-right
%ul %ul
......
%li.key-list-item %li.key-list-item
.float-left.gl-mr-3 .float-left.gl-mr-3
= sprite_icon('key', size: 16, css_class: "settings-list-icon d-none d-sm-block gl-mt-4") = sprite_icon('key', css_class: "settings-list-icon d-none d-sm-block gl-mt-4")
.key-list-item-info .key-list-item-info
- key.emails_with_verified_status.map do |email, verified| - key.emails_with_verified_status.map do |email, verified|
= render partial: 'shared/email_with_badge', locals: { email: email, verified: verified } = render partial: 'shared/email_with_badge', locals: { email: email, verified: verified }
......
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
- if key.valid? - if key.valid?
- if key.expired? - if key.expired?
%span.d-inline-block.has-tooltip{ title: s_('Profiles|Your key has expired') } %span.d-inline-block.has-tooltip{ title: s_('Profiles|Your key has expired') }
= sprite_icon('warning-solid', size: 16, css_class: 'settings-list-icon d-none d-sm-block') = sprite_icon('warning-solid', css_class: 'settings-list-icon d-none d-sm-block')
- else - else
= sprite_icon('key', size: 16, css_class: 'settings-list-icon d-none d-sm-block ') = sprite_icon('key', css_class: 'settings-list-icon d-none d-sm-block ')
- else - else
%span.d-inline-block.has-tooltip{ title: key.errors.full_messages.join(', ') } %span.d-inline-block.has-tooltip{ title: key.errors.full_messages.join(', ') }
= sprite_icon('warning-solid', size: 16, css_class: 'settings-list-icon d-none d-sm-block') = sprite_icon('warning-solid', css_class: 'settings-list-icon d-none d-sm-block')
.key-list-item-info.w-100.float-none .key-list-item-info.w-100.float-none
= link_to path_to_key(key, is_admin), class: "title" do = link_to path_to_key(key, is_admin), class: "title" do
...@@ -28,4 +28,4 @@ ...@@ -28,4 +28,4 @@
- if key.can_delete? - if key.can_delete?
= link_to path_to_key(key, is_admin), data: { confirm: _('Are you sure?')}, method: :delete, class: "btn btn-transparent gl-ml-3 align-baseline" do = link_to path_to_key(key, is_admin), data: { confirm: _('Are you sure?')}, method: :delete, class: "btn btn-transparent gl-ml-3 align-baseline" do
%span.sr-only= _('Remove') %span.sr-only= _('Remove')
= sprite_icon('remove', size: 16) = sprite_icon('remove')
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
= render 'shared/event_filter' = render 'shared/event_filter'
.controls.gl-display-flex .controls.gl-display-flex
= link_to project_path(@project, rss_url_options), title: s_("ProjectActivityRSS|Subscribe"), class: 'btn gl-button btn-default btn-icon d-none d-sm-inline-flex has-tooltip' do = link_to project_path(@project, rss_url_options), title: s_("ProjectActivityRSS|Subscribe"), class: 'btn gl-button btn-default btn-icon d-none d-sm-inline-flex has-tooltip' do
= sprite_icon('rss', css_class: 'qa-rss-icon gl-icon', size: 16) = sprite_icon('rss', css_class: 'qa-rss-icon gl-icon')
- if is_project_overview && can?(current_user, :download_code, @project) - if is_project_overview && can?(current_user, :download_code, @project)
.project-clone-holder.d-none.d-md-inline-flex.gl-ml-2 .project-clone-holder.d-none.d-md-inline-flex.gl-ml-2
= render "projects/buttons/clone", dropdown_class: 'dropdown-menu-right' = render "projects/buttons/clone", dropdown_class: 'dropdown-menu-right'
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
= render 'shared/members/access_request_links', source: @project = render 'shared/members/access_request_links', source: @project
- if @project.tag_list.present? - if @project.tag_list.present?
%span.home-panel-topic-list.mt-2.w-100.d-inline-flex %span.home-panel-topic-list.mt-2.w-100.d-inline-flex
= sprite_icon('tag', size: 16, css_class: 'icon gl-mr-2') = sprite_icon('tag', css_class: 'icon gl-mr-2')
- @project.topics_to_show.each do |topic| - @project.topics_to_show.each do |topic|
- project_topics_classes = "badge badge-pill badge-secondary gl-mr-2" - project_topics_classes = "badge badge-pill badge-secondary gl-mr-2"
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
- if git_import_enabled? - if git_import_enabled?
%div %div
%button.btn.btn-svg.js-toggle-button.js-import-git-toggle-button{ type: "button", data: { toggle_open_class: 'active' }, **tracking_attrs(track_label, 'click_button', 'repo_url') } %button.btn.btn-svg.js-toggle-button.js-import-git-toggle-button{ type: "button", data: { toggle_open_class: 'active' }, **tracking_attrs(track_label, 'click_button', 'repo_url') }
= sprite_icon('link', size: 16, css_class: 'gl-icon') = sprite_icon('link', css_class: 'gl-icon')
= _('Repo by URL') = _('Repo by URL')
- if manifest_import_enabled? - if manifest_import_enabled?
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
.modal-header .modal-header
%h3.page-title= _('Reduce this project’s visibility?') %h3.page-title= _('Reduce this project’s visibility?')
%button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') } %button.close{ type: "button", "data-dismiss": "modal", "aria-label" => _('Close') }
%span{ "aria-hidden": true }= sprite_icon("close", size: 16) %span{ "aria-hidden": true }= sprite_icon("close")
.modal-body .modal-body
%p %p
- if @project.group - if @project.group
......
= sprite_icon('history', size: 16, css_class: 'gl-mr-1 gl-vertical-align-text-bottom') = sprite_icon('history', css_class: 'gl-mr-1 gl-vertical-align-text-bottom')
= succeed '.' do = succeed '.' do
To find the state of this project's repository at the time of any of these versions, check out To find the state of this project's repository at the time of any of these versions, check out
= link_to "the tags", project_tags_path(viewer.project) = link_to "the tags", project_tags_path(viewer.project)
- license = viewer.license - license = viewer.license
= sprite_icon('scale', size: 16) = sprite_icon('scale')
This project is licensed under the This project is licensed under the
= succeed '.' do = succeed '.' do
%strong= license.name %strong= license.name
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
= search_field_tag :search, params[:search], { placeholder: _('Search by message'), id: 'commits-search', class: 'form-control search-text-input input-short gl-mt-3 gl-sm-mt-0 gl-min-w-full', spellcheck: false } = search_field_tag :search, params[:search], { placeholder: _('Search by message'), id: 'commits-search', class: 'form-control search-text-input input-short gl-mt-3 gl-sm-mt-0 gl-min-w-full', spellcheck: false }
.control.d-none.d-md-block .control.d-none.d-md-block
= link_to project_commits_path(@project, @ref, rss_url_options), title: _("Commits feed"), class: 'btn btn-svg' do = link_to project_commits_path(@project, @ref, rss_url_options), title: _("Commits feed"), class: 'btn btn-svg' do
= sprite_icon('rss', css_class: 'qa-rss-icon', size: 16) = sprite_icon('rss', css_class: 'qa-rss-icon')
= render_if_exists 'projects/commits/mirror_status' = render_if_exists 'projects/commits/mirror_status'
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
= hidden_field_tag :to, params[:to] = hidden_field_tag :to, params[:to]
= button_tag type: 'button', title: params[:to], class: "btn form-control compare-dropdown-toggle js-compare-dropdown has-tooltip", required: true, data: { refs_url: refs_project_path(@project), toggle: "dropdown", target: ".js-compare-to-dropdown", selected: params[:to], field_name: :to } do = button_tag type: 'button', title: params[:to], class: "btn form-control compare-dropdown-toggle js-compare-dropdown has-tooltip", required: true, data: { refs_url: refs_project_path(@project), toggle: "dropdown", target: ".js-compare-to-dropdown", selected: params[:to], field_name: :to } do
.dropdown-toggle-text.str-truncated.monospace.float-left= params[:to] || _("Select branch/tag") .dropdown-toggle-text.str-truncated.monospace.float-left= params[:to] || _("Select branch/tag")
= sprite_icon('chevron-down', size: 16, css_class: 'float-right') = sprite_icon('chevron-down', css_class: 'float-right')
= render 'shared/ref_dropdown' = render 'shared/ref_dropdown'
.compare-ellipsis.inline ... .compare-ellipsis.inline ...
.form-group.dropdown.compare-form-group.from.js-compare-from-dropdown .form-group.dropdown.compare-form-group.from.js-compare-from-dropdown
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
= hidden_field_tag :from, params[:from] = hidden_field_tag :from, params[:from]
= button_tag type: 'button', title: params[:from], class: "btn form-control compare-dropdown-toggle js-compare-dropdown has-tooltip", required: true, data: { refs_url: refs_project_path(@project), toggle: "dropdown", target: ".js-compare-from-dropdown", selected: params[:from], field_name: :from } do = button_tag type: 'button', title: params[:from], class: "btn form-control compare-dropdown-toggle js-compare-dropdown has-tooltip", required: true, data: { refs_url: refs_project_path(@project), toggle: "dropdown", target: ".js-compare-from-dropdown", selected: params[:from], field_name: :from } do
.dropdown-toggle-text.str-truncated.monospace.float-left= params[:from] || _("Select branch/tag") .dropdown-toggle-text.str-truncated.monospace.float-left= params[:from] || _("Select branch/tag")
= sprite_icon('chevron-down', size: 16, css_class: 'float-right') = sprite_icon('chevron-down', css_class: 'float-right')
= render 'shared/ref_dropdown' = render 'shared/ref_dropdown'
&nbsp; &nbsp;
= button_tag s_("CompareBranches|Compare"), class: "btn btn-success commits-compare-btn" = button_tag s_("CompareBranches|Compare"), class: "btn btn-success commits-compare-btn"
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
.file-actions.d-none.d-sm-block .file-actions.d-none.d-sm-block
- if blob&.readable_text? - if blob&.readable_text?
= link_to '#', class: 'js-toggle-diff-comments btn active has-tooltip', title: _("Toggle comments for this file"), disabled: @diff_notes_disabled do = link_to '#', class: 'js-toggle-diff-comments btn active has-tooltip', title: _("Toggle comments for this file"), disabled: @diff_notes_disabled do
= sprite_icon('comment', size: 16) = sprite_icon('comment')
\ \
- if editable_diff?(diff_file) - if editable_diff?(diff_file)
- link_opts = @merge_request.persisted? ? { from_merge_request_iid: @merge_request.iid } : {} - link_opts = @merge_request.persisted? ? { from_merge_request_iid: @merge_request.iid } : {}
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
- diff_files.each do |diff_file| - diff_files.each do |diff_file|
%li %li
%a.diff-changed-file{ href: "##{hexdigest(diff_file.file_path)}", title: diff_file.new_path } %a.diff-changed-file{ href: "##{hexdigest(diff_file.file_path)}", title: diff_file.new_path }
= sprite_icon(diff_file_changed_icon(diff_file), size: 16, css_class: "#{diff_file_changed_icon_color(diff_file)} diff-file-changed-icon gl-mr-3") = sprite_icon(diff_file_changed_icon(diff_file), css_class: "#{diff_file_changed_icon_color(diff_file)} diff-file-changed-icon gl-mr-3")
%span.diff-changed-file-content.gl-mr-3 %span.diff-changed-file-content.gl-mr-3
- if diff_file.file_path - if diff_file.file_path
%strong.diff-changed-file-name %strong.diff-changed-file-name
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- if @forked_project && !@forked_project.saved? - if @forked_project && !@forked_project.saved?
.alert.alert-danger.alert-block .alert.alert-danger.alert-block
%h4 %h4
= sprite_icon('fork', size: 16) = sprite_icon('fork')
= _("Fork Error!") = _("Fork Error!")
%p %p
= _("You tried to fork %{link_to_the_project} but it failed for the following reason:").html_safe % { link_to_the_project: link_to_project(@project) } = _("You tried to fork %{link_to_the_project} but it failed for the following reason:").html_safe % { link_to_the_project: link_to_project(@project) }
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
- service_desk_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: service_desk_link_url } - service_desk_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: service_desk_link_url }
.hide.gl-alert.gl-alert-warning.js-alert-moved-from-service-desk-warning.gl-mt-5{ role: 'alert' } .hide.gl-alert.gl-alert-warning.js-alert-moved-from-service-desk-warning.gl-mt-5{ role: 'alert' }
= sprite_icon('warning', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') = sprite_icon('warning', css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
%button.js-close.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') } %button.js-close.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') }
= sprite_icon('close', size: 16, css_class: 'gl-icon') = sprite_icon('close', css_class: 'gl-icon')
.gl-alert-body.gl-mr-3 .gl-alert-body.gl-mr-3
= s_('This project does not have %{service_desk_link_start}Service Desk%{service_desk_link_end} enabled, so the user who created the issue will no longer receive email notifications about new activity.').html_safe % { service_desk_link_start: service_desk_link_start, service_desk_link_end: '</a>'.html_safe } = s_('This project does not have %{service_desk_link_start}Service Desk%{service_desk_link_end} enabled, so the user who created the issue will no longer receive email notifications about new activity.').html_safe % { service_desk_link_start: service_desk_link_start, service_desk_link_end: '</a>'.html_safe }
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
%span.issuable-milestone.d-none.d-sm-inline-block %span.issuable-milestone.d-none.d-sm-inline-block
&nbsp; &nbsp;
= link_to project_issues_path(issue.project, milestone_title: issue.milestone.title), data: { html: 'true', toggle: 'tooltip', title: milestone_tooltip_due_date(issue.milestone) } do = link_to project_issues_path(issue.project, milestone_title: issue.milestone.title), data: { html: 'true', toggle: 'tooltip', title: milestone_tooltip_due_date(issue.milestone) } do
= sprite_icon('clock', size: 16, css_class: 'gl-vertical-align-text-bottom') = sprite_icon('clock', css_class: 'gl-vertical-align-text-bottom')
= issue.milestone.title = issue.milestone.title
- if issue.due_date - if issue.due_date
%span.issuable-due-date.d-none.d-sm-inline-block.has-tooltip{ class: "#{'cred' if issue.overdue?}", title: _('Due date') } %span.issuable-due-date.d-none.d-sm-inline-block.has-tooltip{ class: "#{'cred' if issue.overdue?}", title: _('Due date') }
......
...@@ -3,5 +3,5 @@ ...@@ -3,5 +3,5 @@
- if issue.time_estimate > 0 - if issue.time_estimate > 0
%span.issuable-estimate.d-none.d-sm-inline-block.has-tooltip{ data: { container: 'body', qa_selector: 'issuable_estimate' }, title: _('Estimate') } %span.issuable-estimate.d-none.d-sm-inline-block.has-tooltip{ data: { container: 'body', qa_selector: 'issuable_estimate' }, title: _('Estimate') }
&nbsp; &nbsp;
= sprite_icon('timer', size: 16, css_class: 'issue-estimate-icon') = sprite_icon('timer', css_class: 'issue-estimate-icon')
= Gitlab::TimeTrackingFormatter.output(issue.time_estimate) = Gitlab::TimeTrackingFormatter.output(issue.time_estimate)
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
.svg-content.import-export-svg-container .svg-content.import-export-svg-container
= image_tag 'illustrations/export-import.svg', alt: _('Import/Export illustration'), class: 'illustration' = image_tag 'illustrations/export-import.svg', alt: _('Import/Export illustration'), class: 'illustration'
%a.close{ href: '#', 'data-dismiss' => 'modal' } %a.close{ href: '#', 'data-dismiss' => 'modal' }
= sprite_icon('close', size: 16, css_class: 'gl-icon') = sprite_icon('close', css_class: 'gl-icon')
.modal-body .modal-body
.modal-subheader .modal-subheader
= icon('check', { class: 'checkmark' }) = icon('check', { class: 'checkmark' })
......
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
.detail-page-header .detail-page-header
.detail-page-header-body .detail-page-header-body
.issuable-status-box.status-box.status-box-issue-closed{ class: issue_status_visibility(@issue, status_box: :closed) } .issuable-status-box.status-box.status-box-issue-closed{ class: issue_status_visibility(@issue, status_box: :closed) }
= sprite_icon('mobile-issue-close', size: 16, css_class: 'd-block d-sm-none') = sprite_icon('mobile-issue-close', css_class: 'd-block d-sm-none')
.d-none.d-sm-block .d-none.d-sm-block
= issue_closed_text(@issue, current_user) = issue_closed_text(@issue, current_user)
.issuable-status-box.status-box.status-box-open{ class: issue_status_visibility(@issue, status_box: :open) } .issuable-status-box.status-box.status-box-open{ class: issue_status_visibility(@issue, status_box: :open) }
= sprite_icon('issue-open-m', size: 16, css_class: 'd-block d-sm-none') = sprite_icon('issue-open-m', css_class: 'd-block d-sm-none')
%span.d-none.d-sm-block Open %span.d-none.d-sm-block Open
.issuable-meta .issuable-meta
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
- final_text = n_("%d approver", "%d approvers", total) % total - final_text = n_("%d approver", "%d approvers", total) % total
- final_self_text = n_("%d approver (you've approved)", "%d approvers (you've approved)", total) % total - final_self_text = n_("%d approver (you've approved)", "%d approvers (you've approved)", total) % total
- approval_icon = sprite_icon((self_approved ? 'approval-solid' : 'approval'), size: 16, css_class: 'align-middle') - approval_icon = sprite_icon((self_approved ? 'approval-solid' : 'approval'), css_class: 'align-middle')
%li.d-none.d-sm-inline-block.has-tooltip.text-success{ title: self_approved ? final_self_text : final_text } %li.d-none.d-sm-inline-block.has-tooltip.text-success{ title: self_approved ? final_self_text : final_text }
= approval_icon = approval_icon
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
%span.issuable-milestone.d-none.d-sm-inline-block %span.issuable-milestone.d-none.d-sm-inline-block
&nbsp; &nbsp;
= link_to project_merge_requests_path(merge_request.project, milestone_title: merge_request.milestone.title), data: { html: 'true', toggle: 'tooltip', title: milestone_tooltip_due_date(merge_request.milestone) } do = link_to project_merge_requests_path(merge_request.project, milestone_title: merge_request.milestone.title), data: { html: 'true', toggle: 'tooltip', title: milestone_tooltip_due_date(merge_request.milestone) } do
= sprite_icon('clock', size: 16, css_class: 'gl-vertical-align-text-bottom') = sprite_icon('clock', css_class: 'gl-vertical-align-text-bottom')
= merge_request.milestone.title = merge_request.milestone.title
- if merge_request.target_project.default_branch != merge_request.target_branch - if merge_request.target_project.default_branch != merge_request.target_branch
%span.project-ref-path.has-tooltip{ title: _('Target branch') } %span.project-ref-path.has-tooltip{ title: _('Target branch') }
...@@ -45,13 +45,13 @@ ...@@ -45,13 +45,13 @@
= _('MERGED') = _('MERGED')
- elsif merge_request.closed? - elsif merge_request.closed?
%li.issuable-status.d-none.d-sm-inline-block %li.issuable-status.d-none.d-sm-inline-block
= sprite_icon('cancel', size: 16, css_class: 'gl-vertical-align-text-bottom') = sprite_icon('cancel', css_class: 'gl-vertical-align-text-bottom')
= _('CLOSED') = _('CLOSED')
= render 'shared/merge_request_pipeline_status', merge_request: merge_request = render 'shared/merge_request_pipeline_status', merge_request: merge_request
- if merge_request.open? && merge_request.broken? - if merge_request.open? && merge_request.broken?
%li.issuable-pipeline-broken.d-none.d-sm-flex %li.issuable-pipeline-broken.d-none.d-sm-flex
= link_to merge_request_path(merge_request), class: "has-tooltip", title: _('Cannot be merged automatically') do = link_to merge_request_path(merge_request), class: "has-tooltip", title: _('Cannot be merged automatically') do
= sprite_icon('warning-solid', size: 16) = sprite_icon('warning-solid')
- if merge_request.assignees.any? - if merge_request.assignees.any?
%li.d-flex %li.d-flex
= render 'shared/issuable/assignees', project: merge_request.project, issuable: merge_request = render 'shared/issuable/assignees', project: merge_request.project, issuable: merge_request
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
.detail-page-header{ class: ("border-bottom-0 pt-0 pb-0" if mr_tabs_position_enabled?) } .detail-page-header{ class: ("border-bottom-0 pt-0 pb-0" if mr_tabs_position_enabled?) }
.detail-page-header-body .detail-page-header-body
.issuable-status-box.status-box{ class: status_box_class(@merge_request) } .issuable-status-box.status-box{ class: status_box_class(@merge_request) }
= sprite_icon(state_icon_name, size: 16, css_class: 'd-block d-sm-none') = sprite_icon(state_icon_name, css_class: 'd-block d-sm-none')
%span.d-none.d-sm-block %span.d-none.d-sm-block
= state_human_name = state_human_name
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
= f.submit _('Mirror repository'), class: 'btn btn-success js-mirror-submit qa-mirror-repository-button', name: :update_remote_mirror = f.submit _('Mirror repository'), class: 'btn btn-success js-mirror-submit qa-mirror-repository-button', name: :update_remote_mirror
- else - else
.gl-alert.gl-alert-info{ role: 'alert' } .gl-alert.gl-alert-info{ role: 'alert' }
= sprite_icon('information-o', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') = sprite_icon('information-o', css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
.gl-alert-body .gl-alert-body
= _('Mirror settings are only available to GitLab administrators.') = _('Mirror settings are only available to GitLab administrators.')
...@@ -75,4 +75,3 @@ ...@@ -75,4 +75,3 @@
= clipboard_button(text: mirror.ssh_public_key, class: 'btn btn-default', title: _('Copy SSH public key'), qa_selector: 'copy_public_key_button') = clipboard_button(text: mirror.ssh_public_key, class: 'btn btn-default', title: _('Copy SSH public key'), qa_selector: 'copy_public_key_button')
= render 'shared/remote_mirror_update_button', remote_mirror: mirror = render 'shared/remote_mirror_update_button', remote_mirror: mirror
%button.js-delete-mirror.qa-delete-mirror.rspec-delete-mirror.btn.btn-danger{ type: 'button', data: { mirror_id: mirror.id, toggle: 'tooltip', container: 'body' }, title: _('Remove') }= icon('trash-o') %button.js-delete-mirror.qa-delete-mirror.rspec-delete-mirror.btn.btn-danger{ type: 'button', data: { mirror_id: mirror.id, toggle: 'tooltip', container: 'body' }, title: _('Remove') }= icon('trash-o')
- access = note_max_access_for_user(note) - access = note_max_access_for_user(note)
- if note.has_special_role?(Note::SpecialRole::FIRST_TIME_CONTRIBUTOR) - if note.has_special_role?(Note::SpecialRole::FIRST_TIME_CONTRIBUTOR)
%span.note-role.note-role-special.has-tooltip{ title: _("This is the author's first Merge Request to this project.") } %span.note-role.note-role-special.has-tooltip{ title: _("This is the author's first Merge Request to this project.") }
= sprite_icon('first-contribution', size: 16, css_class: 'gl-icon gl-vertical-align-top') = sprite_icon('first-contribution', css_class: 'gl-icon gl-vertical-align-top')
- if access.nonzero? - if access.nonzero?
%span.note-role.user-access-role= Gitlab::Access.human_access(access) %span.note-role.user-access-role= Gitlab::Access.human_access(access)
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
- if verification_enabled - if verification_enabled
- tooltip, status = domain.unverified? ? [s_('GitLabPages|Unverified'), 'failed'] : [s_('GitLabPages|Verified'), 'success'] - tooltip, status = domain.unverified? ? [s_('GitLabPages|Unverified'), 'failed'] : [s_('GitLabPages|Verified'), 'success']
.domain-status.ci-status-icon.has-tooltip{ class: "ci-status-icon-#{status}", title: tooltip } .domain-status.ci-status-icon.has-tooltip{ class: "ci-status-icon-#{status}", title: tooltip }
= sprite_icon("status_#{status}", size: 16 ) = sprite_icon("status_#{status}" )
.domain-name .domain-name
= external_link(domain.url, domain.url) = external_link(domain.url, domain.url)
- if domain.certificate - if domain.certificate
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
= s_('PipelineSchedules|Take ownership') = s_('PipelineSchedules|Take ownership')
- if can?(current_user, :update_pipeline_schedule, pipeline_schedule) - if can?(current_user, :update_pipeline_schedule, pipeline_schedule)
= link_to edit_pipeline_schedule_path(pipeline_schedule), title: _('Edit'), class: 'btn gl-display-flex' do = link_to edit_pipeline_schedule_path(pipeline_schedule), title: _('Edit'), class: 'btn gl-display-flex' do
= sprite_icon('pencil', size: 16) = sprite_icon('pencil')
- if can?(current_user, :admin_pipeline_schedule, pipeline_schedule) - if can?(current_user, :admin_pipeline_schedule, pipeline_schedule)
= link_to pipeline_schedule_path(pipeline_schedule), title: _('Delete'), method: :delete, class: 'btn btn-remove', data: { confirm: _("Are you sure you want to delete this pipeline schedule?") } do = link_to pipeline_schedule_path(pipeline_schedule), title: _('Delete'), method: :delete, class: 'btn btn-remove', data: { confirm: _("Are you sure you want to delete this pipeline schedule?") } do
= icon('trash') = icon('trash')
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
.info-well .info-well
.well-segment.pipeline-info .well-segment.pipeline-info
.icon-container.gl-vertical-align-text-bottom .icon-container.gl-vertical-align-text-bottom
= sprite_icon('clock', size: 16) = sprite_icon('clock')
= pluralize @pipeline.total_size, "job" = pluralize @pipeline.total_size, "job"
= @pipeline.ref_text = @pipeline.ref_text
- if @pipeline.duration - if @pipeline.duration
......
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
- if runner.locked? - if runner.locked?
%span.has-tooltip{ title: _('Locked to current projects') } %span.has-tooltip{ title: _('Locked to current projects') }
= sprite_icon('lock', size: 16) = sprite_icon('lock')
%small.edit-runner %small.edit-runner
= link_to edit_project_runner_path(@project, runner), class: 'btn btn-edit' do = link_to edit_project_runner_path(@project, runner), class: 'btn btn-edit' do
= sprite_icon('pencil', size: 16) = sprite_icon('pencil')
- else - else
%span.commit-sha %span.commit-sha
= runner.short_sha = runner.short_sha
......
.row .row
.col-lg-12 .col-lg-12
.gl-alert.gl-alert-info{ role: 'alert' } .gl-alert.gl-alert-info{ role: 'alert' }
= sprite_icon('information-o', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') = sprite_icon('information-o', css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
.gl-alert-body .gl-alert-body
= _('You can now manage alert endpoint configuration in the Alerts section on the Operations settings page. Fields on this page have been deprecated.') = _('You can now manage alert endpoint configuration in the Alerts section on the Operations settings page. Fields on this page have been deprecated.')
.gl-alert-actions .gl-alert-actions
......
...@@ -7,13 +7,13 @@ ...@@ -7,13 +7,13 @@
1. 1.
= link_to 'https://docs.mattermost.com/developer/slash-commands.html#enabling-custom-commands', target: '_blank', rel: 'noopener noreferrer nofollow' do = link_to 'https://docs.mattermost.com/developer/slash-commands.html#enabling-custom-commands', target: '_blank', rel: 'noopener noreferrer nofollow' do
Enable custom slash commands Enable custom slash commands
= sprite_icon('external-link', size: 16) = sprite_icon('external-link')
on your Mattermost installation on your Mattermost installation
%li %li
2. 2.
= link_to 'https://docs.mattermost.com/developer/slash-commands.html#set-up-a-custom-command', target: '_blank', rel: 'noopener noreferrer nofollow' do = link_to 'https://docs.mattermost.com/developer/slash-commands.html#set-up-a-custom-command', target: '_blank', rel: 'noopener noreferrer nofollow' do
Add a slash command Add a slash command
= sprite_icon('external-link', size: 16) = sprite_icon('external-link')
in your Mattermost team with these options: in your Mattermost team with these options:
%hr %hr
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
= s_("MattermostService|This service allows users to perform common operations on this project by entering slash commands in Mattermost.") = s_("MattermostService|This service allows users to perform common operations on this project by entering slash commands in Mattermost.")
= link_to help_page_path('user/project/integrations/mattermost_slash_commands.md'), target: '_blank' do = link_to help_page_path('user/project/integrations/mattermost_slash_commands.md'), target: '_blank' do
= _("View documentation") = _("View documentation")
= sprite_icon('external-link', size: 16) = sprite_icon('external-link')
%p.inline %p.inline
= s_("MattermostService|See list of available commands in Mattermost after setting up this service, by entering") = s_("MattermostService|See list of available commands in Mattermost after setting up this service, by entering")
%kbd.inline /&lt;trigger&gt; help %kbd.inline /&lt;trigger&gt; help
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.row .row
.col-lg-12 .col-lg-12
.gl-alert.gl-alert-info{ role: 'alert' } .gl-alert.gl-alert-info{ role: 'alert' }
= sprite_icon('information-o', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') = sprite_icon('information-o', css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
.gl-alert-body .gl-alert-body
= s_('AlertSettings|You can now set up alert endpoints for manually configured Prometheus instances in the Alerts section on the Operations settings page. Alert endpoint fields on this page have been deprecated.') = s_('AlertSettings|You can now set up alert endpoints for manually configured Prometheus instances in the Alerts section on the Operations settings page. Alert endpoint fields on this page have been deprecated.')
.gl-alert-actions .gl-alert-actions
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
= s_("SlackService|This service allows users to perform common operations on this project by entering slash commands in Slack.") = s_("SlackService|This service allows users to perform common operations on this project by entering slash commands in Slack.")
= link_to help_page_path('user/project/integrations/slack_slash_commands.md'), target: '_blank' do = link_to help_page_path('user/project/integrations/slack_slash_commands.md'), target: '_blank' do
= _("View documentation") = _("View documentation")
= sprite_icon('external-link', size: 16) = sprite_icon('external-link')
%p.inline %p.inline
= s_("SlackService|See list of available commands in Slack after setting up this service, by entering") = s_("SlackService|See list of available commands in Slack after setting up this service, by entering")
%kbd.inline /&lt;command&gt; help %kbd.inline /&lt;command&gt; help
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
1. 1.
= link_to 'https://my.slack.com/services/new/slash-commands', target: '_blank', rel: 'noreferrer noopener nofollow' do = link_to 'https://my.slack.com/services/new/slash-commands', target: '_blank', rel: 'noreferrer noopener nofollow' do
Add a slash command Add a slash command
= sprite_icon('external-link', size: 16) = sprite_icon('external-link')
in your Slack team with these options: in your Slack team with these options:
%hr %hr
......
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
- if show_webhooks_moved_alert? - if show_webhooks_moved_alert?
.gl-alert.gl-alert-info.js-webhooks-moved-alert.gl-mt-3{ role: 'alert', data: { feature_id: UserCalloutsHelper::WEBHOOKS_MOVED, dismiss_endpoint: user_callouts_path } } .gl-alert.gl-alert-info.js-webhooks-moved-alert.gl-mt-3{ role: 'alert', data: { feature_id: UserCalloutsHelper::WEBHOOKS_MOVED, dismiss_endpoint: user_callouts_path } }
= sprite_icon('information-o', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') = sprite_icon('information-o', css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
%button.js-close.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') } %button.js-close.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') }
= sprite_icon('close', size: 16, css_class: 'gl-icon') = sprite_icon('close', css_class: 'gl-icon')
.gl-alert-body .gl-alert-body
= _('Webhooks have moved. They can now be found under the Settings menu.') = _('Webhooks have moved. They can now be found under the Settings menu.')
.gl-alert-actions .gl-alert-actions
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
= link_to new_project_tag_path(@project), class: 'btn btn-success new-tag-btn', data: { qa_selector: "new_tag_button" } do = link_to new_project_tag_path(@project), class: 'btn btn-success new-tag-btn', data: { qa_selector: "new_tag_button" } do
= s_('TagsPage|New tag') = s_('TagsPage|New tag')
= link_to project_tags_path(@project, rss_url_options), title: _("Tags feed"), class: 'btn btn-svg d-none d-sm-inline-block has-tooltip' do = link_to project_tags_path(@project, rss_url_options), title: _("Tags feed"), class: 'btn btn-svg d-none d-sm-inline-block has-tooltip' do
= sprite_icon('rss', css_class: 'qa-rss-icon', size: 16) = sprite_icon('rss', css_class: 'qa-rss-icon')
= render_if_exists 'projects/commits/mirror_status' = render_if_exists 'projects/commits/mirror_status'
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
= search_field_tag :search, params[:search], placeholder: _("Search for projects, issues, etc."), class: "form-control search-text-input js-search-input", id: "dashboard_search", autofocus: true, spellcheck: false = search_field_tag :search, params[:search], placeholder: _("Search for projects, issues, etc."), class: "form-control search-text-input js-search-input", id: "dashboard_search", autofocus: true, spellcheck: false
= icon("search", class: "search-icon") = icon("search", class: "search-icon")
%button.search-clear.js-search-clear{ class: ("hidden" if !params[:search].present?), type: "button", tabindex: "-1" } %button.search-clear.js-search-clear{ class: ("hidden" if !params[:search].present?), type: "button", tabindex: "-1" }
= sprite_icon('clear', size: 16) = sprite_icon('clear')
%span.sr-only %span.sr-only
= _("Clear search") = _("Clear search")
- unless params[:snippets].eql? 'true' - unless params[:snippets].eql? 'true'
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.search-result-row .search-result-row
%h5.note-search-caption.str-truncated %h5.note-search-caption.str-truncated
= sprite_icon('comment', size: 16, css_class: 'gl-vertical-align-text-bottom') = sprite_icon('comment', css_class: 'gl-vertical-align-text-bottom')
= link_to_member(project, note.author, avatar: false) = link_to_member(project, note.author, avatar: false)
- link_to_project = link_to(project.full_name, project) - link_to_project = link_to(project.full_name, project)
= _("commented on %{link_to_project}").html_safe % { link_to_project: link_to_project } = _("commented on %{link_to_project}").html_safe % { link_to_project: link_to_project }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
%div{ class: "broadcast-message #{'alert-warning' if is_banner} broadcast-#{message.broadcast_type}-message #{opts[:preview] && 'preview'} js-broadcast-notification-#{message.id} gl-display-flex", %div{ class: "broadcast-message #{'alert-warning' if is_banner} broadcast-#{message.broadcast_type}-message #{opts[:preview] && 'preview'} js-broadcast-notification-#{message.id} gl-display-flex",
style: broadcast_message_style(message), dir: 'auto' } style: broadcast_message_style(message), dir: 'auto' }
.flex-grow-1.text-right.pr-2 .flex-grow-1.text-right.pr-2
= sprite_icon('bullhorn', size: 16, css_class: 'vertical-align-text-top') = sprite_icon('bullhorn', css_class: 'vertical-align-text-top')
%div{ class: !fluid_layout && 'container-limited' } %div{ class: !fluid_layout && 'container-limited' }
= render_broadcast_message(message) = render_broadcast_message(message)
.flex-grow-1.text-right{ style: 'flex-basis: 0' } .flex-grow-1.text-right{ style: 'flex-basis: 0' }
......
.gl-alert.gl-alert-warning.js-recovery-settings-callout{ role: 'alert', data: { feature_id: "account_recovery_regular_check", dismiss_endpoint: user_callouts_path, defer_links: "true" } } .gl-alert.gl-alert-warning.js-recovery-settings-callout{ role: 'alert', data: { feature_id: "account_recovery_regular_check", dismiss_endpoint: user_callouts_path, defer_links: "true" } }
%button.js-close.gl-alert-dismiss.gl-cursor-pointer{ type: 'button', 'aria-label' => _('Dismiss') } %button.js-close.gl-alert-dismiss.gl-cursor-pointer{ type: 'button', 'aria-label' => _('Dismiss') }
= sprite_icon('close', size: 16, css_class: 'gl-icon') = sprite_icon('close', css_class: 'gl-icon')
.gl-alert-body .gl-alert-body
- account_link_start = '<a class="deferred-link" href="%{url}">'.html_safe % { url: profile_account_path } - account_link_start = '<a class="deferred-link" href="%{url}">'.html_safe % { url: profile_account_path }
= _("Please ensure your account's %{account_link_start}recovery settings%{account_link_end} are up to date.").html_safe % { account_link_start: account_link_start, account_link_end: '</a>'.html_safe } = _("Please ensure your account's %{account_link_start}recovery settings%{account_link_end} are up to date.").html_safe % { account_link_start: account_link_start, account_link_end: '</a>'.html_safe }
...@@ -11,15 +11,15 @@ ...@@ -11,15 +11,15 @@
- if upvotes > 0 - if upvotes > 0
%li.issuable-upvotes.d-none.d-sm-block.has-tooltip{ title: _('Upvotes') } %li.issuable-upvotes.d-none.d-sm-block.has-tooltip{ title: _('Upvotes') }
= sprite_icon('thumb-up', size: 16, css_class: "vertical-align-middle") = sprite_icon('thumb-up', css_class: "vertical-align-middle")
= upvotes = upvotes
- if downvotes > 0 - if downvotes > 0
%li.issuable-downvotes.d-none.d-sm-block.has-tooltip{ title: _('Downvotes') } %li.issuable-downvotes.d-none.d-sm-block.has-tooltip{ title: _('Downvotes') }
= sprite_icon('thumb-down', size: 16, css_class: "vertical-align-middle") = sprite_icon('thumb-down', css_class: "vertical-align-middle")
= downvotes = downvotes
%li.issuable-comments.d-none.d-sm-block %li.issuable-comments.d-none.d-sm-block
= link_to issuable_path, class: ['has-tooltip', ('no-comments' if note_count == 0)], title: _('Comments') do = link_to issuable_path, class: ['has-tooltip', ('no-comments' if note_count == 0)], title: _('Comments') do
= sprite_icon('comments', size: 16, css_class: 'gl-vertical-align-text-bottom') = sprite_icon('comments', css_class: 'gl-vertical-align-text-bottom')
= note_count = note_count
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- if defined?(@merge_request) && @merge_request.discussion_locked? - if defined?(@merge_request) && @merge_request.discussion_locked?
.issuable-note-warning .issuable-note-warning
= sprite_icon('lock', size: 16, css_class: 'icon') = sprite_icon('lock', css_class: 'icon')
%span %span
= _('This merge request is locked.') = _('This merge request is locked.')
= _('Only project members can comment.') = _('Only project members can comment.')
......
...@@ -4,4 +4,4 @@ ...@@ -4,4 +4,4 @@
= loading_icon(color: 'light') = loading_icon(color: 'light')
= project_select_tag :project_path, class: "project-item-select", data: { include_groups: local_assigns[:include_groups], order_by: 'last_activity_at', relative_path: local_assigns[:path], with_shared: local_assigns[:with_shared], include_projects_in_subgroups: local_assigns[:include_projects_in_subgroups] }, with_feature_enabled: local_assigns[:with_feature_enabled] = project_select_tag :project_path, class: "project-item-select", data: { include_groups: local_assigns[:include_groups], order_by: 'last_activity_at', relative_path: local_assigns[:path], with_shared: local_assigns[:with_shared], include_projects_in_subgroups: local_assigns[:include_projects_in_subgroups] }, with_feature_enabled: local_assigns[:with_feature_enabled]
%button.btn.btn-success.new-project-item-select-button.qa-new-project-item-select-button.gl-p-0 %button.btn.btn-success.new-project-item-select-button.qa-new-project-item-select-button.gl-p-0
= sprite_icon('chevron-down', size: 16) = sprite_icon('chevron-down')
- if show_no_ssh_key_message? - if show_no_ssh_key_message?
%div{ class: 'no-ssh-key-message gl-alert gl-alert-warning', role: 'alert' } %div{ class: 'no-ssh-key-message gl-alert gl-alert-warning', role: 'alert' }
= sprite_icon('warning', size: 16, css_class: 'gl-icon s16 gl-alert-icon gl-alert-icon-no-title') = sprite_icon('warning', css_class: 'gl-icon s16 gl-alert-icon gl-alert-icon-no-title')
%button{ class: 'gl-alert-dismiss hide-no-ssh-message', type: 'button', 'aria-label': _('Dismiss') } %button{ class: 'gl-alert-dismiss hide-no-ssh-message', type: 'button', 'aria-label': _('Dismiss') }
= sprite_icon('close', size: 16, css_class: 'gl-icon s16') = sprite_icon('close', css_class: 'gl-icon s16')
.gl-alert-body .gl-alert-body
= s_("MissingSSHKeyWarningLink|You won't be able to pull or push project code via SSH until you add an SSH key to your profile").html_safe = s_("MissingSSHKeyWarningLink|You won't be able to pull or push project code via SSH until you add an SSH key to your profile").html_safe
.gl-alert-actions .gl-alert-actions
......
- if outdated_browser? - if outdated_browser?
.gl-alert.gl-alert-danger.outdated-browser{ :role => "alert" } .gl-alert.gl-alert-danger.outdated-browser{ :role => "alert" }
= sprite_icon('error', size: 16, css_class: "gl-alert-icon gl-alert-icon-no-title gl-icon") = sprite_icon('error', css_class: "gl-alert-icon gl-alert-icon-no-title gl-icon")
.gl-alert-body .gl-alert-body
- if browser.ie? && browser.version.to_i == 11 - if browser.ie? && browser.version.to_i == 11
- feedback_link_url = 'https://gitlab.com/gitlab-org/gitlab/issues/197987' - feedback_link_url = 'https://gitlab.com/gitlab-org/gitlab/issues/197987'
......
...@@ -4,5 +4,5 @@ ...@@ -4,5 +4,5 @@
%span.collapse-text= _("Collapse sidebar") %span.collapse-text= _("Collapse sidebar")
= button_tag class: 'close-nav-button', type: 'button' do = button_tag class: 'close-nav-button', type: 'button' do
= sprite_icon('close', size: 16) = sprite_icon('close')
%span.collapse-text= _("Close sidebar") %span.collapse-text= _("Close sidebar")
...@@ -16,4 +16,4 @@ ...@@ -16,4 +16,4 @@
- else - else
= text_area_tag attr, current_text, data: { qa_selector: qa_selector }, class: classes, placeholder: placeholder = text_area_tag attr, current_text, data: { qa_selector: qa_selector }, class: classes, placeholder: placeholder
%a.zen-control.zen-control-leave.js-zen-leave.gl-text-gray-700{ href: "#" } %a.zen-control.zen-control-leave.js-zen-leave.gl-text-gray-700{ href: "#" }
= sprite_icon('compress', size: 16) = sprite_icon('compress')
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
.stats.gl-text-gray-700.gl-flex-shrink-0 .stats.gl-text-gray-700.gl-flex-shrink-0
%span.gl-ml-5 %span.gl-ml-5
= sprite_icon('bookmark', size: 16, css_class: 'gl-vertical-align-text-bottom') = sprite_icon('bookmark', css_class: 'gl-vertical-align-text-bottom')
= number_with_delimiter(group.projects.non_archived.count) = number_with_delimiter(group.projects.non_archived.count)
%span.gl-ml-5 %span.gl-ml-5
= sprite_icon('users', size: 16, css_class: 'gl-vertical-align-text-bottom') = sprite_icon('users', css_class: 'gl-vertical-align-text-bottom')
= number_with_delimiter(group.users.count) = number_with_delimiter(group.users.count)
%span.gl-ml-5.visibility-icon.has-tooltip{ data: { container: 'body', placement: 'left' }, title: visibility_icon_description(group) } %span.gl-ml-5.visibility-icon.has-tooltip{ data: { container: 'body', placement: 'left' }, title: visibility_icon_description(group) }
......
= link_to safe_params.merge(rss_url_options), class: 'btn btn-svg has-tooltip', data: { container: 'body', testid: 'rss-feed-link' }, title: _('Subscribe to RSS feed') do = link_to safe_params.merge(rss_url_options), class: 'btn btn-svg has-tooltip', data: { container: 'body', testid: 'rss-feed-link' }, title: _('Subscribe to RSS feed') do
= sprite_icon('rss', css_class: 'qa-rss-icon', size: 16) = sprite_icon('rss', css_class: 'qa-rss-icon')
= link_to safe_params.merge(calendar_url_options), class: 'btn has-tooltip', data: { container: 'body' }, title: _('Subscribe to calendar') do = link_to safe_params.merge(calendar_url_options), class: 'btn has-tooltip', data: { container: 'body' }, title: _('Subscribe to calendar') do
= sprite_icon('calendar') = sprite_icon('calendar')
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
- milestone = issuable_sidebar[:milestone] || {} - milestone = issuable_sidebar[:milestone] || {}
.block.milestone{ data: { qa_selector: 'milestone_block' } } .block.milestone{ data: { qa_selector: 'milestone_block' } }
.sidebar-collapsed-icon.has-tooltip{ title: sidebar_milestone_tooltip_label(milestone), data: { container: 'body', html: 'true', placement: 'left', boundary: 'viewport' } } .sidebar-collapsed-icon.has-tooltip{ title: sidebar_milestone_tooltip_label(milestone), data: { container: 'body', html: 'true', placement: 'left', boundary: 'viewport' } }
= sprite_icon('clock', size: 16) = sprite_icon('clock')
%span.milestone-title.collapse-truncated-title %span.milestone-title.collapse-truncated-title
- if milestone.present? - if milestone.present?
= milestone[:title] = milestone[:title]
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
- if show_controls && member.source == current_resource - if show_controls && member.source == current_resource
- if member.can_resend_invite? - if member.can_resend_invite?
= link_to sprite_icon('paper-airplane', size: 16), polymorphic_path([:resend_invite, member]), = link_to sprite_icon('paper-airplane'), polymorphic_path([:resend_invite, member]),
method: :post, method: :post,
class: 'btn btn-default align-self-center mr-sm-2', class: 'btn btn-default align-self-center mr-sm-2',
title: _('Resend invite') title: _('Resend invite')
......
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
.block.releases .block.releases
.sidebar-collapsed-icon.has-tooltip{ title: milestone_releases_tooltip_text(milestone), data: { container: 'body', placement: 'left', boundary: 'viewport' } } .sidebar-collapsed-icon.has-tooltip{ title: milestone_releases_tooltip_text(milestone), data: { container: 'body', placement: 'left', boundary: 'viewport' } }
%strong %strong
= sprite_icon("rocket", size: 16) = sprite_icon("rocket")
%span= total_count %span= total_count
.title.hide-collapsed= n_('Release', 'Releases', total_count) .title.hide-collapsed= n_('Release', 'Releases', total_count)
.hide-collapsed .hide-collapsed
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
%span.uploading-container %span.uploading-container
%span.uploading-progress-container.hide %span.uploading-progress-container.hide
= sprite_icon('media', size: 16, css_class: 'gl-icon gl-vertical-align-text-bottom') = sprite_icon('media', css_class: 'gl-icon gl-vertical-align-text-bottom')
%span.attaching-file-message %span.attaching-file-message
-# Populated by app/assets/javascripts/dropzone_input.js -# Populated by app/assets/javascripts/dropzone_input.js
%span.uploading-progress 0% %span.uploading-progress 0%
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
%span.uploading-error-container.hide %span.uploading-error-container.hide
%span.uploading-error-icon %span.uploading-error-icon
= sprite_icon('media', size: 16, css_class: 'gl-icon gl-vertical-align-text-bottom') = sprite_icon('media', css_class: 'gl-icon gl-vertical-align-text-bottom')
%span.uploading-error-message %span.uploading-error-message
-# Populated by app/assets/javascripts/dropzone_input.js -# Populated by app/assets/javascripts/dropzone_input.js
%button.retry-uploading-link{ type: 'button' }= _("Try again") %button.retry-uploading-link{ type: 'button' }= _("Try again")
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
%button.attach-new-file.markdown-selector{ type: 'button' }= _("attach a new file") %button.attach-new-file.markdown-selector{ type: 'button' }= _("attach a new file")
%button.btn.markdown-selector.button-attach-file.btn-link{ type: 'button', tabindex: '-1' } %button.btn.markdown-selector.button-attach-file.btn-link{ type: 'button', tabindex: '-1' }
= sprite_icon('media', size: 16) = sprite_icon('media')
%span.text-attach-file<> %span.text-attach-file<>
= _("Attach a file") = _("Attach a file")
......
...@@ -63,8 +63,8 @@ ...@@ -63,8 +63,8 @@
- if note.system - if note.system
.system-note-commit-list-toggler.hide .system-note-commit-list-toggler.hide
= _("Toggle commit list") = _("Toggle commit list")
= sprite_icon('chevron-down', size: 16, css_class: 'js-chevron-down gl-ml-1 gl-vertical-align-text-bottom') = sprite_icon('chevron-down', css_class: 'js-chevron-down gl-ml-1 gl-vertical-align-text-bottom')
= sprite_icon('chevron-up', size: 16, css_class: 'js-chevron-up gl-ml-1 gl-vertical-align-text-bottom gl-display-none') = sprite_icon('chevron-up', css_class: 'js-chevron-up gl-ml-1 gl-vertical-align-text-bottom gl-display-none')
- if note.attachment.url - if note.attachment.url
.note-attachment .note-attachment
- if note.attachment.image? - if note.attachment.image?
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
- elsif discussion_locked - elsif discussion_locked
.disabled-comment.text-center.gl-mt-3 .disabled-comment.text-center.gl-mt-3
%span.issuable-note-warning %span.issuable-note-warning
= sprite_icon('lock', size: 16, css_class: 'icon') = sprite_icon('lock', css_class: 'icon')
%span %span
= html_escape(_("This %{issuable} is locked. Only %{strong_open}project members%{strong_close} can comment.")) % { issuable: issuable.class.to_s.titleize.downcase, strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe } = html_escape(_("This %{issuable} is locked. Only %{strong_open}project members%{strong_close} can comment.")) % { issuable: issuable.class.to_s.titleize.downcase, strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe }
-# haml-lint:disable InlineJavaScript -# haml-lint:disable InlineJavaScript
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
%div{ class: ("btn-group" if notification_setting.custom?) } %div{ class: ("btn-group" if notification_setting.custom?) }
- if notification_setting.custom? - if notification_setting.custom?
%button.dropdown-new.btn.btn-defaul.btn-icon.gl-button.has-tooltip.notifications-btn.text-left#notifications-button{ type: "button", title: button_title, class: "#{btn_class}", "aria-label" => aria_label, data: { container: "body", toggle: "modal", target: "#" + notifications_menu_identifier("modal", notification_setting), display: 'static' } } %button.dropdown-new.btn.btn-defaul.btn-icon.gl-button.has-tooltip.notifications-btn.text-left#notifications-button{ type: "button", title: button_title, class: "#{btn_class}", "aria-label" => aria_label, data: { container: "body", toggle: "modal", target: "#" + notifications_menu_identifier("modal", notification_setting), display: 'static' } }
= sprite_icon("notifications", size: 16, css_class: "js-notification-loading") = sprite_icon("notifications", css_class: "js-notification-loading")
= notification_title(notification_setting.level) = notification_title(notification_setting.level)
%button.btn.dropdown-toggle.d-flex{ data: { toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting), flip: "false" } } %button.btn.dropdown-toggle.d-flex{ data: { toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting), flip: "false" } }
= icon('caret-down') = icon('caret-down')
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
- else - else
%button.dropdown-new.btn.btn-default.btn-icon.gl-button.has-tooltip.notifications-btn#notifications-button{ type: "button", title: button_title, class: "#{btn_class}", "aria-label" => aria_label, data: { container: "body", toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting), flip: "false" } } %button.dropdown-new.btn.btn-default.btn-icon.gl-button.has-tooltip.notifications-btn#notifications-button{ type: "button", title: button_title, class: "#{btn_class}", "aria-label" => aria_label, data: { container: "body", toggle: "dropdown", target: notifications_menu_identifier("dropdown", notification_setting), flip: "false" } }
.float-left .float-left
= sprite_icon("notifications", size: 16, css_class: "js-notification-loading") = sprite_icon("notifications", css_class: "js-notification-loading")
= notification_title(notification_setting.level) = notification_title(notification_setting.level)
.float-right .float-right
= icon("caret-down") = icon("caret-down")
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
.filtered-search-box-input-container.pl-2 .filtered-search-box-input-container.pl-2
= render 'shared/projects/search_form', admin_view: false, search_form_placeholder: _("Search projects...") = render 'shared/projects/search_form', admin_view: false, search_form_placeholder: _("Search projects...")
%button.btn.btn-secondary{ type: 'submit', form: 'project-filter-form' } %button.btn.btn-secondary{ type: 'submit', form: 'project-filter-form' }
= sprite_icon('search', size: 16, css_class: 'search-icon ') = sprite_icon('search', css_class: 'search-icon ')
.filtered-search-dropdown.flex-row.align-items-center.mb-2.m-sm-0#filtered-search-visibility-dropdown{ class: flex_grow_and_shrink_xs } .filtered-search-dropdown.flex-row.align-items-center.mb-2.m-sm-0#filtered-search-visibility-dropdown{ class: flex_grow_and_shrink_xs }
.filtered-search-dropdown-label.p-0.pl-sm-3.font-weight-bold .filtered-search-dropdown-label.p-0.pl-sm-3.font-weight-bold
%span %span
...@@ -25,4 +25,3 @@ ...@@ -25,4 +25,3 @@
%span %span
= _("Sort by") = _("Sort by")
= render 'shared/projects/sort_dropdown' = render 'shared/projects/sort_dropdown'
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
%ul.controls %ul.controls
%li %li
= link_to gitlab_snippet_path(snippet, anchor: 'notes'), class: ('no-comments' if notes_count == 0) do = link_to gitlab_snippet_path(snippet, anchor: 'notes'), class: ('no-comments' if notes_count == 0) do
= sprite_icon('comments', size: 16, css_class: 'gl-vertical-align-text-bottom') = sprite_icon('comments', css_class: 'gl-vertical-align-text-bottom')
= notes_count = notes_count
%li %li
%span.sr-only %span.sr-only
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
.sidebar-container .sidebar-container
.block.wiki-sidebar-header.gl-mb-3.w-100 .block.wiki-sidebar-header.gl-mb-3.w-100
%a.gutter-toggle.float-right.d-block.d-sm-block.d-md-none.js-sidebar-wiki-toggle{ href: "#" } %a.gutter-toggle.float-right.d-block.d-sm-block.d-md-none.js-sidebar-wiki-toggle{ href: "#" }
= sprite_icon('chevron-double-lg-right', size: 16, css_class: 'gl-icon') = sprite_icon('chevron-double-lg-right', css_class: 'gl-icon')
- git_access_url = wiki_path(@wiki, action: :git_access) - git_access_url = wiki_path(@wiki, action: :git_access)
= link_to git_access_url, class: active_nav_link?(path: 'wikis#git_access') ? 'active' : '', data: { qa_selector: 'clone_repository_link' } do = link_to git_access_url, class: active_nav_link?(path: 'wikis#git_access') ? 'active' : '', data: { qa_selector: 'clone_repository_link' } do
= sprite_icon('download', size: 16, css_class: 'gl-mr-2') = sprite_icon('download', css_class: 'gl-mr-2')
%span= _("Clone repository") %span= _("Clone repository")
.blocks-container .blocks-container
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
- @events.sort_by(&:created_at).each do |event| - @events.sort_by(&:created_at).each do |event|
%li %li
%span.light %span.light
= sprite_icon('clock', size: 16, css_class: 'gl-vertical-align-text-bottom') = sprite_icon('clock', css_class: 'gl-vertical-align-text-bottom')
= event.created_at.to_time.in_time_zone.strftime('%-I:%M%P') = event.created_at.to_time.in_time_zone.strftime('%-I:%M%P')
- if event.visible_to_user?(current_user) - if event.visible_to_user?(current_user)
- if event.push_action? - if event.push_action?
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
= icon('exclamation-circle') = icon('exclamation-circle')
- if can?(current_user, :read_user_profile, @user) - if can?(current_user, :read_user_profile, @user)
= link_to user_path(@user, rss_url_options), class: link_classes + 'btn btn-svg btn-default has-tooltip', title: s_('UserProfile|Subscribe'), 'aria-label': 'Subscribe' do = link_to user_path(@user, rss_url_options), class: link_classes + 'btn btn-svg btn-default has-tooltip', title: s_('UserProfile|Subscribe'), 'aria-label': 'Subscribe' do
= sprite_icon('rss', css_class: 'qa-rss-icon', size: 16) = sprite_icon('rss', css_class: 'qa-rss-icon')
- if current_user && current_user.admin? - if current_user && current_user.admin?
= link_to [:admin, @user], class: link_classes + 'btn btn-default', title: s_('UserProfile|View user in admin area'), = link_to [:admin, @user], class: link_classes + 'btn btn-default', title: s_('UserProfile|View user in admin area'),
data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
...@@ -55,12 +55,12 @@ ...@@ -55,12 +55,12 @@
.cover-desc.cgray.mb-1.mb-sm-2 .cover-desc.cgray.mb-1.mb-sm-2
- unless @user.location.blank? - unless @user.location.blank?
.profile-link-holder.middle-dot-divider-sm.d-block.d-sm-inline.mb-1.mb-sm-0 .profile-link-holder.middle-dot-divider-sm.d-block.d-sm-inline.mb-1.mb-sm-0
= sprite_icon('location', size: 16, css_class: 'vertical-align-sub fgray') = sprite_icon('location', css_class: 'vertical-align-sub fgray')
%span.vertical-align-middle %span.vertical-align-middle
= @user.location = @user.location
- unless work_information(@user).blank? - unless work_information(@user).blank?
.profile-link-holder.middle-dot-divider-sm.d-block.d-sm-inline .profile-link-holder.middle-dot-divider-sm.d-block.d-sm-inline
= sprite_icon('work', size: 16, css_class: 'vertical-align-middle fgray') = sprite_icon('work', css_class: 'vertical-align-middle fgray')
%span.vertical-align-middle %span.vertical-align-middle
= work_information(@user) = work_information(@user)
.cover-desc.cgray.mb-1.mb-sm-2 .cover-desc.cgray.mb-1.mb-sm-2
...@@ -172,4 +172,3 @@ ...@@ -172,4 +172,3 @@
= s_('UserProfile|This user is blocked') = s_('UserProfile|This user is blocked')
- else - else
= s_('UserProfile|This user has a private profile') = s_('UserProfile|This user has a private profile')
...@@ -69,7 +69,7 @@ module EE ...@@ -69,7 +69,7 @@ module EE
opposite_sorting_param = epics_ordering_options_hash[sort] || epics_ordering_options_hash.key(sort) opposite_sorting_param = epics_ordering_options_hash[sort] || epics_ordering_options_hash.key(sort)
sort_icon = sort.end_with?('desc') ? 'sort-highest' : 'sort-lowest' sort_icon = sort.end_with?('desc') ? 'sort-highest' : 'sort-lowest'
link_to sprite_icon(sort_icon, size: 16), link_to sprite_icon(sort_icon),
page_filter_path(sort: opposite_sorting_param), page_filter_path(sort: opposite_sorting_param),
class: "btn btn-default has-tooltip qa-reverse-sort btn-sort-direction", class: "btn btn-default has-tooltip qa-reverse-sort btn-sort-direction",
title: _("Sort direction") title: _("Sort direction")
......
- if admin_emails_are_currently_rate_limited? - if admin_emails_are_currently_rate_limited?
%div{ class: 'gl-alert gl-alert-danger', role: 'alert' } %div{ class: 'gl-alert gl-alert-danger', role: 'alert' }
= sprite_icon('warning', size: 16, css_class: 'gl-icon s16 gl-alert-icon gl-alert-icon-no-title') = sprite_icon('warning', css_class: 'gl-icon s16 gl-alert-icon gl-alert-icon-no-title')
.gl-alert-body .gl-alert-body
= admin_emails_rate_limited_alert = admin_emails_rate_limited_alert
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
.dropdown.px-1.my-1.my-sm-0.w-100 .dropdown.px-1.my-1.my-sm-0.w-100
%a.btn.d-flex.align-items-center.justify-content-between.w-100{ href: '#', data: { toggle: 'dropdown' }, 'aria-haspopup' => 'true', 'aria-expanded' => 'false' } %a.btn.d-flex.align-items-center.justify-content-between.w-100{ href: '#', data: { toggle: 'dropdown' }, 'aria-haspopup' => 'true', 'aria-expanded' => 'false' }
= s_('Geo|Filter by status') = s_('Geo|Filter by status')
= sprite_icon("chevron-down", size: 16) = sprite_icon("chevron-down")
%ul.dropdown-menu %ul.dropdown-menu
= nav_link(html_options: { class: ('bg-secondary-100' if !params[:sync_status].present?) }) do = nav_link(html_options: { class: ('bg-secondary-100' if !params[:sync_status].present?) }) do
= link_to controller: replicable_controller do = link_to controller: replicable_controller do
......
#repeat-trial-info.bs-callout.bs-callout-info.alert.alert-dismissible.fade.in.show{ role: "alert" } #repeat-trial-info.bs-callout.bs-callout-info.alert.alert-dismissible.fade.in.show{ role: "alert" }
%button.close{ type: "button", 'data-dismiss': "alert", 'aria-label': "Close" } %button.close{ type: "button", 'data-dismiss': "alert", 'aria-label': "Close" }
%span %span
= sprite_icon('close', size: 16) = sprite_icon('close')
%h4 %h4
= _('Free Trial') = _('Free Trial')
%p %p
= _('Thank you for signing up for your free trial! You will get additional instructions in your inbox shortly.') = _('Thank you for signing up for your free trial! You will get additional instructions in your inbox shortly.')
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
- if License.future_dated_only? - if License.future_dated_only?
.gl-alert.gl-alert-info .gl-alert.gl-alert-info
= sprite_icon('information-o', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title') = sprite_icon('information-o', css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
.gl-alert-body .gl-alert-body
%h4.gl-alert-title= _('You do not have an active license') %h4.gl-alert-title= _('You do not have an active license')
= _('You have a license that activates at a future date. Please see the License History table below.') = _('You have a license that activates at a future date. Please see the License History table below.')
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
%div{ id: "#{server['provider_name']}_smartcard" } %div{ id: "#{server['provider_name']}_smartcard" }
%span %span
%strong %strong
= sprite_icon('smart-card', size: 16, css_class: 'vertical-align-middle' ) = sprite_icon('smart-card', css_class: 'vertical-align-middle' )
%span.vertical-align-middle %span.vertical-align-middle
= _('Sign in using smart card') = _('Sign in using smart card')
%p %p
......
- return unless show_active_user_count_threshold_banner? - return unless show_active_user_count_threshold_banner?
.container-fluid.container-limited.pt-3 .container-fluid.container-limited.pt-3
.gl-alert.gl-alert-info.gitlab-ee-license-banner.alert-primary.js-admin-licensed-user-count-threshold{ role: 'alert', data: { feature_id: UserCalloutsHelper::ACTIVE_USER_COUNT_THRESHOLD, dismiss_endpoint: user_callouts_path } } .gl-alert.gl-alert-info.gitlab-ee-license-banner.alert-primary.js-admin-licensed-user-count-threshold{ role: 'alert', data: { feature_id: UserCalloutsHelper::ACTIVE_USER_COUNT_THRESHOLD, dismiss_endpoint: user_callouts_path } }
= sprite_icon('information-o', size: 16, css_class: 'gl-icon gl-alert-icon') = sprite_icon('information-o', css_class: 'gl-icon gl-alert-icon')
%button.js-close.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') } %button.js-close.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') }
= sprite_icon('close', size: 16, css_class: 'gl-icon') = sprite_icon('close', css_class: 'gl-icon')
.gl-alert-body .gl-alert-body
%h4.gl-alert-title= _('Your instance is approaching its licensed user count') %h4.gl-alert-title= _('Your instance is approaching its licensed user count')
= _('Your instance has %{remaining_user_count} users remaining of the %{total_user_count} included in your subscription. You can add more users than the number included in your license, and we will include the overage in your next bill.') % { remaining_user_count: remaining_user_count, total_user_count: total_user_count } = _('Your instance has %{remaining_user_count} users remaining of the %{total_user_count} included in your subscription. You can add more users than the number included in your license, and we will include the overage in your next bill.') % { remaining_user_count: remaining_user_count, total_user_count: total_user_count }
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
.gl-alert.gl-alert-danger.js-token-expiry-callout{ role: 'alert', data: { feature_id: "personal_access_token_expiry", dismiss_endpoint: user_callouts_path, defer_links: "true" } } .gl-alert.gl-alert-danger.js-token-expiry-callout{ role: 'alert', data: { feature_id: "personal_access_token_expiry", dismiss_endpoint: user_callouts_path, defer_links: "true" } }
%button.js-close.gl-alert-dismiss.gl-cursor-pointer{ type: 'button', 'aria-label' => _('Dismiss') } %button.js-close.gl-alert-dismiss.gl-cursor-pointer{ type: 'button', 'aria-label' => _('Dismiss') }
= sprite_icon('close', size: 16, css_class: 'gl-icon') = sprite_icon('close', css_class: 'gl-icon')
.gl-alert-body .gl-alert-body
= sprite_icon('warning', size: 16, css_class: 'vertical-align-text-top') = sprite_icon('warning', css_class: 'vertical-align-text-top')
= message.html_safe % { generate_new: link } = message.html_safe % { generate_new: link }
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
- return unless not_dismissed_or_in_admin_area && show_users_over_license_banner? - return unless not_dismissed_or_in_admin_area && show_users_over_license_banner?
.gl-alert.gl-alert-info.js-users-over-license-callout{ role: 'alert', data: { feature_id: "users_over_license_banner", dismiss_endpoint: user_callouts_path, defer_links: "true" } } .gl-alert.gl-alert-info.js-users-over-license-callout{ role: 'alert', data: { feature_id: "users_over_license_banner", dismiss_endpoint: user_callouts_path, defer_links: "true" } }
= sprite_icon('information-o', size: 16, css_class: 'gl-icon gl-alert-icon') = sprite_icon('information-o', css_class: 'gl-icon gl-alert-icon')
- unless admin_section? - unless admin_section?
%button.js-close.gl-alert-dismiss.gl-cursor-pointer{ type: 'button', 'aria-label' => _('Dismiss') } %button.js-close.gl-alert-dismiss.gl-cursor-pointer{ type: 'button', 'aria-label' => _('Dismiss') }
= sprite_icon('close', size: 16, css_class: 'gl-icon') = sprite_icon('close', css_class: 'gl-icon')
.gl-alert-body .gl-alert-body
%h3.gl-alert-title= s_('License|Licensed user count exceeded') %h3.gl-alert-title= s_('License|Licensed user count exceeded')
%p %p
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
.alert.alert-dismissible.alert-primary.fade.in.show{ role: "alert" } .alert.alert-dismissible.alert-primary.fade.in.show{ role: "alert" }
%button.close{ type: "button", 'data-dismiss': "alert", 'aria-label': "Close" } %button.close{ type: "button", 'data-dismiss': "alert", 'aria-label': "Close" }
%span %span
= sprite_icon('close', size: 16) = sprite_icon('close')
%span %span
- banner_url = project_settings_repository_path(project, anchor: 'js-protected-branches-settings') - banner_url = project_settings_repository_path(project, anchor: 'js-protected-branches-settings')
- banner_link_start = '<a href="%{url}"><strong>'.html_safe % { url: banner_url } - banner_link_start = '<a href="%{url}"><strong>'.html_safe % { url: banner_url }
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
%div %div
- if git_import_enabled? - if git_import_enabled?
%button.btn.btn-svg.js-toggle-button.js-import-git-toggle-button{ type: "button", data: { toggle_open_class: 'active', track_label: "#{track_label}", track_property: 'repo_url', track_event: "click_button", track_value: "" } } %button.btn.btn-svg.js-toggle-button.js-import-git-toggle-button{ type: "button", data: { toggle_open_class: 'active', track_label: "#{track_label}", track_property: 'repo_url', track_event: "click_button", track_value: "" } }
= sprite_icon('link', size: 16, css_class: 'gl-icon') = sprite_icon('link', css_class: 'gl-icon')
= _('Repo by URL') = _('Repo by URL')
.col-lg-12 .col-lg-12
.js-toggle-content.toggle-import-form{ class: ('hide' if active_tab != 'ci_cd_only') } .js-toggle-content.toggle-import-form{ class: ('hide' if active_tab != 'ci_cd_only') }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
- if @issue.blocked? && @issue.blocked_by_issues(current_user).length > 0 - if @issue.blocked? && @issue.blocked_by_issues(current_user).length > 0
.hidden.js-close-blocked-issue-warning.js-issuable-buttons.gl-alert.gl-alert-warning.gl-mt-5{ role: 'alert', data: { 'action': "close-reopen" } } .hidden.js-close-blocked-issue-warning.js-issuable-buttons.gl-alert.gl-alert-warning.gl-mt-5{ role: 'alert', data: { 'action': "close-reopen" } }
= sprite_icon('warning', size: 16, css_class: 'gl-icon gl-alert-icon') = sprite_icon('warning', css_class: 'gl-icon gl-alert-icon')
%h4.gl-alert-title %h4.gl-alert-title
= _('Are you sure you want to close this blocked issue?') = _('Are you sure you want to close this blocked issue?')
.gl-alert-body .gl-alert-body
......
...@@ -3,5 +3,5 @@ ...@@ -3,5 +3,5 @@
- if issue.weight - if issue.weight
%span.issuable-weight.d-none.d-sm-inline-block.has-tooltip{ data: { container: 'body', qa_selector: 'issuable_weight_content' }, title: _('Weight') } %span.issuable-weight.d-none.d-sm-inline-block.has-tooltip{ data: { container: 'body', qa_selector: 'issuable_weight_content' }, title: _('Weight') }
&nbsp; &nbsp;
= sprite_icon('weight', size: 16, css_class: 'issue-weight-icon') = sprite_icon('weight', css_class: 'issue-weight-icon')
= issue.weight = issue.weight
- return unless issue_in_subepic?(issue, params[:epic_id]) - return unless issue_in_subepic?(issue, params[:epic_id])
%span.d-inline-block.ml-1{ title: _('This issue is in a child epic of the filtered epic'), data: { toggle: 'tooltip', container: 'body' } } %span.d-inline-block.ml-1{ title: _('This issue is in a child epic of the filtered epic'), data: { toggle: 'tooltip', container: 'body' } }
= sprite_icon('information-o', size: 16, css_class: 'd-block text-primary-500 hover-text-primary-800') = sprite_icon('information-o', css_class: 'd-block text-primary-500 hover-text-primary-800')
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
- else - else
- approval_tooltip = self_approved ? approved_text : unapproved_text - approval_tooltip = self_approved ? approved_text : unapproved_text
- approval_icon = sprite_icon((self_approved ? 'approval-solid' : 'approval'), size: 16, css_class: 'align-middle') - approval_icon = sprite_icon((self_approved ? 'approval-solid' : 'approval'), css_class: 'align-middle')
%li.d-none.d-sm-inline-block.has-tooltip{ title: approval_tooltip, class: ('text-success' if approved) } %li.d-none.d-sm-inline-block.has-tooltip{ title: approval_tooltip, class: ('text-success' if approved) }
= approval_icon = approval_icon
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
- tracing_link = link_to sanitize(@project.tracing_external_url, scrubber: Rails::Html::TextOnlyScrubber.new), target: "_blank", rel: 'noopener noreferrer' do - tracing_link = link_to sanitize(@project.tracing_external_url, scrubber: Rails::Html::TextOnlyScrubber.new), target: "_blank", rel: 'noopener noreferrer' do
%span %span
= _('Tracing') = _('Tracing')
= sprite_icon('external-link', size: 16, css_class: 'ml-1 vertical-align-middle') = sprite_icon('external-link', css_class: 'ml-1 vertical-align-middle')
- else - else
- tracing_link = link_to project_tracing_path(@project) do - tracing_link = link_to project_tracing_path(@project) do
%span %span
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
%p.form-text.text-muted %p.form-text.text-muted
- jaeger_help_url = "https://www.jaegertracing.io/docs/1.7/getting-started/" - jaeger_help_url = "https://www.jaegertracing.io/docs/1.7/getting-started/"
- link_start_tag = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: jaeger_help_url } - link_start_tag = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: jaeger_help_url }
- link_end_tag = "#{sprite_icon('external-link', size: 16, css_class: 'ml-1 vertical-align-middle')}</a>".html_safe - link_end_tag = "#{sprite_icon('external-link', css_class: 'ml-1 vertical-align-middle')}</a>".html_safe
= _("For more information, please review %{link_start_tag}Jaeger's configuration doc%{link_end_tag}").html_safe % { link_start_tag: link_start_tag, link_end_tag: link_end_tag } = _("For more information, please review %{link_start_tag}Jaeger's configuration doc%{link_end_tag}").html_safe % { link_start_tag: link_start_tag, link_end_tag: link_end_tag }
.gl-display-flex.gl-justify-content-end .gl-display-flex.gl-justify-content-end
= f.submit _('Save changes'), class: 'btn btn-success' = f.submit _('Save changes'), class: 'btn btn-success'
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
%p %p
- jaeger_help_url = "https://www.jaegertracing.io/docs/1.7/getting-started/" - jaeger_help_url = "https://www.jaegertracing.io/docs/1.7/getting-started/"
- link_start_tag = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: jaeger_help_url } - link_start_tag = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: jaeger_help_url }
- link_end_tag = "#{sprite_icon('external-link', size: 16, css_class: 'ml-1 vertical-align-middle')}</a>".html_safe - link_end_tag = "#{sprite_icon('external-link', css_class: 'ml-1 vertical-align-middle')}</a>".html_safe
= _('To get started, link this page to your Jaeger server, or find out how to %{link_start_tag}install Jaeger%{link_end_tag}').html_safe % { link_start_tag: link_start_tag, link_end_tag: link_end_tag } = _('To get started, link this page to your Jaeger server, or find out how to %{link_start_tag}install Jaeger%{link_end_tag}').html_safe % { link_start_tag: link_start_tag, link_end_tag: link_end_tag }
.text-center .text-center
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
%h4.gl-alert-title= payload[:usage_message] %h4.gl-alert-title= payload[:usage_message]
- if alert_level != :error - if alert_level != :error
%button.js-namespace-storage-alert-dismiss.gl-alert-dismiss.gl-cursor-pointer{ type: 'button', 'aria-label' => _('Dismiss'), data: { id: root_namespace.id, level: alert_level } } %button.js-namespace-storage-alert-dismiss.gl-alert-dismiss.gl-cursor-pointer{ type: 'button', 'aria-label' => _('Dismiss'), data: { id: root_namespace.id, level: alert_level } }
= sprite_icon('close', size: 16, css_class: 'gl-icon') = sprite_icon('close', css_class: 'gl-icon')
.gl-alert-body .gl-alert-body
= payload[:explanation_message] = payload[:explanation_message]
- if link - if link
......
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
- if credential.expired? - if credential.expired?
%span{ class: date_classes + ' gl-text-red-500', title: _('This credential has expired'), data: { testid: 'expiry-date-icon' } } %span{ class: date_classes + ' gl-text-red-500', title: _('This credential has expired'), data: { testid: 'expiry-date-icon' } }
= sprite_icon('error', size: 16, css_class: "gl-icon gl-mr-2") = sprite_icon('error', css_class: "gl-icon gl-mr-2")
= expiry_date = expiry_date
- elsif credential.expires_soon? - elsif credential.expires_soon?
%span{ class: date_classes + ' gl-text-orange-500', data: { testid: 'expiry-date-icon' } } %span{ class: date_classes + ' gl-text-orange-500', data: { testid: 'expiry-date-icon' } }
= sprite_icon('warning', size: 16, css_class: "gl-icon gl-mr-2") = sprite_icon('warning', css_class: "gl-icon gl-mr-2")
= expiry_date = expiry_date
- else - else
= expiry_date = expiry_date
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
.dropdown.boards-add-list.gl-ml-3#js-add-list .dropdown.boards-add-list.gl-ml-3#js-add-list
%button.btn.btn-success.btn-inverted.d-flex.js-new-board-list{ type: "button", data: board_list_data } %button.btn.btn-success.btn-inverted.d-flex.js-new-board-list{ type: "button", data: board_list_data }
%span Add list %span Add list
= sprite_icon('chevron-down', size: 16, css_class: 'gl-ml-2 btn-success-board-list-chevron') = sprite_icon('chevron-down', css_class: 'gl-ml-2 btn-success-board-list-chevron')
.dropdown-menu.dropdown-menu-paging.dropdown-menu-right.dropdown-menu-issues-board-new.dropdown-menu-selectable.dropdown-menu-tabs.pt-0 .dropdown-menu.dropdown-menu-paging.dropdown-menu-right.dropdown-menu-issues-board-new.dropdown-menu-selectable.dropdown-menu-tabs.pt-0
%ul.nav.nav-tabs.dropdown-tabs-list.d-flex.js-new-board-list-tabs{ role: 'tablist' } %ul.nav.nav-tabs.dropdown-tabs-list.d-flex.js-new-board-list-tabs{ role: 'tablist' }
%li.nav-item.dropdown-tab-item.flex-grow-1.flex-shrink-1.w-0.border-left-0.js-tab-button-labels %li.nav-item.dropdown-tab-item.flex-grow-1.flex-shrink-1.w-0.border-left-0.js-tab-button-labels
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
data: { name: user.name, el_id: dom_id(member) } } data: { name: user.name, el_id: dom_id(member) } }
%span.d-block.d-md-none %span.d-block.d-md-none
Edit permissions Edit permissions
= sprite_icon('pencil', size: 16, css_class: 'd-none d-sm-none d-md-inline-block') = sprite_icon('pencil', css_class: 'd-none d-sm-none d-md-inline-block')
- else - else
%li.alert.alert-member-ldap{ style: 'display: none;' } %li.alert.alert-member-ldap{ style: 'display: none;' }
%p %p
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
- total_weight = milestone.issues_visible_to_user(current_user).sum(:weight) # rubocop: disable CodeReuse/ActiveRecord - total_weight = milestone.issues_visible_to_user(current_user).sum(:weight) # rubocop: disable CodeReuse/ActiveRecord
.block.weight .block.weight
.sidebar-collapsed-icon.has-tooltip{ title: milestone_weight_tooltip_text(total_weight), data: { container: 'body', placement: 'left' } } .sidebar-collapsed-icon.has-tooltip{ title: milestone_weight_tooltip_text(total_weight), data: { container: 'body', placement: 'left' } }
= sprite_icon('weight', size: 16) = sprite_icon('weight')
%span %span
- unless total_weight == 0 - unless total_weight == 0
= total_weight = total_weight
...@@ -18,4 +18,3 @@ ...@@ -18,4 +18,3 @@
%strong.bold= total_weight %strong.bold= total_weight
- else - else
.no-value None .no-value None
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.block.js-epics-sidebar-callout.promotion-issue-sidebar{ data: { uid: promotion_feature } } .block.js-epics-sidebar-callout.promotion-issue-sidebar{ data: { uid: promotion_feature } }
.sidebar-collapsed-icon{ data: { toggle: "dropdown", target: ".js-epics-sidebar-callout" } } .sidebar-collapsed-icon{ data: { toggle: "dropdown", target: ".js-epics-sidebar-callout" } }
%span{ data: { toggle: "tooltip", placement: "left", container: "body" }, title: _('Epic') } %span{ data: { toggle: "tooltip", placement: "left", container: "body" }, title: _('Epic') }
= sprite_icon('epic', size: 16) = sprite_icon('epic')
%span %span
= _('None') = _('None')
.title.hide-collapsed .title.hide-collapsed
......
...@@ -2,10 +2,9 @@ ...@@ -2,10 +2,9 @@
.user-callout .user-callout
.alert.bordered-box.landing.justify-content-start.pl-md-8 .alert.bordered-box.landing.justify-content-start.pl-md-8
%button{ type:"button", class:"btn btn-default close", "data-dismiss":"alert", "aria-label": _("Close") } %button{ type:"button", class:"btn btn-default close", "data-dismiss":"alert", "aria-label": _("Close") }
= sprite_icon('close', size: 16) = sprite_icon('close')
.svg-container .svg-container
= custom_icon('trial_activated_banner') = custom_icon('trial_activated_banner')
.user-callout-copy .user-callout-copy
%h4 %h4
= s_("BillingPlans|Congratulations, your new trial is activated") = s_("BillingPlans|Congratulations, your new trial is activated")
...@@ -62,7 +62,7 @@ RSpec.describe WikiHelper do ...@@ -62,7 +62,7 @@ RSpec.describe WikiHelper do
path = "/#{wiki.project.full_path}/-/wikis/pages?direction=#{direction}&sort=#{sort}" path = "/#{wiki.project.full_path}/-/wikis/pages?direction=#{direction}&sort=#{sort}"
helper.link_to(path, type: 'button', class: classes, title: 'Sort direction') do helper.link_to(path, type: 'button', class: classes, title: 'Sort direction') do
helper.sprite_icon("sort-#{icon_class}", size: 16) helper.sprite_icon("sort-#{icon_class}")
end end
end end
......
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