Commit b301b31e authored by Brandon Labuschagne's avatar Brandon Labuschagne

Merge branch 'markrian-remove-unnecessary-css-class' into 'master'

Replace unnecessary CSS class with utility class

See merge request gitlab-org/gitlab!78080
parents 7924137d def312fa
.user-sort-dropdown {
margin-left: $gl-padding-8;
}
.user-search-form { .user-search-form {
position: relative; position: relative;
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
= hidden_field_tag :sort, @sort = hidden_field_tag :sort, @sort
= sprite_icon('search', css_class: 'search-icon') = sprite_icon('search', css_class: 'search-icon')
= button_tag s_('AdminUsers|Search users') if Rails.env.test? = button_tag s_('AdminUsers|Search users') if Rails.env.test?
.dropdown.user-sort-dropdown .dropdown.gl-ml-3
= label_tag 'Sort by', nil, class: 'label-bold' = label_tag 'Sort by', nil, class: 'label-bold'
- toggle_text = @sort.present? ? users_sort_options_hash[@sort] : sort_title_name - toggle_text = @sort.present? ? users_sort_options_hash[@sort] : sort_title_name
= dropdown_toggle(toggle_text, { toggle: 'dropdown' }) = dropdown_toggle(toggle_text, { toggle: 'dropdown' })
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
= search_field_tag :search, params[:search], { placeholder: _('Search'), class: 'form-control', spellcheck: false } = search_field_tag :search, params[:search], { placeholder: _('Search'), class: 'form-control', spellcheck: false }
%button.user-search-btn{ type: "submit", "aria-label" => _("Submit search") } %button.user-search-btn{ type: "submit", "aria-label" => _("Submit search") }
= sprite_icon('search') = sprite_icon('search')
.dropdown.inline.user-sort-dropdown .dropdown.inline.gl-ml-3
= dropdown_toggle(starrers_sort_options_hash[@sort], { toggle: 'dropdown' }) = dropdown_toggle(starrers_sort_options_hash[@sort], { toggle: 'dropdown' })
%ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable %ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable
%li.dropdown-header %li.dropdown-header
......
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