Remove instances of `@extend .monospace`
This commit is contained in:
parent
2e520274a3
commit
7974e8141b
|
@ -360,10 +360,6 @@ code {
|
||||||
font-size: 95%;
|
font-size: 95%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.git-revision-dropdown-toggle {
|
|
||||||
@extend .monospace;
|
|
||||||
}
|
|
||||||
|
|
||||||
.git-revision-dropdown .dropdown-content ul li a {
|
.git-revision-dropdown .dropdown-content ul li a {
|
||||||
@extend .ref-name;
|
@extend .ref-name;
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,7 +32,6 @@
|
||||||
|
|
||||||
.file-title {
|
.file-title {
|
||||||
@extend .monospace;
|
@extend .monospace;
|
||||||
|
|
||||||
line-height: 35px;
|
line-height: 35px;
|
||||||
padding-top: 7px;
|
padding-top: 7px;
|
||||||
padding-bottom: 7px;
|
padding-bottom: 7px;
|
||||||
|
@ -48,13 +47,6 @@
|
||||||
margin-right: 10px;
|
margin-right: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.editor-file-name {
|
|
||||||
@extend .monospace;
|
|
||||||
|
|
||||||
float: left;
|
|
||||||
margin-right: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.new-file-name {
|
.new-file-name {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
max-width: 420px;
|
max-width: 420px;
|
||||||
|
|
|
@ -141,10 +141,6 @@
|
||||||
float: none;
|
float: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.api {
|
|
||||||
@extend .monospace;
|
|
||||||
}
|
|
||||||
|
|
||||||
.branch-commit {
|
.branch-commit {
|
||||||
.ref-name {
|
.ref-name {
|
||||||
font-weight: $gl-font-weight-bold;
|
font-weight: $gl-font-weight-bold;
|
||||||
|
|
|
@ -352,10 +352,6 @@
|
||||||
|
|
||||||
.mobile-git-clone {
|
.mobile-git-clone {
|
||||||
margin-top: $gl-padding-8;
|
margin-top: $gl-padding-8;
|
||||||
|
|
||||||
.dropdown-menu-inner-content {
|
|
||||||
@extend .monospace;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6,12 +6,12 @@
|
||||||
= sprite_icon('fork', size: 12)
|
= sprite_icon('fork', size: 12)
|
||||||
= ref
|
= ref
|
||||||
- if current_action?(:edit) || current_action?(:update)
|
- if current_action?(:edit) || current_action?(:update)
|
||||||
%span.editor-file-name
|
%span.pull-left.append-right-10
|
||||||
= text_field_tag 'file_path', (params[:file_path] || @path),
|
= text_field_tag 'file_path', (params[:file_path] || @path),
|
||||||
class: 'form-control new-file-path js-file-path-name-input'
|
class: 'form-control new-file-path js-file-path-name-input'
|
||||||
|
|
||||||
- if current_action?(:new) || current_action?(:create)
|
- if current_action?(:new) || current_action?(:create)
|
||||||
%span.editor-file-name
|
%span.pull-left.append-right-10
|
||||||
\/
|
\/
|
||||||
= text_field_tag 'file_name', params[:file_name], placeholder: "File name",
|
= text_field_tag 'file_name', params[:file_name], placeholder: "File name",
|
||||||
required: true, class: 'form-control new-file-name js-file-path-name-input'
|
required: true, class: 'form-control new-file-name js-file-path-name-input'
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
.col-sm-10.create-from
|
.col-sm-10.create-from
|
||||||
.dropdown
|
.dropdown
|
||||||
= hidden_field_tag :ref, default_ref
|
= hidden_field_tag :ref, default_ref
|
||||||
= button_tag type: 'button', title: default_ref, class: 'dropdown-menu-toggle wide js-branch-select git-revision-dropdown-toggle', required: true, data: { toggle: 'dropdown', selected: default_ref, field_name: 'ref' } do
|
= button_tag type: 'button', title: default_ref, class: 'dropdown-menu-toggle wide js-branch-select monospace', required: true, data: { toggle: 'dropdown', selected: default_ref, field_name: 'ref' } do
|
||||||
.text-left.dropdown-toggle-text= default_ref
|
.text-left.dropdown-toggle-text= default_ref
|
||||||
= icon('chevron-down')
|
= icon('chevron-down')
|
||||||
= render 'shared/ref_dropdown', dropdown_class: 'wide'
|
= render 'shared/ref_dropdown', dropdown_class: 'wide'
|
||||||
|
|
|
@ -60,7 +60,7 @@
|
||||||
- if pipeline.user
|
- if pipeline.user
|
||||||
= user_avatar(user: pipeline.user, size: 20)
|
= user_avatar(user: pipeline.user, size: 20)
|
||||||
- else
|
- else
|
||||||
%span.api API
|
%span.monospace API
|
||||||
|
|
||||||
- if admin
|
- if admin
|
||||||
%td
|
%td
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
.input-group-text
|
.input-group-text
|
||||||
= s_("CompareBranches|Source")
|
= s_("CompareBranches|Source")
|
||||||
= hidden_field_tag :to, params[:to]
|
= hidden_field_tag :to, params[:to]
|
||||||
= button_tag type: 'button', title: params[:to], class: "form-control compare-dropdown-toggle js-compare-dropdown has-tooltip git-revision-dropdown-toggle", 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: "form-control compare-dropdown-toggle js-compare-dropdown has-tooltip monospace", 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= params[:to] || _("Select branch/tag")
|
.dropdown-toggle-text.str-truncated= params[:to] || _("Select branch/tag")
|
||||||
= render 'shared/ref_dropdown'
|
= render 'shared/ref_dropdown'
|
||||||
.compare-ellipsis.inline ...
|
.compare-ellipsis.inline ...
|
||||||
|
@ -18,7 +18,7 @@
|
||||||
.input-group-text
|
.input-group-text
|
||||||
= s_("CompareBranches|Target")
|
= s_("CompareBranches|Target")
|
||||||
= hidden_field_tag :from, params[:from]
|
= hidden_field_tag :from, params[:from]
|
||||||
= button_tag type: 'button', title: params[:from], class: "form-control compare-dropdown-toggle js-compare-dropdown has-tooltip git-revision-dropdown-toggle", 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: "form-control compare-dropdown-toggle js-compare-dropdown has-tooltip monospace", 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= params[:from] || _("Select branch/tag")
|
.dropdown-toggle-text.str-truncated= params[:from] || _("Select branch/tag")
|
||||||
= render 'shared/ref_dropdown'
|
= render 'shared/ref_dropdown'
|
||||||
|
|
||||||
|
|
|
@ -48,7 +48,7 @@
|
||||||
- if generic_commit_status.pipeline.user
|
- if generic_commit_status.pipeline.user
|
||||||
= user_avatar(user: generic_commit_status.pipeline.user, size: 20)
|
= user_avatar(user: generic_commit_status.pipeline.user, size: 20)
|
||||||
- else
|
- else
|
||||||
%span.api API
|
%span.monospace API
|
||||||
|
|
||||||
- if admin
|
- if admin
|
||||||
%td
|
%td
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
selected: f.object.source_project_id
|
selected: f.object.source_project_id
|
||||||
.merge-request-select.dropdown
|
.merge-request-select.dropdown
|
||||||
= f.hidden_field :source_branch
|
= f.hidden_field :source_branch
|
||||||
= dropdown_toggle f.object.source_branch || _("Select source branch"), { toggle: "dropdown", 'field-name': "#{f.object_name}[source_branch]", 'refs-url': refs_project_path(@source_project), selected: f.object.source_branch }, { toggle_class: "js-compare-dropdown js-source-branch git-revision-dropdown-toggle" }
|
= dropdown_toggle f.object.source_branch || _("Select source branch"), { toggle: "dropdown", 'field-name': "#{f.object_name}[source_branch]", 'refs-url': refs_project_path(@source_project), selected: f.object.source_branch }, { toggle_class: "js-compare-dropdown js-source-branch monospace" }
|
||||||
.dropdown-menu.dropdown-menu-selectable.js-source-branch-dropdown.git-revision-dropdown
|
.dropdown-menu.dropdown-menu-selectable.js-source-branch-dropdown.git-revision-dropdown
|
||||||
= dropdown_title(_("Select source branch"))
|
= dropdown_title(_("Select source branch"))
|
||||||
= dropdown_filter(_("Search branches"))
|
= dropdown_filter(_("Search branches"))
|
||||||
|
@ -49,7 +49,7 @@
|
||||||
selected: f.object.target_project_id
|
selected: f.object.target_project_id
|
||||||
.merge-request-select.dropdown
|
.merge-request-select.dropdown
|
||||||
= f.hidden_field :target_branch
|
= f.hidden_field :target_branch
|
||||||
= dropdown_toggle f.object.target_branch, { toggle: "dropdown", 'field-name': "#{f.object_name}[target_branch]", 'refs-url': refs_project_path(f.object.target_project), selected: f.object.target_branch }, { toggle_class: "js-compare-dropdown js-target-branch git-revision-dropdown-toggle" }
|
= dropdown_toggle f.object.target_branch, { toggle: "dropdown", 'field-name': "#{f.object_name}[target_branch]", 'refs-url': refs_project_path(f.object.target_project), selected: f.object.target_branch }, { toggle_class: "js-compare-dropdown js-target-branch monospace" }
|
||||||
.dropdown-menu.dropdown-menu-selectable.js-target-branch-dropdown.git-revision-dropdown
|
.dropdown-menu.dropdown-menu-selectable.js-target-branch-dropdown.git-revision-dropdown
|
||||||
= dropdown_title(_("Select target branch"))
|
= dropdown_title(_("Select target branch"))
|
||||||
= dropdown_filter(_("Search branches"))
|
= dropdown_filter(_("Search branches"))
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
= f.label :ref, s_('Pipeline|Create for'), class: 'col-form-label'
|
= f.label :ref, s_('Pipeline|Create for'), class: 'col-form-label'
|
||||||
= hidden_field_tag 'pipeline[ref]', params[:ref] || @project.default_branch
|
= hidden_field_tag 'pipeline[ref]', params[:ref] || @project.default_branch
|
||||||
= dropdown_tag(params[:ref] || @project.default_branch,
|
= dropdown_tag(params[:ref] || @project.default_branch,
|
||||||
options: { toggle_class: 'js-branch-select wide git-revision-dropdown-toggle',
|
options: { toggle_class: 'js-branch-select wide monospace',
|
||||||
filter: true, dropdown_class: "dropdown-menu-selectable git-revision-dropdown", placeholder: s_("Pipeline|Search branches"),
|
filter: true, dropdown_class: "dropdown-menu-selectable git-revision-dropdown", placeholder: s_("Pipeline|Search branches"),
|
||||||
data: { selected: params[:ref] || @project.default_branch, field_name: 'pipeline[ref]' } })
|
data: { selected: params[:ref] || @project.default_branch, field_name: 'pipeline[ref]' } })
|
||||||
.form-text.text-muted
|
.form-text.text-muted
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
= f.hidden_field(:name)
|
= f.hidden_field(:name)
|
||||||
|
|
||||||
= dropdown_tag('Select branch or create wildcard',
|
= dropdown_tag('Select branch or create wildcard',
|
||||||
options: { toggle_class: 'js-protected-branch-select js-filter-submit wide git-revision-dropdown-toggle qa-protected-branch-select',
|
options: { toggle_class: 'js-protected-branch-select js-filter-submit wide monospace qa-protected-branch-select',
|
||||||
filter: true, dropdown_class: "dropdown-menu-selectable git-revision-dropdown qa-protected-branch-dropdown", placeholder: "Search protected branches",
|
filter: true, dropdown_class: "dropdown-menu-selectable git-revision-dropdown qa-protected-branch-dropdown", placeholder: "Search protected branches",
|
||||||
footer_content: true,
|
footer_content: true,
|
||||||
data: { show_no: true, show_any: true, show_upcoming: true,
|
data: { show_no: true, show_any: true, show_upcoming: true,
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
= f.hidden_field(:name)
|
= f.hidden_field(:name)
|
||||||
|
|
||||||
= dropdown_tag('Select tag or create wildcard',
|
= dropdown_tag('Select tag or create wildcard',
|
||||||
options: { toggle_class: 'js-protected-tag-select js-filter-submit wide git-revision-dropdown-toggle',
|
options: { toggle_class: 'js-protected-tag-select js-filter-submit wide monospace',
|
||||||
filter: true, dropdown_class: "dropdown-menu-selectable capitalize-header git-revision-dropdown", placeholder: "Search protected tags",
|
filter: true, dropdown_class: "dropdown-menu-selectable capitalize-header git-revision-dropdown", placeholder: "Search protected tags",
|
||||||
footer_content: true,
|
footer_content: true,
|
||||||
data: { show_no: true, show_any: true, show_upcoming: true,
|
data: { show_no: true, show_any: true, show_upcoming: true,
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Remove monospace extend
|
||||||
|
merge_request: 23089
|
||||||
|
author: George Tsiolis
|
||||||
|
type: performance
|
|
@ -20,7 +20,7 @@ module Spec
|
||||||
end
|
end
|
||||||
|
|
||||||
def select_branch(branch_name)
|
def select_branch(branch_name)
|
||||||
find(".git-revision-dropdown-toggle").click
|
find(".js-branch-select").click
|
||||||
|
|
||||||
page.within("#new-branch-form .dropdown-menu") do
|
page.within("#new-branch-form .dropdown-menu") do
|
||||||
click_link(branch_name)
|
click_link(branch_name)
|
||||||
|
|
Loading…
Reference in New Issue