Commit c8a2d0220bb5e8696016471f380364dfa8e149db
1 parent
94eaff08
Exists in
master
and in
29 other branches
[search-improvements] Renames assets-links to assets-menu
Showing
3 changed files
with
9 additions
and
9 deletions
Show diff stats
app/helpers/search_helper.rb
| @@ -120,7 +120,7 @@ module SearchHelper | @@ -120,7 +120,7 @@ module SearchHelper | ||
| 120 | options.merge!(:class => 'selected') if selected.to_s == asset.to_s | 120 | options.merge!(:class => 'selected') if selected.to_s == asset.to_s |
| 121 | content_tag('li', asset_link(asset), options) | 121 | content_tag('li', asset_link(asset), options) |
| 122 | end.join("\n"), | 122 | end.join("\n"), |
| 123 | - :id => 'assets-links') | 123 | + :id => 'assets-menu') |
| 124 | end | 124 | end |
| 125 | 125 | ||
| 126 | def asset_link(asset) | 126 | def asset_link(asset) |
public/javascripts/search.js
| @@ -31,7 +31,7 @@ | @@ -31,7 +31,7 @@ | ||
| 31 | }); | 31 | }); |
| 32 | 32 | ||
| 33 | // Assets links | 33 | // Assets links |
| 34 | - $('#assets-links a').click(function(e){ | 34 | + $('#assets-menu a').click(function(e){ |
| 35 | e.preventDefault(); | 35 | e.preventDefault(); |
| 36 | window.location.href = $(this).attr("href") + '?query=' + $('#search-input').val(); | 36 | window.location.href = $(this).attr("href") + '?query=' + $('#search-input').val(); |
| 37 | }); | 37 | }); |
public/stylesheets/search.css
| @@ -949,7 +949,7 @@ a.search-image-pic { | @@ -949,7 +949,7 @@ a.search-image-pic { | ||
| 949 | margin-left: 40px; | 949 | margin-left: 40px; |
| 950 | } | 950 | } |
| 951 | 951 | ||
| 952 | -ul#assets-links { | 952 | +ul#assets-menu { |
| 953 | text-align: justify; | 953 | text-align: justify; |
| 954 | text-justify: distribute-all-lines; /* distribute items in IE */ | 954 | text-justify: distribute-all-lines; /* distribute items in IE */ |
| 955 | list-style-type: none; | 955 | list-style-type: none; |
| @@ -959,28 +959,28 @@ ul#assets-links { | @@ -959,28 +959,28 @@ ul#assets-links { | ||
| 959 | float: left; | 959 | float: left; |
| 960 | } | 960 | } |
| 961 | 961 | ||
| 962 | -ul#assets-links:after { | 962 | +ul#assets-menu:after { |
| 963 | content: ""; | 963 | content: ""; |
| 964 | display: inline-block; | 964 | display: inline-block; |
| 965 | } | 965 | } |
| 966 | 966 | ||
| 967 | -ul#assets-links li { | 967 | +ul#assets-menu li { |
| 968 | display: inline-block; | 968 | display: inline-block; |
| 969 | } | 969 | } |
| 970 | 970 | ||
| 971 | -ul#assets-links li + li { | 971 | +ul#assets-menu li + li { |
| 972 | margin-left: 10px; | 972 | margin-left: 10px; |
| 973 | } | 973 | } |
| 974 | 974 | ||
| 975 | -ul#assets-links li a { | 975 | +ul#assets-menu li a { |
| 976 | text-decoration: none; | 976 | text-decoration: none; |
| 977 | } | 977 | } |
| 978 | 978 | ||
| 979 | -ul#assets-links li.selected a { | 979 | +ul#assets-menu li.selected a { |
| 980 | border-bottom: 2px solid #EF2929; | 980 | border-bottom: 2px solid #EF2929; |
| 981 | } | 981 | } |
| 982 | 982 | ||
| 983 | -ul#assets-links li.selected a { | 983 | +ul#assets-menu li.selected a { |
| 984 | color: #EF2929; | 984 | color: #EF2929; |
| 985 | font-weight: bold; | 985 | font-weight: bold; |
| 986 | } | 986 | } |