Commit 695fb209 authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'sort-text-removed-from-sort-dropdown' into 'master'

Removed sorted text from dropdowns

![Screen_Shot_2016-01-28_at_09.04.36](/uploads/9e0e1fdb45ad12d122f860a2164d9396/Screen_Shot_2016-01-28_at_09.04.36.png)

Closes #12796 

cc @creamzy @jschatz1 

See merge request !2635
parents 9bf47f06 22e81f5d
......@@ -17,7 +17,7 @@
.pull-right
.dropdown.inline
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
%span.light sort:
%span.light
- if @sort.present?
= sort_options_hash[@sort]
- else
......
......@@ -50,7 +50,7 @@
.controls
.dropdown.inline
%button.dropdown-toggle.btn.btn-sm{type: 'button', 'data-toggle' => 'dropdown'}
%span.light sort:
%span.light
- if @sort.present?
= sort_options_hash[@sort]
- else
......
......@@ -32,7 +32,7 @@
.pull-right
.dropdown.inline
%a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
%span.light sort:
%span.light
- if @sort.present?
= sort_options_hash[@sort]
- else
......
......@@ -18,7 +18,7 @@
.pull-right
.dropdown.inline
%button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
%span.light sort:
%span.light
- if @sort.present?
= sort_options_hash[@sort]
- else
......
.dropdown.inline
%button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
%span.light sort:
%span.light
- if @sort.present?
= sort_options_hash[@sort]
- elsif current_page?(trending_explore_projects_path) || current_page?(explore_root_path)
......@@ -24,4 +24,3 @@
= sort_title_recently_updated
= link_to explore_projects_filter_path(sort: sort_value_oldest_updated) do
= sort_title_oldest_updated
......@@ -10,7 +10,7 @@
 
.dropdown.inline
%button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
%span.light sort:
%span.light
- if @sort.present?
= @sort.humanize
- else
......
.dropdown.inline.prepend-left-10
%button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
%span.light sort:
%span.light
- if @sort.present?
= sort_options_hash[@sort]
- else
......
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