Unify dropdown button styles
This commit is contained in:
parent
651bdd7c34
commit
2cddbeee65
6 changed files with 16 additions and 14 deletions
|
@ -36,7 +36,7 @@
|
||||||
color: $dropdown-toggle-color;
|
color: $dropdown-toggle-color;
|
||||||
font-size: 15px;
|
font-size: 15px;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
border: 1px solid $dropdown-toggle-border-color;
|
border: 1px solid $border-color;
|
||||||
border-radius: $border-radius-base;
|
border-radius: $border-radius-base;
|
||||||
outline: 0;
|
outline: 0;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
|
@ -45,11 +45,9 @@
|
||||||
|
|
||||||
.fa {
|
.fa {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 50%;
|
top: 10px;
|
||||||
right: 6px;
|
right: 8px;
|
||||||
margin-top: -6px;
|
|
||||||
color: $dropdown-toggle-icon-color;
|
color: $dropdown-toggle-icon-color;
|
||||||
font-size: 10px;
|
|
||||||
|
|
||||||
&.fa-spinner {
|
&.fa-spinner {
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
|
|
|
@ -27,9 +27,9 @@
|
||||||
height: 0;
|
height: 0;
|
||||||
margin-left: 2px;
|
margin-left: 2px;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
border-top: $caret-width-base dashed;
|
border-top: 5px dashed;
|
||||||
border-right: $caret-width-base solid transparent;
|
border-right: 5px solid transparent;
|
||||||
border-left: $caret-width-base solid transparent;
|
border-left: 5px solid transparent;
|
||||||
color: $gray-darkest;
|
color: $gray-darkest;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,6 +55,10 @@
|
||||||
float: left;
|
float: left;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.file-buttons {
|
||||||
|
font-size: 0;
|
||||||
|
}
|
||||||
|
|
||||||
.select2 {
|
.select2 {
|
||||||
float: right;
|
float: right;
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,7 +43,7 @@ module DropdownsHelper
|
||||||
default_label = data_attr[:default_label]
|
default_label = data_attr[:default_label]
|
||||||
content_tag(:button, class: "dropdown-menu-toggle #{options[:toggle_class] if options.has_key?(:toggle_class)}", id: (options[:id] if options.has_key?(:id)), type: "button", data: data_attr) do
|
content_tag(:button, class: "dropdown-menu-toggle #{options[:toggle_class] if options.has_key?(:toggle_class)}", id: (options[:id] if options.has_key?(:id)), type: "button", data: data_attr) do
|
||||||
output = content_tag(:span, toggle_text, class: "dropdown-toggle-text #{'is-default' if toggle_text == default_label}")
|
output = content_tag(:span, toggle_text, class: "dropdown-toggle-text #{'is-default' if toggle_text == default_label}")
|
||||||
output << icon('chevron-down')
|
output << icon('caret-down')
|
||||||
output.html_safe
|
output.html_safe
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -14,13 +14,13 @@
|
||||||
= 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'
|
required: true, class: 'form-control new-file-name'
|
||||||
|
|
||||||
.pull-right
|
.pull-right.file-buttons
|
||||||
.license-selector.js-license-selector-wrap.hidden
|
.license-selector.js-license-selector-wrap.hidden
|
||||||
= dropdown_tag("Choose a License template", options: { toggle_class: 'js-license-selector', title: "Choose a license", filter: true, placeholder: "Filter", data: { data: licenses_for_select, project: @project.name, fullname: @project.namespace.human_name } } )
|
= dropdown_tag("Choose a License template", options: { toggle_class: 'btn js-license-selector', title: "Choose a license", filter: true, placeholder: "Filter", data: { data: licenses_for_select, project: @project.name, fullname: @project.namespace.human_name } } )
|
||||||
.gitignore-selector.js-gitignore-selector-wrap.hidden
|
.gitignore-selector.js-gitignore-selector-wrap.hidden
|
||||||
= dropdown_tag("Choose a .gitignore template", options: { toggle_class: 'js-gitignore-selector', title: "Choose a template", filter: true, placeholder: "Filter", data: { data: gitignore_names } } )
|
= dropdown_tag("Choose a .gitignore template", options: { toggle_class: 'btn js-gitignore-selector', title: "Choose a template", filter: true, placeholder: "Filter", data: { data: gitignore_names } } )
|
||||||
.gitlab-ci-yml-selector.js-gitlab-ci-yml-selector-wrap.hidden
|
.gitlab-ci-yml-selector.js-gitlab-ci-yml-selector-wrap.hidden
|
||||||
= dropdown_tag("Choose a GitLab CI Yaml template", options: { toggle_class: 'js-gitlab-ci-yml-selector', title: "Choose a template", filter: true, placeholder: "Filter", data: { data: gitlab_ci_ymls } } )
|
= dropdown_tag("Choose a GitLab CI Yaml template", options: { toggle_class: 'btn js-gitlab-ci-yml-selector', title: "Choose a template", filter: true, placeholder: "Filter", data: { data: gitlab_ci_ymls } } )
|
||||||
= button_tag class: 'soft-wrap-toggle btn', type: 'button' do
|
= button_tag class: 'soft-wrap-toggle btn', type: 'button' do
|
||||||
%span.no-wrap
|
%span.no-wrap
|
||||||
= custom_icon('icon_no_wrap')
|
= custom_icon('icon_no_wrap')
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
%button.dropdown-menu-toggle.js-label-select.js-multiselect{class: classes.join(' '), type: "button", data: dropdown_data}
|
%button.dropdown-menu-toggle.js-label-select.js-multiselect{class: classes.join(' '), type: "button", data: dropdown_data}
|
||||||
%span.dropdown-toggle-text{ class: ("is-default" if selected.nil? || selected.empty?) }
|
%span.dropdown-toggle-text{ class: ("is-default" if selected.nil? || selected.empty?) }
|
||||||
= multi_label_name(selected, "Labels")
|
= multi_label_name(selected, "Labels")
|
||||||
= icon('chevron-down')
|
= icon('caret-down')
|
||||||
.dropdown-menu.dropdown-select.dropdown-menu-paging.dropdown-menu-labels.dropdown-menu-selectable
|
.dropdown-menu.dropdown-select.dropdown-menu-paging.dropdown-menu-labels.dropdown-menu-selectable
|
||||||
= render partial: "shared/issuable/label_page_default", locals: { title: dropdown_title, show_footer: show_footer, show_create: show_create }
|
= render partial: "shared/issuable/label_page_default", locals: { title: dropdown_title, show_footer: show_footer, show_create: show_create }
|
||||||
- if show_create && project && can?(current_user, :admin_label, project)
|
- if show_create && project && can?(current_user, :admin_label, project)
|
||||||
|
|
Loading…
Reference in a new issue