diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index d2c7cdc3e92..3dc524ccca4 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -81,8 +81,9 @@ &::before { content: "\f00c"; position: absolute; - left: 4px; - top: 8px; + left: 5px; + top: 50%; + margin-top: -7px; font: normal normal normal 14px/1 FontAwesome; font-size: inherit; text-rendering: auto; @@ -94,28 +95,9 @@ } .dropdown-header { - padding-left: 10px; - padding-right: 10px; + padding-left: 5px; + padding-right: 5px; color: $dropdown-header-color; font-size: 13px; line-height: 22px; } - -.dropdown-with-checkmark { - li > .legend { - font-size: 13px; - color: $secondary-text; - margin-bottom: 5px; - } - - li > a { - padding-left: 20px; - line-height: 28px; - - i { - position: absolute; - left: 1px; - line-height: 28px; - } - } -} diff --git a/app/views/shared/projects/_dropdown.html.haml b/app/views/shared/projects/_dropdown.html.haml index daaac092dce..e7e04621ff4 100644 --- a/app/views/shared/projects/_dropdown.html.haml +++ b/app/views/shared/projects/_dropdown.html.haml @@ -5,21 +5,18 @@ %span.light = projects_sort_options_hash[@sort] %b.caret - %ul.dropdown-menu.dropdown-menu-align-right.dropdown-with-checkmark - %li - .legend Sort by + %ul.dropdown-menu.dropdown-menu-align-right.dropdown-menu-selectable + %li.dropdown-header + Sort by - projects_sort_options_hash.each do |value, title| %li - = link_to filter_projects_path(sort: value, archived: archived) do - = icon('check') if @sort == value + = link_to filter_projects_path(sort: value, archived: archived), class: ("is-active" if @sort == value) do = title %li.divider %li - = link_to filter_projects_path(sort: @sort, archived: nil) do - = icon('check') unless params[:archived].present? + = link_to filter_projects_path(sort: @sort, archived: nil), class: ("is-active" unless params[:archived].present?) do Hide archived projects %li - = link_to filter_projects_path(sort: @sort, archived: true) do - = icon('check') if params[:archived].present? + = link_to filter_projects_path(sort: @sort, archived: true), class: ("is-active" if params[:archived].present?) do Show archived projects